diff --git a/Android.bp b/Android.bp
index 5470e70..2d4c42c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,20 @@
+package {
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "packages_apps_Settings_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 java_library {
     name: "settings-logtags",
     srcs: ["src/**/*.logtags"],
@@ -93,3 +110,21 @@
     name: "contextualcards",
     aars: ["libs/contextualcards.aar"],
 }
+
+filegroup {
+    name: "Settings_proguard_flags",
+    srcs: ["proguard.flags"],
+}
+
+// The sources for Settings need to be exposed to SettingsGoogle, etc.
+// so they can run the com.android.settingslib.search.IndexableProcessor
+// over all the sources together.
+filegroup {
+    name: "Settings_srcs",
+    srcs: ["src/**/*.java"],
+}
+
+filegroup {
+    name: "Settings_manifest",
+    srcs: ["AndroidManifest.xml"],
+}
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a352de3..eeb9694 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -957,12 +957,29 @@
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.display.SmartAutoRotatePreferenceFragment" />
+                android:value="com.android.settings.DisplaySettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
 
         <activity
+            android:name="Settings$SmartAutoRotateSettingsActivity"
+            android:label="@string/accelerometer_title"
+            android:icon="@drawable/ic_homepage_notification"
+            android:exported="true">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.AUTO_ROTATE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter android:priority="32">
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.display.SmartAutoRotatePreferenceFragment" />
+        </activity>
+
+        <activity
             android:name="Settings$NightDisplaySettingsActivity"
             android:label="@string/night_display_title"
             android:enabled="@*android:bool/config_nightDisplayAvailable"
@@ -1275,6 +1292,7 @@
         <activity
             android:name=".notification.history.NotificationHistoryActivity"
             android:exported="true"
+            android:theme="@style/Theme.SubSettings"
             android:label="@string/notification_history_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_HISTORY" />
@@ -1318,7 +1336,7 @@
         </activity>
         <activity
             android:name="Settings$ScanningSettingsActivity"
-            android:label="@string/location_scanning_screen_title"
+            android:label="@string/location_services_screen_title"
             android:icon="@drawable/ic_homepage_location"
             android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
@@ -1327,7 +1345,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.location.ScanningSettings" />
+                android:value="com.android.settings.location.LocationServices" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -2805,8 +2823,13 @@
         </activity>
 
         <!-- Show channel-level notification settings (channel passed in as extras) -->
-        <activity android:name="Settings$ChannelNotificationSettingsActivity"
+        <activity android:name=".notification.app.ChannelPanelActivity"
                   android:label="@string/notification_channel_title"
+                  android:theme="@style/Theme.Panel"
+                  android:launchMode="singleInstance"
+                  android:excludeFromRecents="true"
+                  android:noHistory="true"
+                  android:configChanges="orientation|keyboardHidden|screenSize"
                   android:exported="true">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.CHANNEL_NOTIFICATION_SETTINGS" />
@@ -2887,6 +2910,12 @@
             android:grantUriPermissions="true"
             android:exported="false"/>
 
+        <provider
+            android:name=".emergency.EmergencyActionContentProvider"
+            android:authorities="com.android.settings.emergency"
+            android:permission="android.permission.CALL_PRIVILEGED"
+            android:exported="true"/>
+
         <activity
             android:name=".wifi.RequestToggleWiFiActivity"
             android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
@@ -3068,6 +3097,33 @@
         </activity>
 
         <activity
+            android:name="Settings$AlarmsAndRemindersActivity"
+            android:exported="true"
+            android:label="@string/alarms_and_reminders_label">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.REQUEST_SCHEDULE_EXACT_ALARM" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.applications.manageapplications.ManageApplications" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+        </activity>
+
+        <activity
+            android:name="Settings$AlarmsAndRemindersAppActivity"
+            android:exported="true"
+            android:label="@string/alarms_and_reminders_label">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.REQUEST_SCHEDULE_EXACT_ALARM" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.applications.appinfo.AlarmsAndRemindersDetails" />
+        </activity>
+
+        <activity
             android:name="Settings$ManageExternalSourcesActivity"
             android:exported="true"
             android:label="@string/install_other_apps">
@@ -3132,6 +3188,33 @@
                        android:value="com.android.settings.applications.appinfo.ManageExternalStorageDetails" />
         </activity>
 
+        <activity
+            android:name="Settings$MediaManagementAppsActivity"
+            android:exported="true"
+            android:label="@string/media_management_apps_title">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.REQUEST_MANAGE_MEDIA" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.applications.manageapplications.ManageApplications" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+        </activity>
+
+        <activity
+            android:name="Settings$AppMediaManagementAppsActivity"
+            android:exported="true"
+            android:label="@string/media_management_apps_title">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.REQUEST_MANAGE_MEDIA" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.applications.appinfo.MediaManagementAppsDetails" />
+        </activity>
+
         <!-- Keep compatibility with old WebView-picker implementation -->
         <activity-alias android:name=".WebViewImplementation"
                   android:targetActivity="Settings$WebViewAppPickerActivity"
@@ -3709,6 +3792,25 @@
             android:launchMode="singleTask">
         </activity>
 
+        <activity android:name="Settings$FactoryResetActivity"
+                  android:permission="android.permission.BACKUP"
+                  android:label="@string/main_clear_title"
+                  android:exported="true"
+                  android:theme="@style/SudThemeGlif.Light">
+            <intent-filter>
+                <action android:name="com.android.settings.action.FACTORY_RESET"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.MainClear"/>
+        </activity>
+
+        <activity android:name="Settings$FactoryResetConfirmActivity"
+                  android:label="@string/main_clear_confirm_title"
+                  android:exported="false"
+                  android:theme="@style/SudThemeGlif.Light">
+        </activity>
+
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>
 </manifest>
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index 4aa67ab..9c79bab 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -2997,6 +2997,54 @@
         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;path"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_network_signal_blue.xml"
+            line="25"
+            column="9"/>
+    </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="C6.67,19.26,7.26,18.67,8,18.67z&quot; />"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_network_signal_blue.xml"
+            line="32"
+            column="9"/>
+    </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:pathData=&quot;M16,12h1.33c0.74,0,1.33,0.6,1.33,1.33v12c0,0.74-0.6,1.33-1.33,1.33H16c-0.74,0-1.33-0.6-1.33-1.33v-12"
+        errorLine2="^">
+        <location
+            file="res/drawable/ic_network_signal_blue.xml"
+            line="35"
+            column="1"/>
+    </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/notification_block_color&quot;/>"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -3525,27 +3573,11 @@
         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;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&quot;‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎&quot;&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;‎‏‎‎‏‏‏‎Welcome to Google sync!‎‏‎‎‏‏‎&quot;&lt;/font>&quot;‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎A Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are.‎‏‎‎‏‎&quot;&lt;/string>"
-        errorLine2="                                                                                                                                                                         ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-en-rXC/strings.xml"
-            line="2816"
-            column="170"/>
-    </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;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;Welcome to Google sync!&quot;&lt;/font>&quot; \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are.&quot;&lt;/string>"
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rAU/strings.xml"
-            line="2818"
+            line="2821"
             column="64"/>
     </issue>
 
@@ -3561,7 +3593,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rCA/strings.xml"
-            line="2818"
+            line="2821"
             column="64"/>
     </issue>
 
@@ -3577,7 +3609,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rGB/strings.xml"
-            line="2818"
+            line="2821"
             column="64"/>
     </issue>
 
@@ -3593,7 +3625,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rIN/strings.xml"
-            line="2818"
+            line="2821"
             column="64"/>
     </issue>
 
@@ -3605,11 +3637,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;string name=&quot;sync_plug&quot; msgid=&quot;7956982719077985381&quot;>&quot;‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎&quot;&lt;font fgcolor=&quot;#ffffffff&quot;>&quot;‎‏‎‎‏‏‏‎Welcome to Google sync!‎‏‎‎‏‏‎&quot;&lt;/font>&quot;‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎A Google approach to syncing data to allow access to your contacts, appointments, and more from wherever you are.‎‏‎‎‏‎&quot;&lt;/string>"
+        errorLine2="                                                                                                                                                                         ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-en-rXC/strings.xml"
+            line="2821"
+            column="170"/>
+    </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;string name=&quot;sync_plug&quot;>&lt;font fgcolor=&quot;#ffffffff&quot;>Welcome to Google sync!&lt;/font>"
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/strings.xml"
-            line="6537"
+            line="6543"
             column="36"/>
     </issue>
 
@@ -3641,7 +3689,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="434"
+            line="435"
             column="44"/>
     </issue>
 
@@ -3657,7 +3705,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="440"
+            line="441"
             column="44"/>
     </issue>
 
@@ -3673,7 +3721,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="441"
+            line="442"
             column="44"/>
     </issue>
 
@@ -3689,7 +3737,7 @@
         errorLine2="                                 ^">
         <location
             file="res/values/styles.xml"
-            line="477"
+            line="478"
             column="34"/>
     </issue>
 
@@ -3801,7 +3849,7 @@
         errorLine2="                                         ^">
         <location
             file="res/values/themes.xml"
-            line="273"
+            line="272"
             column="42"/>
     </issue>
 
@@ -3913,7 +3961,7 @@
         errorLine2="                                          ^">
         <location
             file="res/values/themes_suw.xml"
-            line="188"
+            line="196"
             column="43"/>
     </issue>
 
@@ -3929,7 +3977,7 @@
         errorLine2="                                         ^">
         <location
             file="res/values/themes_suw.xml"
-            line="189"
+            line="197"
             column="42"/>
     </issue>
 
@@ -3945,7 +3993,7 @@
         errorLine2="                                            ^">
         <location
             file="res/values/themes_suw.xml"
-            line="190"
+            line="198"
             column="45"/>
     </issue>
 
@@ -3965,4 +4013,36 @@
             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;item android:offset=&quot;0&quot; android:color=&quot;#FF4285F4&quot;/>"
+        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/one_handed_guideline.xml"
+            line="34"
+            column="36"/>
+    </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;item android:offset=&quot;1&quot; android:color=&quot;#004385F5&quot;/>"
+        errorLine2="                                   ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/one_handed_guideline.xml"
+            line="35"
+            column="36"/>
+    </issue>
+
 </issues>
diff --git a/protos/Android.bp b/protos/Android.bp
index 5184218..e09b941 100644
--- a/protos/Android.bp
+++ b/protos/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 java_library_static {
     name: "settings-contextual-card-protos-lite",
     host_supported: true,
@@ -14,4 +23,4 @@
         type: "lite",
     },
     srcs: ["settings_log_bridge.proto"],
-}
\ No newline at end of file
+}
diff --git a/res/drawable/accessibility_button_navigation.xml b/res/drawable/accessibility_button_navigation.xml
new file mode 100644
index 0000000..82e3c70
--- /dev/null
+++ b/res/drawable/accessibility_button_navigation.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="125dp"
+    android:height="153dp"
+    android:viewportWidth="125"
+    android:viewportHeight="153">
+  <group>
+    <clip-path
+        android:pathData="M0,0h125v153h-125z"/>
+    <path
+        android:pathData="M7.4,-62.9L117.6,-62.9A6.3,6.3 0,0 1,123.9 -56.6L123.9,145.6A6.3,6.3 0,0 1,117.6 151.9L7.4,151.9A6.3,6.3 0,0 1,1.1 145.6L1.1,-56.6A6.3,6.3 0,0 1,7.4 -62.9z"
+        android:strokeWidth="1.8"
+        android:fillColor="#DADCE0"
+        android:strokeColor="#BDC1C6"/>
+    <group>
+      <clip-path
+          android:pathData="M7.4,-62.9L116.6,-62.9A6.3,6.3 0,0 1,122.9 -56.6L122.9,145.6A6.3,6.3 0,0 1,116.6 151.9L7.4,151.9A6.3,6.3 0,0 1,1.1 145.6L1.1,-56.6A6.3,6.3 0,0 1,7.4 -62.9z"/>
+      <path
+          android:pathData="M12.4,-61L112.6,-61A5.4,5.4 0,0 1,118 -55.6L118,140.6A5.4,5.4 0,0 1,112.6 146L12.4,146A5.4,5.4 0,0 1,7 140.6L7,-55.6A5.4,5.4 0,0 1,12.4 -61z"
+          android:fillColor="#F8F9FA"/>
+      <group>
+        <clip-path
+            android:pathData="M12.4,-61L112.6,-61A5.4,5.4 0,0 1,118 -55.6L118,140.6A5.4,5.4 0,0 1,112.6 146L12.4,146A5.4,5.4 0,0 1,7 140.6L7,-55.6A5.4,5.4 0,0 1,12.4 -61z"/>
+      </group>
+    </group>
+    <path
+        android:pathData="M7,126H118V140.6C118,143.582 115.582,146 112.6,146H12.4C9.418,146 7,143.582 7,140.6V126Z"
+        android:fillColor="#000000"
+        android:fillAlpha="0.87"/>
+    <path
+        android:strokeWidth="1"
+        android:pathData="M63.5,138.688C64.713,138.688 65.697,137.708 65.697,136.5C65.697,135.292 64.713,134.312 63.5,134.312C62.286,134.312 61.303,135.292 61.303,136.5C61.303,137.708 62.286,138.688 63.5,138.688Z"
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:strokeColor="#9AA0A6"/>
+    <path
+        android:strokeWidth="1"
+        android:pathData="M33.694,133.953C33.827,133.876 33.994,133.972 33.994,134.126V138.874C33.994,139.028 33.827,139.125 33.694,139.047L29.604,136.673C29.471,136.596 29.471,136.404 29.604,136.327L33.694,133.953Z"
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:strokeColor="#9AA0A6"/>
+    <path
+        android:pathData="M96.111,131.2C96.111,131.86 95.611,132.4 95,132.4C94.389,132.4 93.889,131.86 93.889,131.2C93.889,130.54 94.389,130 95,130C95.611,130 96.111,130.54 96.111,131.2ZM95,133C96.572,133 98.272,132.82 99.722,132.4L100,133.6C98.967,133.9 97.778,134.098 96.667,134.2V142H95.556V138.4H94.444V142H93.333V134.2C92.222,134.098 91.033,133.9 90,133.6L90.278,132.4C91.728,132.82 93.428,133 95,133Z"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M94.5,135.5m-15.5,0a15.5,15.5 0,1 1,31 0a15.5,15.5 0,1 1,-31 0"
+        android:strokeWidth="4"
+        android:fillColor="#00000000"
+        android:strokeColor="#4285F4"/>
+  </group>
+</vector>
diff --git a/res/drawable/accessibility_button_preview_base.xml b/res/drawable/accessibility_button_preview_base.xml
new file mode 100644
index 0000000..9e3ec59
--- /dev/null
+++ b/res/drawable/accessibility_button_preview_base.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="125dp"
+    android:height="153dp"
+    android:viewportWidth="125"
+    android:viewportHeight="153">
+  <group>
+    <clip-path
+        android:pathData="M0,0h125v153h-125z"/>
+    <path
+        android:pathData="M7.4,-62.9L117.6,-62.9A6.3,6.3 0,0 1,123.9 -56.6L123.9,145.6A6.3,6.3 0,0 1,117.6 151.9L7.4,151.9A6.3,6.3 0,0 1,1.1 145.6L1.1,-56.6A6.3,6.3 0,0 1,7.4 -62.9z"
+        android:strokeWidth="1.8"
+        android:fillColor="#DADCE0"
+        android:strokeColor="#BDC1C6"/>
+    <group>
+      <clip-path
+          android:pathData="M7.4,-62.9L116.6,-62.9A6.3,6.3 0,0 1,122.9 -56.6L122.9,145.6A6.3,6.3 0,0 1,116.6 151.9L7.4,151.9A6.3,6.3 0,0 1,1.1 145.6L1.1,-56.6A6.3,6.3 0,0 1,7.4 -62.9z"/>
+      <path
+          android:pathData="M12.4,-61L112.6,-61A5.4,5.4 0,0 1,118 -55.6L118,140.6A5.4,5.4 0,0 1,112.6 146L12.4,146A5.4,5.4 0,0 1,7 140.6L7,-55.6A5.4,5.4 0,0 1,12.4 -61z"
+          android:fillColor="#F8F9FA"/>
+      <group>
+        <clip-path
+            android:pathData="M12.4,-61L112.6,-61A5.4,5.4 0,0 1,118 -55.6L118,140.6A5.4,5.4 0,0 1,112.6 146L12.4,146A5.4,5.4 0,0 1,7 140.6L7,-55.6A5.4,5.4 0,0 1,12.4 -61z"/>
+      </group>
+    </group>
+  </group>
+</vector>
diff --git a/res/drawable/accessibility_button_preview_large_floating_menu.xml b/res/drawable/accessibility_button_preview_large_floating_menu.xml
new file mode 100644
index 0000000..e003dc7
--- /dev/null
+++ b/res/drawable/accessibility_button_preview_large_floating_menu.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="125dp"
+    android:height="153dp"
+    android:viewportWidth="125"
+    android:viewportHeight="153">
+    <path
+        android:pathData="M0,0h125v153h-125z"
+        android:fillColor="#00000000"/>
+    <group>
+        <clip-path
+            android:pathData="M89,95h29v34h-29z"/>
+        <path
+            android:strokeWidth="1"
+            android:pathData="M105,97.5L131,97.5A14.5,14.5 0,0 1,145.5 112L145.5,112A14.5,14.5 0,0 1,131 126.5L105,126.5A14.5,14.5 0,0 1,90.5 112L90.5,112A14.5,14.5 0,0 1,105 97.5z"
+            android:fillColor="#ffffff"
+            android:strokeColor="#DADCE0"/>
+        <path
+            android:pathData="M105.4,112m-11.2,0a11.2,11.2 0,1 1,22.4 0a11.2,11.2 0,1 1,-22.4 0"
+            android:fillColor="#80868B"/>
+        <path
+            android:pathData="M106.467,107.733C106.467,108.32 105.987,108.8 105.4,108.8C104.814,108.8 104.334,108.32 104.334,107.733C104.334,107.147 104.814,106.667 105.4,106.667C105.987,106.667 106.467,107.147 106.467,107.733ZM105.4,109.333C106.91,109.333 108.542,109.173 109.934,108.8L110.2,109.867C109.208,110.133 108.067,110.309 107,110.4V117.333H105.934V114.133H104.867V117.333H103.8V110.4C102.734,110.309 101.592,110.133 100.6,109.867L100.867,108.8C102.259,109.173 103.891,109.333 105.4,109.333Z"
+            android:fillColor="#ffffff"
+            android:fillType="evenOdd"/>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/accessibility_button_preview_small_floating_menu.xml b/res/drawable/accessibility_button_preview_small_floating_menu.xml
new file mode 100644
index 0000000..3ff8e4b
--- /dev/null
+++ b/res/drawable/accessibility_button_preview_small_floating_menu.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="125dp"
+    android:height="153dp"
+    android:viewportWidth="125"
+    android:viewportHeight="153">
+    <path
+        android:pathData="M0,0h125v153h-125z"
+        android:fillColor="#00000000"/>
+    <group>
+        <clip-path
+            android:pathData="M89,106h29v22h-29z"/>
+        <path
+            android:strokeWidth="1"
+            android:pathData="M111,107.5L137,107.5A9.5,9.5 0,0 1,146.5 117L146.5,117A9.5,9.5 0,0 1,137 126.5L111,126.5A9.5,9.5 0,0 1,101.5 117L101.5,117A9.5,9.5 0,0 1,111 107.5z"
+            android:fillColor="#ffffff"
+            android:strokeColor="#DADCE0"/>
+        <path
+            android:pathData="M111.168,116.968m-7.168,0a7.168,7.168 0,1 1,14.336 0a7.168,7.168 0,1 1,-14.336 0"
+            android:fillColor="#80868B"/>
+        <path
+            android:pathData="M111.851,114.237C111.851,114.612 111.543,114.92 111.168,114.92C110.792,114.92 110.485,114.612 110.485,114.237C110.485,113.861 110.792,113.554 111.168,113.554C111.543,113.554 111.851,113.861 111.851,114.237ZM111.168,115.261C112.134,115.261 113.178,115.158 114.069,114.92L114.24,115.602C113.605,115.773 112.875,115.886 112.192,115.944V120.381H111.509V118.333H110.827V120.381H110.144V115.944C109.461,115.886 108.731,115.773 108.096,115.602L108.267,114.92C109.157,115.158 110.202,115.261 111.168,115.261Z"
+            android:fillColor="#ffffff"
+            android:fillType="evenOdd"/>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/accessibility_shortcut_type_software_floating.xml b/res/drawable/accessibility_shortcut_type_software_floating.xml
new file mode 100644
index 0000000..9582015
--- /dev/null
+++ b/res/drawable/accessibility_shortcut_type_software_floating.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="180dp"
+    android:height="180dp"
+    android:viewportWidth="180"
+    android:viewportHeight="180">
+  <path
+      android:pathData="M90,90m-89,0a89,89 0,1 1,178 0a89,89 0,1 1,-178 0"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ECEEEF"/>
+  <group>
+    <clip-path
+        android:pathData="M90,90m-87,0a87,87 0,1 1,174 0a87,87 0,1 1,-174 0"/>
+    <path
+        android:pathData="M35.4,-70.9L144.6,-70.9A6.3,6.3 0,0 1,150.9 -64.6L150.9,137.6A6.3,6.3 0,0 1,144.6 143.9L35.4,143.9A6.3,6.3 0,0 1,29.1 137.6L29.1,-64.6A6.3,6.3 0,0 1,35.4 -70.9z"
+        android:strokeWidth="1.8"
+        android:fillColor="#F2F3F4"
+        android:strokeColor="#DADCE0"/>
+    <group>
+      <clip-path
+          android:pathData="M35.4,-70.9L144.6,-70.9A6.3,6.3 0,0 1,150.9 -64.6L150.9,137.6A6.3,6.3 0,0 1,144.6 143.9L35.4,143.9A6.3,6.3 0,0 1,29.1 137.6L29.1,-64.6A6.3,6.3 0,0 1,35.4 -70.9z"/>
+      <path
+          android:pathData="M40.4,-69L140.6,-69A5.4,5.4 0,0 1,146 -63.6L146,132.6A5.4,5.4 0,0 1,140.6 138L40.4,138A5.4,5.4 0,0 1,35 132.6L35,-63.6A5.4,5.4 0,0 1,40.4 -69z"
+          android:fillColor="#ffffff"/>
+      <group>
+        <clip-path
+            android:pathData="M40.4,-69L140.6,-69A5.4,5.4 0,0 1,146 -63.6L146,132.6A5.4,5.4 0,0 1,140.6 138L40.4,138A5.4,5.4 0,0 1,35 132.6L35,-63.6A5.4,5.4 0,0 1,40.4 -69z"/>
+        <path
+            android:strokeWidth="1"
+            android:pathData="M132,90.5L158,90.5A14.5,14.5 0,0 1,172.5 105L172.5,105A14.5,14.5 0,0 1,158 119.5L132,119.5A14.5,14.5 0,0 1,117.5 105L117.5,105A14.5,14.5 0,0 1,132 90.5z"
+            android:fillColor="#ffffff"
+            android:strokeColor="#DADCE0"/>
+        <path
+            android:pathData="M132.4,105m-11.2,0a11.2,11.2 0,1 1,22.4 0a11.2,11.2 0,1 1,-22.4 0"
+            android:fillColor="#80868B"/>
+        <path
+            android:pathData="M133.467,100.733C133.467,101.32 132.987,101.8 132.4,101.8C131.813,101.8 131.333,101.32 131.333,100.733C131.333,100.147 131.813,99.666 132.4,99.666C132.987,99.666 133.467,100.147 133.467,100.733ZM132.4,102.333C133.909,102.333 135.541,102.173 136.933,101.8L137.2,102.867C136.208,103.133 135.067,103.309 134,103.4V110.333H132.933V107.133H131.867V110.333H130.8V103.4C129.733,103.309 128.592,103.133 127.6,102.867L127.867,101.8C129.259,102.173 130.891,102.333 132.4,102.333Z"
+            android:fillColor="#ffffff"
+            android:fillType="evenOdd"/>
+        <path
+            android:pathData="M121.719,120.653C121.719,121.29 121.198,121.81 120.562,121.81C119.927,121.81 119.406,121.29 119.406,120.653C119.406,120.017 119.927,119.497 120.562,119.497C121.198,119.497 121.719,120.017 121.719,120.653ZM120.562,122.533C122.38,122.533 124.346,122.316 126.023,121.81L126.344,123.255C125.149,123.617 123.774,123.855 122.49,123.978V133.374H121.205V129.038H119.92V133.374H118.635V123.978C117.351,123.855 115.976,123.617 114.781,123.255L115.102,121.81C116.779,122.316 118.745,122.533 120.562,122.533Z"
+            android:fillColor="#ffffff"
+            android:fillType="evenOdd"/>
+        <group>
+          <clip-path
+              android:pathData="M121.719,120.653C121.719,121.29 121.198,121.81 120.562,121.81C119.927,121.81 119.406,121.29 119.406,120.653C119.406,120.017 119.927,119.497 120.562,119.497C121.198,119.497 121.719,120.017 121.719,120.653ZM120.562,122.533C122.38,122.533 124.346,122.316 126.023,121.81L126.344,123.255C125.149,123.617 123.774,123.855 122.49,123.978V133.374H121.205V129.038H119.92V133.374H118.635V123.978C117.351,123.855 115.976,123.617 114.781,123.255L115.102,121.81C116.779,122.316 118.745,122.533 120.562,122.533Z"
+              android:fillType="evenOdd"/>
+        </group>
+      </group>
+    </group>
+  </group>
+</vector>
diff --git a/res/drawable/ic_battery_low.xml b/res/drawable/ic_battery_low.xml
new file mode 100644
index 0000000..82f9546
--- /dev/null
+++ b/res/drawable/ic_battery_low.xml
@@ -0,0 +1,28 @@
+<!--
+  Copyright (C) 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="?android:attr/colorAccent"
+      android:pathData="M12,19m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+  <path
+      android:fillColor="?android:attr/colorAccent"
+      android:pathData="M10,3h4v12h-4z"/>
+</vector>
diff --git a/res/drawable/ic_fingerprint_introduction_shield_24dp.xml b/res/drawable/ic_fingerprint_introduction_shield_24dp.xml
new file mode 100644
index 0000000..28c9984
--- /dev/null
+++ b/res/drawable/ic_fingerprint_introduction_shield_24dp.xml
@@ -0,0 +1,45 @@
+<!--
+  Copyright (C) 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+                 xmlns:aapt="http://schemas.android.com/aapt">
+    <aapt:attr name="android:drawable">
+        <vector android:height="24dp" android:width="24dp" android:viewportHeight="24"
+                android:viewportWidth="24"
+                android:tint="?android:attr/colorControlNormal">
+            <group android:name="_R_G">
+                <group android:name="_R_G_L_0_G">
+                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#000000"
+                          android:fillAlpha="1" android:fillType="nonZero"
+                          android:pathData=" M12 2 C12,2 3.82,5.64 3.82,5.64 C3.82,5.64 3.82,11.09 3.82,11.09 C3.82,16.14 7.31,20.85 12,22 C16.69,20.85 20.18,16.14 20.18,11.09 C20.18,11.09 20.18,5.64 20.18,5.64 C20.18,5.64 12,2 12,2c  M18.18 11.09 C18.18,12.64 17.77,14.14 17.08,15.47 C15.77,14.5 13.4,14 12,14 C10.6,14 8.23,14.5 6.92,15.47 C6.23,14.14 5.82,12.64 5.82,11.09 C5.82,11.09 5.82,6.94 5.82,6.94 C5.82,6.94 12,4.19 12,4.19 C12,4.19 18.18,6.94 18.18,6.94 C18.18,6.94 18.18,11.09 18.18,11.09c "/>
+                    <path android:name="_R_G_L_0_G_D_1_P_0" android:fillColor="#000000"
+                          android:fillAlpha="1" android:fillType="nonZero"
+                          android:pathData=" M12 7.5 C13.66,7.5 15,8.84 15,10.5 C15,12.16 13.66,13.5 12,13.5 C10.34,13.5 9,12.16 9,10.5 C9,8.84 10.34,7.5 12,7.5c "/>
+                </group>
+            </group>
+            <group android:name="time_group"/>
+        </vector>
+    </aapt:attr>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="translateX" android:duration="2000"
+                                android:startOffset="0" android:valueFrom="0" android:valueTo="1"
+                                android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+</animated-vector>
\ No newline at end of file
diff --git a/res/drawable/ic_no_internet_airplane.xml b/res/drawable/ic_no_internet_airplane.xml
new file mode 100644
index 0000000..3b22811
--- /dev/null
+++ b/res/drawable/ic_no_internet_airplane.xml
@@ -0,0 +1,28 @@
+<!--
+    Copyright (C) 2021 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<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="#FF000000"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10c0.34,0 0.68,-0.02 1.01,-0.05V20h-1v-0.04c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96H13v-2H9.66c-0.09,-0.66 -0.16,-1.32 -0.16,-2s0.07,-1.35 0.16,-2H21.8C20.87,5.44 16.83,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56C16.43,5.07 17.96,6.35 18.92,8zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82C10.52,6.57 11.17,5.24 12,4.04zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2s0.06,1.34 0.14,2H4.26zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56C7.57,18.93 6.04,17.66 5.08,16zM8.03,8H5.08c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8z"
+        android:fillAlpha="0.3"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M22,19.3v-0.9l-3.37,-2.25v-2.47C18.63,13.3 18.35,13 18,13s-0.63,0.3 -0.63,0.68v2.47L14,18.4v0.9l3.37,-1.12v2.48l-0.84,0.68V22L18,21.55L19.47,22v-0.67l-0.84,-0.68v-2.48L22,19.3z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_no_internet_available.xml b/res/drawable/ic_no_internet_available.xml
new file mode 100644
index 0000000..06c6ef3
--- /dev/null
+++ b/res/drawable/ic_no_internet_available.xml
@@ -0,0 +1,31 @@
+<!--
+    Copyright (C) 2021 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<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="#FF000000"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10c0.34,0 0.68,-0.02 1.01,-0.05V20h-1v-0.04c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96H13v-2H9.66c-0.09,-0.66 -0.16,-1.32 -0.16,-2s0.07,-1.35 0.16,-2H21.8C20.87,5.44 16.83,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56C16.43,5.07 17.96,6.35 18.92,8zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82C10.52,6.57 11.17,5.24 12,4.04zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2s0.06,1.34 0.14,2H4.26zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56C7.57,18.93 6.04,17.66 5.08,16zM8.03,8H5.08c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8z"
+        android:fillAlpha="0.3"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16,14.75c0,-1.93 1.57,-3.5 3.5,-3.5s3.5,1.57 3.5,3.5c0,1.12 -0.69,1.73 -1.36,2.32c-0.64,0.56 -1.26,1.1 -1.26,2.06h-1.75c0,-1.59 0.82,-2.22 1.54,-2.78c0.57,-0.44 1.08,-0.83 1.08,-1.6c0,-0.96 -0.79,-1.75 -1.75,-1.75s-1.75,0.79 -1.75,1.75H16z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18.63,20.25h1.75V22h-1.75V20.25z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_notification_silence.xml b/res/drawable/ic_notification_silence.xml
index 9da56dd..4b71d65 100644
--- a/res/drawable/ic_notification_silence.xml
+++ b/res/drawable/ic_notification_silence.xml
@@ -14,28 +14,13 @@
     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
-        android:id="@+id/back">
-        <shape android:shape="oval">
-            <solid
-                android:color="@color/notification_silence_color" />
-            <size
-                android:height="24dp"
-                android:width="24dp"/>
-        </shape>
-    </item>
-    <item
-        android:id="@+id/fore"
-        android:gravity="center">
-        <vector
-            android:width="13dp"
-            android:height="13dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+            android:width="24dp"
+            android:height="24dp"
             android:viewportWidth="24"
-            android:viewportHeight="24">
-            <path
-                android:fillColor="#FFFFFFFF"
-                android:pathData="M15,14.5c-1.38,0 -2.5,-1.12 -2.5,-2.5c0,-0.28 -0.22,-0.5 -0.5,-0.5s-0.5,0.22 -0.5,0.5c0,1.38 -1.12,2.5 -2.5,2.5S6.5,13.38 6.5,12c0,-0.28 -0.22,-0.5 -0.5,-0.5c-0.24,0 -0.46,0.18 -0.49,0.42C5.41,12.55 4.89,13 4.27,13H2v-2h1.71C4.1,10.11 5,9.5 6,9.5c1.38,0 2.5,1.12 2.5,2.5c0,0.28 0.22,0.5 0.5,0.5s0.5,-0.22 0.5,-0.5c0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5c0,0.28 0.22,0.5 0.5,0.5s0.5,-0.22 0.5,-0.5c0,-1.38 1.12,-2.5 2.5,-2.5c1.02,0 1.91,0.6 2.29,1.5H22v2h-2.27c-0.62,0 -1.14,-0.45 -1.23,-1.08c-0.04,-0.24 -0.25,-0.42 -0.49,-0.42c-0.28,0 -0.5,0.22 -0.5,0.5C17.5,13.38 16.38,14.5 15,14.5z"/>
-        </vector>
-    </item>
-</layer-list>
+            android:viewportHeight="24"
+            android:tint="?android:attr/colorControlNormal">
+    <path
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM16,16L2.81,2.81 1.39,4.22l4.85,4.85C6.09,9.68 6,10.33 6,11v6L4,17v2h12.17l3.61,3.61 1.41,-1.41L16,16zM8,17l0.01,-6.16L14.17,17L8,17zM12,6.5c2.49,0 4,2.02 4,4.5v2.17l2,2L18,11c0,-3.07 -1.63,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68c-0.78,0.18 -1.45,0.52 -2.04,0.95L9.93,7.1c0.58,-0.37 1.27,-0.6 2.07,-0.6z"
+        android:fillColor="@android:color/white"/>
+</vector>
diff --git a/res/drawable/ic_ongoing_notification.xml b/res/drawable/ic_ongoing_notification.xml
new file mode 100644
index 0000000..238b517
--- /dev/null
+++ b/res/drawable/ic_ongoing_notification.xml
@@ -0,0 +1,25 @@
+<!--
+  Copyright (C) 2021 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,18h0.17l-1.09,-1.09 1.41,-1.41L16,19l-3.5,3.5 -1.41,-1.41L12.17,20L12,20c-2.05,0 -4.09,-0.78 -5.66,-2.34 -3.12,-3.12 -3.12,-8.19 0,-11.31l1.41,1.41c-2.34,2.34 -2.34,6.15 0,8.49C8.89,17.38 10.4,18 12,18zM17.66,6.34c3.12,3.12 3.12,8.19 0,11.31l-1.41,-1.41c2.34,-2.34 2.34,-6.15 0,-8.49C15.11,6.62 13.6,6 12,6h-0.17l1.09,1.09L11.5,8.5 8,5l3.5,-3.5 1.41,1.41L11.83,4L12,4c2.05,0 4.09,0.78 5.66,2.34z"/>
+</vector>
diff --git a/res/drawable/one_handed_guideline.xml b/res/drawable/one_handed_guideline.xml
new file mode 100644
index 0000000..2c1a158
--- /dev/null
+++ b/res/drawable/one_handed_guideline.xml
@@ -0,0 +1,45 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="412dp"
+    android:height="264dp"
+    android:viewportWidth="412"
+    android:viewportHeight="264">
+  <group>
+    <clip-path
+        android:pathData="M0,0h412v264h-412z"/>
+    <path
+        android:pathData="M126,-246C109.431,-246 96,-232.569 96,-216V195C96,211.569 109.431,225 126,225H284.5C301.069,225 314.5,211.569 314.5,195V-216C314.5,-232.569 301.069,-246 284.5,-246H126ZM122,-235C110.954,-235 102,-226.046 102,-215V189.5C102,200.546 110.954,209.5 122,209.5H288C299.046,209.5 308,200.546 308,189.5V-215C308,-226.046 299.046,-235 288,-235H122Z"
+        android:fillColor="#000000"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M122.12,-233L288.12,-233A20,20 0,0 1,308.12 -213L308.12,191.5A20,20 0,0 1,288.12 211.5L122.12,211.5A20,20 0,0 1,102.12 191.5L102.12,-213A20,20 0,0 1,122.12 -233z"
+        android:fillColor="#EAF1FF"/>
+    <path
+        android:pathData="M102.16,193.12H308.08C308.08,203.326 299.806,211.6 289.6,211.6H120.64C110.434,211.6 102.16,203.326 102.16,193.12Z"
+        android:fillColor="#B5CFFC"/>
+    <path
+        android:pathData="M187.5,202.72L222.5,202.72A0.5,0.5 0,0 1,223 203.22L223,203.22A0.5,0.5 0,0 1,222.5 203.72L187.5,203.72A0.5,0.5 0,0 1,187 203.22L187,203.22A0.5,0.5 0,0 1,187.5 202.72z"
+        android:fillColor="#666666"/>
+    <path
+        android:pathData="M197,115h36v94.684h-36z"
+        android:strokeAlpha="0.8"
+        android:fillAlpha="0.8">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startY="189.19"
+            android:startX="212.951"
+            android:endY="168.637"
+            android:endX="212.447"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF4285F4"/>
+          <item android:offset="1" android:color="#004385F5"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M197,206.899a18,18.101 0,1 0,36 0a18,18.101 0,1 0,-36 0z"
+        android:strokeAlpha="0.8"
+        android:fillColor="#3B7BE4"
+        android:fillAlpha="0.8"/>
+  </group>
+</vector>
diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml
deleted file mode 100644
index 184c9c6..0000000
--- a/res/layout-land/fingerprint_enroll_enrolling.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 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
-  -->
-
-<com.google.android.setupdesign.GlifLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/setup_wizard_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout="@layout/sud_glif_blank_template"
-    style="?attr/fingerprint_layout_theme">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true">
-        <LinearLayout
-            style="@style/SudContentFrame"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:clipToPadding="false"
-            android:clipChildren="false"
-            android:paddingBottom="0dp">
-
-            <!-- Both texts are kept as separate text views so it doesn't jump around in portrait.
-                 See layouts/fingerprint_enroll_enrolling_base.xml. -->
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:layout_marginStart="?attr/sudMarginStart"
-                android:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/sud_layout_icon"
-                    style="@style/SudGlifIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="?attr/sudGlifHeaderGravity"
-                    android:layout_marginStart="0dp"
-                    android:layout_marginEnd="0dp"
-                    android:src="@drawable/ic_fingerprint_header" />
-
-                <TextView
-                    android:id="@+id/suc_layout_title"
-                    style="@style/SudGlifHeaderTitle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="0dp"
-                    android:layout_marginEnd="0dp" />
-
-                <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <TextView
-                        style="@style/SudDescription.Glif"
-                        android:id="@+id/sud_layout_description"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/security_settings_fingerprint_enroll_start_message"/>
-
-                    <TextView
-                        style="@style/SudDescription.Glif"
-                        android:id="@+id/repeat_message"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/security_settings_fingerprint_enroll_repeat_message"
-                        android:visibility="invisible"/>
-
-                </FrameLayout>
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_weight="1" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <com.google.android.setupdesign.view.FillContentLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="0dp"
-                    android:layout_marginVertical="24dp"
-                    android:layout_weight="1"
-                    android:paddingTop="0dp"
-                    android:paddingBottom="0dp">
-
-                    <include layout="@layout/fingerprint_enroll_enrolling_content"
-                         android:layout_width="match_parent"
-                         android:layout_height="match_parent"
-                         android:layout_gravity="center" />
-                </com.google.android.setupdesign.view.FillContentLayout>
-
-                <TextView
-                    style="@style/TextAppearance.ErrorText"
-                    android:id="@+id/error_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="16dp"
-                    android:layout_gravity="center_horizontal|bottom"
-                    android:accessibilityLiveRegion="polite"
-                    android:gravity="center_horizontal"
-                    android:paddingEnd="5dp"
-                    android:paddingStart="5dp"
-                    android:visibility="invisible"/>
-
-            </LinearLayout>
-
-        </LinearLayout>
-    </ScrollView>
-</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout-land/fingerprint_enroll_find_sensor.xml b/res/layout-land/fingerprint_enroll_find_sensor.xml
deleted file mode 100644
index 5d3e851..0000000
--- a/res/layout-land/fingerprint_enroll_find_sensor.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 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
-  -->
-
-<com.google.android.setupdesign.GlifLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/setup_wizard_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout="@layout/sud_glif_blank_template"
-    style="?attr/fingerprint_layout_theme">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:clipToPadding="false"
-        android:clipChildren="false">
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="match_parent"
-            android:layout_marginStart="?attr/sudMarginStart"
-            android:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:orientation="vertical">
-
-            <ScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                android:fillViewport="true">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:clipChildren="false"
-                    android:clipToPadding="false">
-
-                    <ImageView
-                        android:id="@+id/sud_layout_icon"
-                        style="@style/SudGlifIcon"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="?attr/sudGlifHeaderGravity"
-                        android:layout_marginStart="0dp"
-                        android:layout_marginEnd="0dp"
-                        android:src="@drawable/ic_fingerprint_header" />
-
-                    <TextView
-                        android:id="@+id/suc_layout_title"
-                        style="@style/SudGlifHeaderTitle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="0dp"
-                        android:layout_marginEnd="0dp" />
-
-                    <TextView
-                        android:id="@+id/sud_layout_description"
-                        style="@style/SudDescription.Glif"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
-
-                    <Space
-                        android:layout_width="0dp"
-                        android:layout_height="0dp"
-                        android:layout_weight="1" />
-
-                </LinearLayout>
-
-            </ScrollView>
-
-        </LinearLayout>
-
-        <FrameLayout
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="match_parent">
-
-            <include
-                layout="@layout/fingerprint_enroll_find_sensor_graphic"
-                android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"
-                android:layout_height="@dimen/fingerprint_find_sensor_graphic_size"
-                android:layout_gravity="center"/>
-
-        </FrameLayout>
-
-    </LinearLayout>
-
-</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml
deleted file mode 100644
index 4159516..0000000
--- a/res/layout-land/fingerprint_enroll_finish.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2015 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
-  -->
-
-<com.google.android.setupdesign.GlifLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/setup_wizard_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout="@layout/sud_glif_blank_template"
-    style="?attr/fingerprint_layout_theme">
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true">
-
-        <LinearLayout
-            style="@style/SudContentFrame"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:clipToPadding="false"
-            android:clipChildren="false">
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/sud_layout_icon"
-                    style="@style/SudGlifIcon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="?attr/sudGlifHeaderGravity"
-                    android:layout_marginLeft="0dp"
-                    android:layout_marginRight="0dp"
-                    android:contentDescription="@null"
-                    android:src="@drawable/ic_fingerprint_header"/>
-
-                <TextView
-                    android:id="@+id/suc_layout_title"
-                    style="@style/SudGlifHeaderTitle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="0dp"
-                    android:layout_marginRight="0dp"/>
-
-                <TextView
-                    android:id="@+id/sud_layout_description"
-                    style="@style/SudDescription.Glif"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
-
-            </LinearLayout>
-
-            <com.google.android.setupdesign.view.FillContentLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="match_parent">
-
-                <ImageView
-                    android:id="@+id/fingerprint_in_app_indicator"
-                    style="@style/SudContentIllustration"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:contentDescription="@android:string/fingerprint_icon_content_description"
-                    android:src="@drawable/fingerprint_enroll_finish" />
-
-            </com.google.android.setupdesign.view.FillContentLayout>
-
-        </LinearLayout>
-    </ScrollView>
-</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/accessibility_button_preview.xml b/res/layout/accessibility_button_preview.xml
new file mode 100644
index 0000000..07cb0ff
--- /dev/null
+++ b/res/layout/accessibility_button_preview.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clipToPadding="false"
+    android:importantForAccessibility="noHideDescendants">
+
+    <ImageView
+        android:id="@+id/preview_image"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/accessibility_button_preview_height"
+        android:layout_gravity="center"
+        android:scaleType="fitCenter"
+        android:focusable="false"
+        android:clickable="false"
+        android:adjustViewBounds="true"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/admin_support_details_dialog.xml b/res/layout/admin_support_details_dialog.xml
index 2e126cc..298cf24 100644
--- a/res/layout/admin_support_details_dialog.xml
+++ b/res/layout/admin_support_details_dialog.xml
@@ -49,7 +49,6 @@
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
                       android:textAppearance="@style/TextAppearance.HeadLineFontFamily.Subhead"
-                      android:text="@string/default_admin_support_msg"
                       android:maxLength="200"
                       android:autoLink="email|phone|web"
                       android:textColor="?android:attr/textColorSecondary"/>
diff --git a/res/layout/view_airplane_mode_networks_button.xml b/res/layout/airplane_mode_message_preference.xml
similarity index 62%
rename from res/layout/view_airplane_mode_networks_button.xml
rename to res/layout/airplane_mode_message_preference.xml
index 0599274..032161b 100644
--- a/res/layout/view_airplane_mode_networks_button.xml
+++ b/res/layout/airplane_mode_message_preference.xml
@@ -22,7 +22,6 @@
     android:orientation="vertical">
 
     <TextView
-        android:id="@+id/airplane_mode_text"
         android:text="@string/condition_airplane_title"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:layout_width="wrap_content"
@@ -30,17 +29,6 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginStart="@dimen/content_margin_left"
         android:layout_marginEnd="@dimen/content_margin_left"
-        android:layout_marginTop="@dimen/view_airplane_mode_networks_button_margin_vertical"
-        android:layout_marginBottom="@dimen/view_airplane_mode_networks_button_margin_vertical"/>
-
-    <Button
-        android:id="@+id/view_airplane_mode_networks_button"
-        android:text="@string/view_airplane_safe_networks"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginStart="@dimen/content_margin_left"
-        android:layout_marginEnd="@dimen/content_margin_left"
-        android:layout_marginBottom="@dimen/view_airplane_mode_networks_button_margin_vertical"
-        style="@style/ActionPrimaryButton"/>
+        android:layout_marginTop="@dimen/airplane_mode_message_margin_vertical"
+        android:layout_marginBottom="@dimen/airplane_mode_message_margin_vertical"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/enable_accessibility_service_dialog_content.xml b/res/layout/enable_accessibility_service_dialog_content.xml
index 59cb6dd..6b3220b 100644
--- a/res/layout/enable_accessibility_service_dialog_content.xml
+++ b/res/layout/enable_accessibility_service_dialog_content.xml
@@ -134,6 +134,11 @@
                 android:text="@string/accessibility_dialog_button_deny"
                 style="@style/AccessibilityDialogButton" />
 
+            <Button
+                android:id="@+id/permission_enable_uninstall_button"
+                android:text="@string/uninstall_text"
+                android:visibility="gone"
+                style="@style/AccessibilityDialogButton" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/res/layout/fingerprint_enroll_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml
index e1a9707..a0805ba 100644
--- a/res/layout/fingerprint_enroll_enrolling_base.xml
+++ b/res/layout/fingerprint_enroll_enrolling_base.xml
@@ -30,31 +30,6 @@
         android:clipToPadding="false"
         android:clipChildren="false">
 
-        <!-- Make both texts included for layout, so the lower part doesn't jump around when we
-             switch the text -->
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                style="@style/SudDescription.Glif"
-                android:id="@+id/sud_layout_description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:minLines="3"
-                android:text="@string/security_settings_fingerprint_enroll_start_message"/>
-
-            <TextView
-                style="@style/SudDescription.Glif"
-                android:id="@+id/repeat_message"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:minLines="3"
-                android:text="@string/security_settings_fingerprint_enroll_repeat_message"
-                android:visibility="invisible"/>
-
-        </FrameLayout>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
diff --git a/res/layout/fingerprint_enroll_find_sensor_base.xml b/res/layout/fingerprint_enroll_find_sensor_base.xml
index ce3104f..62203f7 100644
--- a/res/layout/fingerprint_enroll_find_sensor_base.xml
+++ b/res/layout/fingerprint_enroll_find_sensor_base.xml
@@ -29,23 +29,6 @@
         android:clipToPadding="false"
         android:clipChildren="false">
 
-        <LinearLayout
-            style="@style/SudContentFrame"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:clipToPadding="false"
-            android:clipChildren="false">
-
-            <TextView
-                style="@style/SudDescription.Glif"
-                android:id="@+id/sud_layout_description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/sud_description_glif_margin_top"
-                android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
-        </LinearLayout>
-
         <Space
             android:layout_width="wrap_content"
             android:layout_height="0dp"
diff --git a/res/layout/fingerprint_enroll_finish_base.xml b/res/layout/fingerprint_enroll_finish_base.xml
index 1f9167e..262374d 100644
--- a/res/layout/fingerprint_enroll_finish_base.xml
+++ b/res/layout/fingerprint_enroll_finish_base.xml
@@ -30,15 +30,6 @@
         android:clipToPadding="false"
         android:clipChildren="false">
 
-        <TextView
-            android:id="@+id/sud_layout_description"
-            style="@style/SudDescription.Glif"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/sud_description_glif_margin_top"
-            android:minLines="3"
-            android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
diff --git a/res/layout/fingerprint_enroll_introduction.xml b/res/layout/fingerprint_enroll_introduction.xml
index 0aa18fb..8555f1a 100644
--- a/res/layout/fingerprint_enroll_introduction.xml
+++ b/res/layout/fingerprint_enroll_introduction.xml
@@ -31,22 +31,15 @@
         android:orientation="vertical">
 
         <com.google.android.setupdesign.view.RichTextView
-            android:id="@+id/sud_layout_description"
-            style="@style/SudDescription.Glif"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/security_settings_fingerprint_enroll_introduction_message" />
-
-        <com.google.android.setupdesign.view.RichTextView
             android:id="@+id/error_text"
             style="@style/SudDescription.Glif"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-        <com.google.android.setupdesign.view.FillContentLayout
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1">
+            android:layout_marginVertical="12dp">
 
             <ImageView
                 style="@style/SudContentIllustration"
@@ -55,25 +48,89 @@
                 android:contentDescription="@null"
                 android:src="@drawable/fingerprint_enroll_introduction" />
 
-        </com.google.android.setupdesign.view.FillContentLayout>
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@null"
-                android:src="@drawable/ic_info_outline_24dp"/>
+            android:orientation="vertical">
 
             <com.google.android.setupdesign.view.RichTextView
-                android:id="@+id/sud_layout_info"
                 style="@style/SudDescription.Glif"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/security_settings_fingerprint_enroll_introduction_bottom_message" />
+                android:textAlignment="viewStart"
+                android:paddingTop="12dp"
+                android:text="@string/security_settings_fingerprint_enroll_introduction_footer_title_1" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingTop="12dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@null"
+                    android:src="@drawable/ic_fingerprint_introduction_shield_24dp"/>
+                <Space
+                    android:layout_width="24dp"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/security_settings_fingerprint_enroll_introduction_footer_message_1" />
+            </LinearLayout>
+
+            <TextView
+                style="@style/SudDescription.Glif"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="viewStart"
+                android:paddingTop="24dp"
+                android:text="@string/security_settings_fingerprint_enroll_introduction_footer_title_2" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingTop="12dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@null"
+                    android:src="@drawable/ic_info_outline_24dp"/>
+                <Space
+                    android:layout_width="24dp"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/security_settings_fingerprint_enroll_introduction_footer_message_2" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingTop="24dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:contentDescription="@null"
+                    android:src="@drawable/ic_fingerprint_24dp"/>
+                <Space
+                    android:layout_width="24dp"
+                    android:layout_height="wrap_content"/>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/security_settings_fingerprint_enroll_introduction_footer_message_3" />
+            </LinearLayout>
+
         </LinearLayout>
 
     </LinearLayout>
diff --git a/res/layout/locale_order_list.xml b/res/layout/locale_order_list.xml
index 929582f..a1f93cd 100644
--- a/res/layout/locale_order_list.xml
+++ b/res/layout/locale_order_list.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layoutDirection="locale"
@@ -48,4 +48,4 @@
 
     </LinearLayout>
 
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/res/layout/manage_applications_apps_v2.xml b/res/layout/manage_applications_apps_v2.xml
index ecc764a..72c8ee8 100644
--- a/res/layout/manage_applications_apps_v2.xml
+++ b/res/layout/manage_applications_apps_v2.xml
@@ -48,7 +48,7 @@
             android:id="@android:id/empty"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center"
+            android:gravity="bottom|center_horizontal"
             android:layout_gravity="center"
             android:text="@string/no_applications"
             android:textAppearance="?android:attr/textAppearanceLarge"
diff --git a/res/layout/notification_channel_panel.xml b/res/layout/notification_channel_panel.xml
new file mode 100644
index 0000000..49cd95c
--- /dev/null
+++ b/res/layout/notification_channel_panel.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main_content"
+    android:layout_height="@dimen/output_switcher_slice_max_height"
+    android:background="@drawable/settings_panel_background"
+    android:orientation="vertical"
+    android:layout_width="match_parent">
+
+    <FrameLayout
+        android:id="@android:id/list_container"
+        android:layout_height="0px"
+        android:layout_weight="1"
+        android:layout_width="match_parent"/>
+
+    <View
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/footer_divider"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/horizontal_divider_height"
+        android:background="?android:attr/dividerHorizontal"/>
+
+    <LinearLayout
+        android:id="@+id/footer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
+
+        <Button
+            android:id="@+id/see_more"
+            style="@android:style/Widget.DeviceDefault.Button.Borderless.Colored"
+            android:layout_width="wrap_content"
+            android:layout_height="48dp"
+            android:layout_marginStart="12dp"
+            android:text="@string/see_more"/>
+
+        <Space
+            android:layout_weight="1"
+            android:layout_width="0dp"
+            android:layout_height="match_parent" />
+
+        <Button
+            android:id="@+id/done"
+            style="@android:style/Widget.DeviceDefault.Button.Borderless.Colored"
+            android:layout_width="wrap_content"
+            android:layout_height="48dp"
+            android:layout_marginEnd="12dp"
+            android:text="@string/done"/>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/one_handed_header.xml b/res/layout/one_handed_header.xml
new file mode 100644
index 0000000..2104e40
--- /dev/null
+++ b/res/layout/one_handed_header.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:scaleType="centerCrop"
+        android:cropToPadding="true"
+        android:src="@drawable/one_handed_guideline"
+        android:contentDescription="@null" />
+
+</FrameLayout>
diff --git a/res/layout/preference_widget_dialog_summary.xml b/res/layout/preference_widget_dialog_summary.xml
index 2978efb..e37be71 100644
--- a/res/layout/preference_widget_dialog_summary.xml
+++ b/res/layout/preference_widget_dialog_summary.xml
@@ -18,7 +18,6 @@
 
 <TextView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:text="@string/bluetooth_select_a2dp_codec_type_help_info"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/developer_option_dialog_margin_top"
diff --git a/res/layout/reset_network.xml b/res/layout/reset_network.xml
index f6135a9..47fa56a 100644
--- a/res/layout/reset_network.xml
+++ b/res/layout/reset_network.xml
@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_marginStart="@dimen/reset_network_margin_start"
@@ -38,7 +38,7 @@
                 android:text="@string/reset_network_desc" />
             <include layout="@layout/reset_esim_checkbox"/>
         </LinearLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
     <Spinner android:id="@+id/reset_network_subscription"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="20dp"
diff --git a/res/layout/settings_collapsing_base_layout.xml b/res/layout/settings_collapsing_base_layout.xml
index ba9e625..7ebf433 100644
--- a/res/layout/settings_collapsing_base_layout.xml
+++ b/res/layout/settings_collapsing_base_layout.xml
@@ -39,7 +39,7 @@
             app:statusBarScrim="?android:attr/colorPrimary"
             app:layout_scrollFlags="scroll|exitUntilCollapsed"
             app:expandedTitleMarginStart="18dp"
-            app:expandedTitleMarginEnd="18dp"
+            app:expandedTitleMarginEnd="16dp"
             app:toolbarId="@id/action_bar">
 
             <Toolbar
diff --git a/res/layout/udfps_enroll_enrolling.xml b/res/layout/udfps_enroll_enrolling.xml
index 03b6528..67c127b 100644
--- a/res/layout/udfps_enroll_enrolling.xml
+++ b/res/layout/udfps_enroll_enrolling.xml
@@ -20,7 +20,25 @@
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout="@layout/sud_glif_blank_template"
     style="?attr/fingerprint_layout_theme">
 
+    <LinearLayout
+        style="@style/SudContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:clipChildren="false"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/error_text"
+            style="@style/TextAppearance.ErrorText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal|bottom"
+            android:accessibilityLiveRegion="polite"
+            android:gravity="center_horizontal"
+            android:visibility="invisible" />
+    </LinearLayout>
+
 </com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/udfps_enroll_find_sensor_layout.xml b/res/layout/udfps_enroll_find_sensor_layout.xml
index 259d43f..2f98be3 100644
--- a/res/layout/udfps_enroll_find_sensor_layout.xml
+++ b/res/layout/udfps_enroll_find_sensor_layout.xml
@@ -20,29 +20,4 @@
     style="?attr/fingerprint_layout_theme"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:clipToPadding="false"
-        android:clipChildren="false">
-
-        <LinearLayout
-            style="@style/SudContentFrame"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:clipToPadding="false"
-            android:clipChildren="false">
-
-            <TextView
-                style="@style/SudDescription.Glif"
-                android:id="@+id/sud_layout_description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/sud_description_glif_margin_top"
-                android:text="@string/security_settings_udfps_enroll_find_sensor_message"/>
-        </LinearLayout>
-    </LinearLayout>
 </com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/udfps_enroll_layout.xml b/res/layout/udfps_enroll_layout.xml
deleted file mode 100644
index 8338589..0000000
--- a/res/layout/udfps_enroll_layout.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2015 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
-  -->
-
-<com.android.settings.biometrics.fingerprint.UdfpsEnrollLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/setup_wizard_layout"
-    style="?attr/fingerprint_layout_theme"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/sud_layout_icon"
-        style="@style/SudGlifIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="?attr/sudGlifHeaderGravity"
-        android:layout_marginEnd="0dp"
-        android:layout_marginStart="0dp"
-        android:src="@drawable/ic_fingerprint_header" />
-
-    <TextView
-        android:id="@+id/suc_layout_title"
-        style="@style/SudGlifHeaderTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="0dp"
-        android:layout_marginStart="0dp" />
-
-    <FrameLayout
-        android:id="@+id/description_area"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/sud_layout_description"
-            style="@style/SudDescription.Glif"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/security_settings_fingerprint_enroll_start_message" />
-
-        <TextView
-            android:id="@+id/repeat_message"
-            style="@style/SudDescription.Glif"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/security_settings_fingerprint_enroll_repeat_message"
-            android:visibility="invisible" />
-
-    </FrameLayout>
-
-    <TextView
-        android:id="@+id/error_text"
-        style="@style/TextAppearance.ErrorText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal|bottom"
-        android:layout_marginBottom="16dp"
-        android:accessibilityLiveRegion="polite"
-        android:gravity="center_horizontal"
-        android:paddingEnd="5dp"
-        android:paddingStart="5dp"
-        android:visibility="invisible" />
-</com.android.settings.biometrics.fingerprint.UdfpsEnrollLayout>
diff --git a/res/layout/wifi_calling_settings_preferences.xml b/res/layout/wifi_calling_settings_preferences.xml
index 7e411e1..98acd95 100644
--- a/res/layout/wifi_calling_settings_preferences.xml
+++ b/res/layout/wifi_calling_settings_preferences.xml
@@ -21,11 +21,11 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.android.settings.widget.SwitchBar
+    <com.android.settings.widget.SettingsMainSwitchBar
         android:id="@+id/switch_bar"
-        android:layout_height="?android:attr/actionBarSize"
-        android:layout_width="match_parent"
-        android:theme="?attr/switchBarTheme" />
+        android:title="@string/wifi_calling_main_switch_title"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent" />
 
     <FrameLayout
         android:id="@android:id/tabcontent"
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 2cc6c8a..6f83e5c 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/dialog_scrollview"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -704,4 +704,4 @@
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 581f3cd..2026618 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Maak kleiner"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Maak groter"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Gebruik outodraai"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Gesiggegronde outodraai gebruik die voorste kamera om te sien of en hoe iemand na die skerm kyk. Dit maak dit moontlik om te lees terwyl jy lê – en prente word nooit geberg of na Google toe gestuur nie.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Kom meer te wete&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Voorbeeldteks"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Die Wonderlike Towenaar van Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Hoofstuk 11: Die Wonderlike Smaragstad van Oz"</string>
@@ -403,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> vingerafdruk is opgestel</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Ontsluit met vingerafdruk"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Stel jou vingerafdruk op"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Gebruik jou vingerafdruk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Raak eenvoudig die vingerafdruksensor om jou foon te ontsluit, aankope te magtig en by programme aan te meld. Wees versigtig wie se vingerafdrukke jy byvoeg. Selfs net een vingerafdruk wat bygevoeg is, kan enige van hierdie dinge doen."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Jou vingerafdruk sal dalk minder veilig as \'n sterk patroon of PIN wees."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Jy is in beheer"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Hou in gedagte"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Die data wat deur vingerafdruk opgeneem word, word veilig geberg en bly altyd net op jou foon. Jy kan jou data enige tyd in Instellings uitvee."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Jou vingerafdruk sal dalk minder veilig as \'n sterk patroon of PIN wees."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Jou foon sal van tyd tot tyd jou onlangse vingerafdrukprente gebruik om verbeterde vingerafdrukmodelle te skep."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Gebruik jou vingerafdruk om jou foon te ontsluit of aankope goed te keur.\n\nLet wel: Jy kan nie jou vingerafdruk gebruik om hierdie toestel te ontsluit nie. Gebruik jou organisasie se administrateur vir meer inligting."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Gebruik jou vingerafdruk om jou foon te ontsluit of aankope goed te keur.\n\nLet wel: Jou vingerafdruk kan dalk minder veilig as \'n sterk patroon of PIN wees."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Kanselleer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nee, dankie"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Slaan oor"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Gaan voort"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Stem in"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Slaan oor"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Volgende"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Slaan vingerafdruk oor?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Slaan oor"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Kanselleer"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Raak die sensor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Raak en hou die vingerafdrukikoon"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Dit is op die agterkant van jou foon. Gebruik jou wysvinger."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Dis op die skerm. Soek die vingerafdruk met \'n gloeiende sirkel."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Die vingerafdruksensor is op jou skerm. Beweeg jou vinger oor die skerm om dit te kry."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustrasie met toestel en ligging van vingerafdruksensor"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Naam"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Goed"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Vee uit"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Raak die sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Plaas jou vinger op die sensor en lig dit op wanneer jy \'n vibrasie voel"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Lig en raak dan weer"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Hou aan om jou vinger op te lig om die verskillende dele van jou vingerafdruk by te voeg"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Vingerafdruk bygevoeg"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Gebruik jou vingerafdruk vir identifikasie of om aankope goed te keur wanneer jy hierdie ikoon sien"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Doen dit later"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aan / skerm sal nie afskakel as jy daarna kyk nie"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Af"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Kameratoegang is nodig"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Tik om toestemmings vir Toestelpersonaliseringdienste te bestuur"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Keer dat jou skerm afskakel terwyl jy daarna kyk"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Skermaandag gebruik die voorste kamera om te sien of iemand na die skerm kyk. Dit werk op die toestel, en prente word nooit geberg of na Google toe gestuur nie."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Skakel skermaandag aan"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Wanneer die skerm donker is, sal dit aanskakel vir nuwe kennisgewings"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Wys altyd tyd en inligting"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Verhoogde batterygebruik"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Teks in vetdruk"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Teks in vetdruk"</string>
     <string name="title_font_size" msgid="570613010306330622">"Lettertipegrootte"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Maak teks groter of kleiner"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM-kaartsluitinstellings"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Ander gebruikers"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Toestelberging"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Draagbare berging"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Wekkers en onthounotas"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Laat toe om wekkers of onthounotas te stel"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Wekkers en onthounotas"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Laat hierdie program toe om wekkers of ander tydgegronde geleenthede te stel. Die program sal kan wakker word en loop selfs wanneer jy nie die toestel gebruik nie. Neem kennis dat hierdie program dalk nie sal werk as hierdie toestemming herroep word nie – in besonder sal enige wekkers wat die program geskeduleer het, nie werk nie."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"skedule, wekker, onthounota, geleentheid"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> gebruik van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"gebruik van <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Liggingdienste"</string>
     <string name="location_title" msgid="5819154746934945021">"My ligging"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Ligging vir werkprofiel"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Programtoegang tot ligging"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Ligging is af"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> van <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> programme het toegang tot ligging</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> van <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> programme het toegang tot ligging</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Onlangse liggingtoegang"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Bekyk besonderhede"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Geen programme het onlangs ligging versoek nie"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Geen programme het onlangs toegang tot jou ligging gekry nie"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Hoë batterygebruik"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Lae batterygebruik"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi- en Bluetooth-skandering"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi-opsporing"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Laat programme en dienste toe om enige tyd na Wi-Fi-netwerke te soek, selfs wanneer Wi-Fi af is. Dit kan byvoorbeeld gebruik word om ligginggegronde kenmerke en dienste te verbeter."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-opsporing"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Laat programme en dienste toe om enige tyd na toestelle in die omtrek te soek, selfs wanneer Bluetooth af is. Dit kan byvoorbeeld gebruik word om ligginggegronde kenmerke en dienste te verbeter."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Liggingdienste"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Liggingdienste vir werk"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Liggingtydsonebespeuring"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Liggingtydsonebespeuring"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Laat toe dat toestel se ligging gebruik word om die huidige tydsone te bespeur. Ander ligginginstellings soos wi‑fi-skandering kan die akkuraatheid van tydsonebespeuring beïnvloed."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Aan"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Af"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Outomatiese tydsonebespeuring is gedeaktiveer"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Outomatiese tydsone is af"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Liggingtydsonebespeuring is gedeaktiveer"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Liggingtydsonebespeuring word nie gesteun nie"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Veranderings aan liggingtydsonebespeuring word nie toegelaat nie"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Aktiveer"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Vee berging uit"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Deïnstalleer opdaterings"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Jy het gekies om hierdie program by verstek vir \'n paar handelinge te loods."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Sommige aktiwiteite wat jy gekies het, maak by verstek in hierdie program oop."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Jy het gekies om toe te laat dat hierdie program legstukke skep en by hulle data ingaan."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Verstek instellings nie opgestel nie."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Vee verstekke uit"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Vee verstekvoorkeure uit"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Hierdie program is dalk nie vir jou skerm ontwerp nie; jy kan hier beheer hoe dit by jou skerm aanpas."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Vra wanneer laat loop word"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Skaleer program"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Jy kan hierdie toestel pasmaak om by jou behoeftes te pas. Hierdie toeganklikheidkenmerke kan later in Instellings verander word."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Verander lettergrootte"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Skermlesers"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Oudio en teks op skerm"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Onderskrifte"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Oudio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Algemeen"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Vertoon"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Teks en skerm"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Maak skerm donkerder"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rooi-groen"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rooi-groen"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blou-geel"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Verminder helderheid"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Verminder helderheid"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Maak skerm donkerder as jou foon se minimum helderheid"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Maak skerm donkerder as jou tablet se minimum helderheid"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Maak jou skerm donkerder sodat dit geriefliker is om te lees.&lt;br/&gt;&lt;br/&gt; Dit kan nuttig wees wanneer: &lt;ol&gt; &lt;li&gt; Jou foon se verstek- minimum helderheid steeds te helder is&lt;/li&gt; &lt;li&gt; Jy jou foon in donker situasies gebruik, soos snags of in \'n donker vertrek voor slaaptyd&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"gesig"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"vingerafdruk, voeg vingerafdruk by"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"verdof skerm, raakskerm, battery, slimhelderheid, dinamiese helderheid, outohelderheid"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"verdonker skerm, slaap, battery, uitteltyd, aandag, skerm, onaktiwiteit"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"draai, keer om, rotasie, portret, landskap, oriëntasie, vertikaal, horisontaal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"gradeer op, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"msn, skedule, kennisgewings, blokkeer, stilte, vibreer, slaap, werk, fokus, klank, demp, dag, weeksdag, naweek, weeksaand, geleentheid"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"skerm, sluittyd, uitteltyd, sluitskerm"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Luitone"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Ander klanke en vibrasies"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Kennisgewings"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Gesprek"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Onlangs gestuur"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Sien alles van afgelope 7 dae"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Gevorderd"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Algemeen"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Werkkennisgewings"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Aanpasbare kennisgewings"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Aanpasbare kennisgewingprioriteit"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Wys op aftrekskerm, statusbalk en sluitskerm"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Versteek stil kennisgewings in statusbalk"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Flikkerende lig"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Kennisgewings op sluitskerm"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privaatheid"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Slaan sluitskerm oor"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Gaan ná gesigslot direk na skerm toe wat laas gebruik is"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Sluitskerm, sluit skerm, slaan oor, systap"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> kennisgewing per week</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nooit"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Kennisgewingtoegang"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Toestel- en programkennisgewings"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Beheer watter kennisgewings op jou programme en toestelle wys"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Toegang tot werkprofielkennisgewings is geblokkeer"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Programme kan nie kennisgewings lees nie"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Skakel af"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Kanselleer"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Toegelate kennisgewingtipes"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Belangrike deurlopende kennisgewings"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Gesprekkennisgewings"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Opletkennisgewings"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Stil kennisgewings"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Intyds"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Intydse kommunikasie vanaf programme wat gebruik word, navigasie, foonoproepe en meer"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Gesprekke"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS en ander kommunikasie"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Verstek"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Kennisgewings wat mag lui of vibreer gegrond op instellings"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Stil"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Kennisgewings wat nooit \'n geluid maak of vibreer nie"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Sien alle programme"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Verander kennisgewingsinstellings vir elke program wat kennisgewings kan stuur"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Programme wat op toestel gewys word"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-helperdienste"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Geen geïnstalleerde programme het versoek om as VR-helperdienste te werk nie."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Gee <xliff:g id="SERVICE">%1$s</xliff:g> toegang tot VR-diens?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Maak by verstek oop"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Oopmaak van skakels"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Maak gesteunde skakels oop"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Gesteunde skakels maak in hierdie program oop"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Skakels om in hierdie program oop te maak"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Maak oop sonder om te vra"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Gesteunde skakels"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Ander verstekke"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Ander verstekvoorkeure"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Voeg skakel by"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"\'n Program kan skakels verifieer om outomaties in die program oop te maak. "<annotation id="url">"Kom meer te wete"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> geverifieerde skakels</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> geverifieerde skakel</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Hierdie skakels is geverifieer en maak outomaties in hierdie program oop.</item>
+      <item quantity="one">Hierdie skakel is geverifieer en maak outomaties in hierdie program oop.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Soek tans vir ander gesteunde skakels …"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Kanselleer"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> gesteunde skakels</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> gesteunde skakel</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Voeg by"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Maak oop in <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> gebruik in <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"interne berging"</string>
     <string name="storage_type_external" msgid="125078274000280821">"eksterne berging"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Kamera word nie toegelaat nie"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Skermkiekie word nie toegelaat nie"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Kan nie hierdie program oopmaak nie"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Kontak jou IT-administrateur as jy vrae het"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Meer besonderhede"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Jou administrateur kan programme en data wat met jou werkprofiel geassosieer word, insluitend instellings, toestemmings, korporatiewe toegang, netwerkaktiwiteit en die toestel se ligginginligting, monitor en bestuur."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Jou administrateur kan programme en data wat met hierdie gebruiker geassosieer word, insluitend instellings, toestemmings, korporatiewe toegang, netwerkaktiwiteit en die toestel se ligginginligting, monitor en bestuur."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="one">1 beperking</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Diensverskaffer se datarekening kan van toestel se rekening verskil"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Sluit data uit wat deur diensverskaffernetwerke gebruik word"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Sluit data uit wat deur diensverskaffernetwerke gebruik word"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> gebruik"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Stel datawaarskuwing"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datawaarskuwing"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(gedeïnstalleer vir gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(gedeaktiveer vir gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Outovuldiens"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"outomaties, invul, outovul"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Wagwoorde"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"outomaties, invul, outovul, wagwoord"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Maak seker dat jy hierdie program vertrou&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Outovul&gt;%1$s&lt;/xliff:g&gt; gebruik wat op jou skerm is om te bepaal wat outomaties ingevul kan word."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Outovul"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Aantekeningvlak"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Verander die netwerkbedryfsmodus"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Voorkeurnetwerktipe"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Diensverskaffer"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Instellings-weergawe"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Diensverskafferinstellingsweergawe"</string>
     <string name="call_category" msgid="641461844504128789">"Oproepe"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Diensverskaffervideo-oproepe"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Stelselkeuse"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Verwyder die SIM en voeg dit weer in. Herbegin jou toestel as die probleem voortduur."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Probeer weer om die SIM aan te skakel. Herbegin jou toestel as die probleem voortduur."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Netwerkaktivering"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Diensverskafferoorskakeling"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is aktief"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tik om SIM-instellings op te dateer"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Gewissel na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Af"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM\'s"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Wys vliegtuigmodusnetwerke"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Soek en koppel aan netwerke in vliegtuigmodus."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Soek en koppel aan wi-fi-netwerke"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"vliegtuig, vliegtuigveilig"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Oproepe en SMS\'e"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑fi-oproepe"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nie beskikbaar nie"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tydelik nie beskikbaar nie"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Geen SIM nie"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Voorkeure"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Netwerkvoorkeure"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Koppel aan publieke netwerke"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netwerkverbinding, internet, draadloos, data, wifi, wi-fi, wi fi, sellulêr, mobiel, selfoondiensverskaffer, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Bekyk vliegtuigmodusnetwerke"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Bekyk tans vliegtuigmodusnetwerke"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Skakel netwerke aan"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Skakel netwerke af"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Stel jou internet terug?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Dit sal jou foonoproep beëindig"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Dit sal jou foonoproep beëindig"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Stel tans jou internet terug …"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Stel konnektiwiteit reg"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Vliegtuigmodusnetwerke is beskikbaar"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Ontkoppel Ethernet om netwerke te wissel"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Kan nie netwerke oorskakel terwyl dit gekoppel is nie"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Vliegtuigmodusnetwerke"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Gekoppel"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet sal nie outomaties koppel nie"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Kleur"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Ander"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Algemeen"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Sien alle programme"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Slimaanstuur"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Slimaanstuur is geaktiveer"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Voer foonnommer in"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Foonnommer ontbreek."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Laat 2G toe"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Gebruik 2G-selfoonverbindings. 2G is altyd aangeskakel vir noodoproepe."</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 9c44774..ff57691 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"በማያ ገጽ ላይ ያለውን ጽሑፍ ያሳንሱ ወይም ያተልቁ።"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"አነስ አድርግ"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"ተለቅ አድርግ"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ራስ-አዙር ይጠቀሙ"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"የናሙና ጽሑፍ"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"አስደናቂው የኦዝ ምትሃተኛ"</string>
@@ -405,15 +404,21 @@
       <item quantity="other">የ<xliff:g id="COUNT_1">%1$d</xliff:g> የጣት አሻራዎች ማዋቀር</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"በጣት አሻራ ይክፈቱ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"የጣት አሻራዎን ያዋቅሩ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"የጣት አሻራዎን ይጠቀሙ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"ስልክዎን ለመክፈት፣ ግዢዎችን ለመፍቀድ ወይም ወደ መተግበሪያዎች ለመግባት በቀላሉ የጣት አሻራ ዳሳሹን ይንኩ። የማን አሻራዎች እንደሚያክሉ ይጠንቀቁ። አንድ የታከለ ህትመት እንኳ ከእነዚህ ነገሮች ውስጥ ማንኛውንም ማድረግ ይችላል።"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"የእርስዎ የጣት አሻራ ከጠንካራ ሥርዓተ ጥለት ወይም ፒን ይልቅ ያነሰ ለደህንነት አስተማማኝ ሊሆን ይችላል።"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"እርስዎ የሚቆጣጠሩት ነው"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"ከግምት ውስጥ ያስገቡ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"በየጣት አሻራ የተመዘገበው ውሂብ ደህንነቱ በተጠበቀ ሁኔታ የሚከማች ሲሆን በጭራሽ ከስልክዎ አይወጣም። የእርስዎን ውሂብ በማናቸውም ጊዜ በቅንብሮች ውስጥ መሰረዝ ይችላሉ።"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"የእርስዎ የጣት አሻራ ከጠንካራ ሥርዓተ ጥለት ወይም ፒን ይልቅ ያነሰ ለደህንነት አስተማማኝ ሊሆን ይችላል።"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"የተሻሻሉ የጣት አሻራ ሞዴሎችን ለመፍጠር ስልክዎ አልፎ አልፎ የቅርብ ጊዜ የጣት አሻራ ምስሎችዎን ይጠቀማል።"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"የእርስዎን ስልክ ለመክፈት ወይም ግዢዎችን ለማጽደቅ የእርስዎን የጣት አሻራ ይጠቀሙ።\n\nማስታወሻ፦ ይህን መሣሪያ ለመክፈት የጣት አሻራን መጠቀም አይችሉም። ለተጨማሪ መረጃ፣ የእርስዎን ድርጅት አስተዳዳሪ ያነጋግሩ።"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"የእርስዎን ስልክ ለመክፈት ወይም ግዢዎችን ለማጽደቅ የእርስዎን የጣት አሻራ ይጠቀሙ።\n\nማስታወሻ፦ የእርስዎ የጣት አሻራ ከጠንካራ ሥርዓተ ጥለት ወይም ፒን ይልቅ ያነሰ ለደህንነት አስተማማኝ ሊሆን ይችላል።"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ይቅር"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"አይ፣ አመሰግናለሁ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"ዝለል"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ቀጥል"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"እስማማለሁ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ዝለል"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ቀጣይ"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"የጣት አሻራ ይዘለል?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"ዝለል"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"ተወው"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"ዳሳሹን ይንኩ"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"ይንኩ &amp; የጣት አሻራ አዶውን ይያዙ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"በእርስዎ ስልክ ጀርባ ላይ ነው። የእርስዎን አመልካች ጣት ይጠቀሙ።"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"በማያ ገጹ ላይ ነው። በሚደምቅ ክበብ የጣት አሻራ ይፈልጉ።"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"የጣት አሻራ ዳሳሽ በእርስዎ ማያ ገጽ ላይ ነው። እሱን ለማግኘት ጣትዎን በማያ ገጹ ላይ ያንቀሳቅሱት።"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"ከመሣሪያ እና የጣት አሻራ አነፍናፊ መገኛ አካባቢ መግለጫ ስዕል ጋር"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"ስም"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"እሺ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"ሰርዝ"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"ዳሳሹን ይንኩ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"ጣትዎን በዳሳሹ ላይ ያስቀምጡትና ንዝረት ከተሰማዎት በኋላ ያንሱት"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"ያንሱ፣ በመቀጠል መልሰው ይንኩ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"የእርስዎን የጣት አሻራ የተለያዩ ክፍሎችን ለማከል ጣትዎትን ማንሳትና ማስቀመጥዎን ይቀጥሉ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"የጣት አሻራ ታክሏል"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"ይህን አዶ ሲመለከቱ ለይቶ ለማወቅ ወይም ግዢዎችን ለማጽደቅ የእርስዎን የጣት አሻራ ይጠቀሙ።"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"በኋላ ላይ ያድርጉት"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"ፍለጋ"</string>
     <string name="display_settings" msgid="7197750639709493852">"አሳይ"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"ማያ በራስ ሰር አሽከርክር"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"አጥፋ"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"አብራ"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"በርቷል - መልክ ላይ የተመሠረተ"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"መልክ ማወቅ አንቃ"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ቀለማት"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ተፈጥሯዊ"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"ተጨምሯል"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"በርቷል / ማያ ገጽ እርስዎ እየተመለከቱት ያሉ ከሆነ አይጠፋም"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"ጠፍቷል"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"የካሜራ መዳረሻ ያስፈልጋል"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"ለመሣሪያ ግላዊነት አገልግሎቶች ፈቃዶችን ለማስተዳደር በጣት መታ ያድርጉ"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"እርስዎ እየተመለከቱት ያሉ ከሆነ የእርስዎ ማያ ገጽ እንዳይጠፋ ይከላከላል"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"የማያ ገጽ ትኩረት በማያ ገጹ ላይ የሆነ ሰው እያየ መሆኑን ለመመልከት የፊት ካሜራውን ይጠቀማል። በመሣሪያ ላይ ይሠራል፣ እና ምስሎች በጭራሽ ወደ Google አይላኩም ወይም በዚያ አይከማቹም።"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"የማያ ገጽ ትኩረትን ያብሩ"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"ማያ ገጽ ጨለማ ሲሆን ለአዲስ ማሳወቂያዎች ይበራል"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"ሁልጊዜ ሰዓትን እና መረጃን አሳይ"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"የባትሪ አጠቃቀምን ይጨምራል"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"ደማቅ ጽሑፍ"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"ደማቅ ጽሑፍ"</string>
     <string name="title_font_size" msgid="570613010306330622">"የቁምፊ መጠን"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ጽሑፍ ያተልቁ ወይም ያሳንሱ"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"የSIM ካርድ ቆልፍ ቅንብሮች"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"ሌሎች ተጠቃሚዎች"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"የመሣሪያ ማከማቻ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"ተንቀሳቃሽ ማከማቻ"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"ማንቂያዎች እና አስታዋሾች"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"ማንቂያዎች ወይም አስታዋሾች እንዲቀናበሩ ይፍቀዱ"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"ማንቂያዎች እና አስታዋሾች"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"ይህ መተግበሪያ ማንቂያዎችን ወይም ሌሎች በጊዜ ላይ የተመሠረቱ ክስተቶች መርሐግብር እንዲያስይዝ ይፍቀዱለት። ይህ መሣሪያውን በማይጠቀሙበት ጊዜ እንኳን መተግበሪያው እንዲነቃ እና እንዲሰራ ያስችለዋል። ይህን ፈቃድ መሻር መተግበሪያው በአግባቡ እንዳይሠራ ሊያደርገው እንደሚችል ልብ ይበሉ፣ ማለትም መተግበሪያው መርሐግብር ያስያዛቸው ማናቸውም ማንቂያዎች ከእንግዲህ አይሰሩም።"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"መርሐግብር፣ ማንቂያ፣ አስታዋሽ፣ ክስተት"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> ከ<xliff:g id="TOTAL">%2$s</xliff:g> ጥቅም ላይ የዋለ"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"ከ<xliff:g id="TOTAL">%1$s</xliff:g> ጥቅም ላይ የዋለ"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"የአካባቢ አገልግሎቶች"</string>
     <string name="location_title" msgid="5819154746934945021">"የእኔ  ሥፍራ"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"የስራ መገለጫ አካባቢ"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"የመተግበሪያ የአካባቢ መዳረሻ"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"መገኛ አካባቢ ጠፍቷል"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ከ<xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> መተግበሪያዎች የአካባቢ መዳረሻ አላቸው</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ከ<xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> መተግበሪያዎች የአካባቢ መዳረሻ አላቸው</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"የቅርብ ጊዜ የመገኛ አካባቢ መዳረሻ"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"ዝርዝሮችን አሳይ"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"ምንም መተግበሪያዎች በቅርብ ጊዜ አካባቢ አልጠየቁም"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"ምንም መተግበሪያዎች በቅርቡ መገኛ አካባቢን አልደረሱም"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ከፍተኛ የባትሪ አጠቃቀም"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ዝቅተኛ የባትሪ አጠቃቀም"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"የWi‑Fi እና ብሉቱዝ መቃኘት"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi ቅኝት"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi-Fi ጠፍቶ ቢሆንም እንኳ በማንኛውም ጊዜ የWi-Fi አውታረ መረቦችን እንዲቃኙ ይፍቀዱ። ይህ ለምሳሌ በአካባቢ ላይ የተመሠረቱ ባሕሪያትን እና አገልግሎቶችን ለማሻሻል ጥቅም ላይ ሊውል ይችላል።"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"የBluetooth ቅኝት"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ብሉቱዝ ጠፍቶ ቢሆንም እንኳ በማንኛውም ጊዜ መተግበሪያዎች እና አገልግሎቶች በአቅራቢያ ያሉ መሣሪያዎችን እንዲቃኙ ይፍቀዱ። ይህ ለምሳሌ በአካባቢ ላይ የተመሠረቱ ባሕሪያትን እና አገልግሎቶችን ለማሻሻል ጥቅም ላይ ሊውል ይችላል።"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"የአካባቢ አገልግሎቶች"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"የአካባቢ አገልግሎቶች ለስራ"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"የአካባቢ የሰዓት ሰቅ ማወቂያ"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"የአካባቢ የሰዓት ሰቅ ማወቂያ"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"የአሁኑን ሰዓት ሰቅ ለማወቅ የመሣሪያውን አከባቢ እንዲጠቀምበት ያስችለዋል። እንደ Wi‑Fi ቅኝት ያሉ ሌሎች የአካባቢ ቅንብሮች የሰዓት ሰቅ ማወቂያ ትክክለኛነት ላይ ተጽዕኖ ሊያሳርፉ ይችላሉ።"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"አብራ"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"አጥፋ"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ራስ-ሰር የሰዓት ሰቅ ማግኘት ተሰናክሏል"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ራስ-ሰር የሰዓት ሰቅ ጠፍቷል"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"የአካባቢ የሰዓት ሰቅ ማወቂያ ተሰናክሏል"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"የአካባቢ የሰዓት ሰቅ ማወቂያ አይደገፍም"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"የአካባቢ የሰዓት ሰቅ ማወቂያ ለውጦች አይፈቀዱም"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"አንቃ"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"ማከማቻን አጽዳ"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"አዘምኖች አትጫን"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"ይህን መተግበሪያ በነባሪ ለሌላ እርምጃዎች እንዲጀምር መርጠኸዋል::"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"እርስዎ የመረጧቸው አንዳንድ እንቅስቃሴዎች በነባሪነት በዚህ መተግበሪያ ውስጥ ይከፈታሉ።"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"ይህ መተግበሪያ ፍርግሞችን ፈጥሮ ውሂባቸውን እንዲደርስ ይፈቅዳል።"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"ምንም ነባሪዎች አልተዘጋጁም።"</string>
-    <string name="clear_activities" msgid="341345438786077236">"ነባሪዎችን አጽዳ"</string>
+    <string name="clear_activities" msgid="488089228657585700">"ነባሪ ምርጫዎችን አጽዳ"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"ይህ መተግበሪያ ለእርስዎ ማያ አልተነደፈ ይሆናል፤ ለእርስዎ ማያ እንዴት እንደሚስማማ እዚህ መቆጣጠር ይችላሉ።"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"ሲነሳ ጠይቅ"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Scale መተግበሪያ"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ይህን መሣሪያ ከእርስዎ ፍላጎቶች ጋር እንዲጣጣም ማበጀት ይችላሉ። እነዚህ የተደራሽነት ባህሪያት በኋላ ላይ በቅንብሮች ውስጥ ሊቀየሩ ይችላሉ።"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"የቅርጸ-ቁምፊ መጠን ይቀይሩ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"የማያ ገጽ አንባቢዎች"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ኦዲዮ እና የማያ ገጽ ላይ ጽሑፍ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"መግለጫ ጽሑፎች"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ኦዲዮ"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"አጠቃላይ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"አሳይ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ጽሁፍ እና ማሳያ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ማያ ገጹን ወደ ጥቁር ይቀይሩ"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ቀይ-አረንጓዴ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ቀይ-አረንጓዴ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ሰማያዊ-ቢጫ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ብሩህነትን ይቀንሱ"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"ብሩህነትን ይቀንሱ"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ከስልክዎ አነስተኛ ብሩህነት የበለጠ ማያ ጨለማ ያድርጉ"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ከጡባዊዎ አነስተኛ ብሩህነት የበለጠ ማያ ጨለማ ያድርጉ"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"ለማንበብ የበለጠ ምቾት እንዲኖርዎ ማያ ገጽዎን የበለጠ ጥቁር ያድርጉት።&lt;br/&gt;&lt;br/&gt; ይህ ጠቃሚ ሊሆን የሚችለው፦ &lt;ol&gt; &lt;li&gt; የስልክዎ ነባሪ ዝቅተኛ ብሩህነት አሁንም በጣም ብሩህ ሲሆን&lt;/li&gt; &lt;li&gt; ስልክዎን በጨለማ ሁኔታዎች ውስጥ ይጠቀማሉ፣ ለምሳሌ ማታ ወይም በጨለማ ክፍል ውስጥ ከመተኛትዎ በፊት&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"መልክ"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"የጣት አሻራ፣ የጣት አሻራ ያክሉ"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"የደበዘዘ ማያ ገጽ፣ ማያንካ፣ ባትሪ፣ ዘመናዊ ብሩህነት፣ ተለዋዋጭ ብሩህነት፣ ራስሰር ብሩህነት"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"ማያ ገጽን ማደብዘዝ፣ እንቅልፍ፣ ባትሪ፣ እረፍት መውሰጃ ጊዜ፣ ትኩረት፣ ማሳያ፣ ማያ ገጽ፣ የቦዘነ ጊዜ"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"አሽከርክር፣ ገልብጥ፣ ሽክርክሪት፣ የቁም፣ የመሬት ገጽታ፣ አቀማመጥ፣ ቁልቁል፣ አግድም"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"ደረጃ አሻሽል፣ android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd፣ መርሐ ግብር፣ ማሳወቂያዎች፣ አግድ፣ ጸጥታ፣ ንዘር፣ አንቀላፋ፣ ሥራ፣ አተኩር፣ ድምፅ፣ ድምፀ ከል አድርግ፣ ቀን፣ የሳምንቱ ቀን፣ የሳምንቱ ዕረፍት ቀናት፣ የሳምንቱ ሌሊት፣ ክስተት"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ማያ ገጽ፣ የመቆለፊያ ጊዜ፣ እረፍት ጊዜ፣ የቆልፍ ማያ ገጽ"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"የስልክ ጥሪ ድምፆች"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"ሌሎች ድምጾች እና ንዝረቶች"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"ማሳወቂያዎች"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"ውይይት"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"በቅርቡ የተላኩ"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ካለፉት 7 ቀናት ወዲህ ያሉትን በሙሉ ይመልከቱ"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"የላቀ"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ጠቅላላ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"የስራ ማሳወቂያዎች"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"እንደሁኔታው ተስማሚ ማሳወቂያዎች"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ተስማሚ የማሳወቂያ ቅድሚያ ተሰጪ"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"በታች ተጎታች ጥላ ውስጥ፣ በሁኔታ አሞሌ እና በማያ ገጽ ቁልፍ ላይ አሳይ"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"በሁኔታ አሞሌ ላይ ጸጥ ያሉ ማሳወቂያዎችን ደብቅ"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ብርሃን አብለጭለጭ"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"በማያ ገጽ ቁልፍ ላይ ማሳወቂያዎች"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ግላዊነት"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"የማያ ገጽ ቁልፍን ይዝለሉ"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ከፊት መክፈት በኋላ በቀጥታ መጨረሻ ላይ ስራ ላይ ወደዋለው ማያ ገጽ ይሂዱ"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"የማያ ገጽ ቁልፍ፣ የማያ ገጽ ቁልፍ፣ ዝለል፣ እለፍ"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> ማሳወቂያዎች በሳምንት</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"በጭራሽ"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"የማሳወቂያ መዳረሻ"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"መሣሪያ &amp;amp፣ የመተግበሪያ ማሳወቂያዎች"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"በእርስዎ መተግበሪያዎች እና መሣሪያዎች ላይ የትኛው ማሳወቂያዎች እንደሚታዩ ይቆጣጠሩ"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"የስራ መገለጫ ማሳወቂያዎች መዳረሻ ታግዷል"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"መተግበሪያዎች ማሳወቂያዎችን ማንበብ አይችሉም"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"አጥፋ"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"ይቅር"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"የተፈቀዱ የማሳወቂያ ዓይነቶች"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"አስፈላጊ በመካሄድ ላይ ማሳወቂያዎች"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"የውይይት ማሳወቂያዎች"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"የማንቂያ ማሳወቂያዎች"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"ጸጥ ያሉ ማሳወቂያዎች"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"ቅጽበታዊ"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"ጥቅም ላይ እየዋሉ ያሉ መተግበሪያዎች፣ አሰሳ፣ የስልክ ጥሪዎች እና ተጨማሪ ላይ ያሉ ቅጽበታዊ ግንኙነት"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"ውይይቶች"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"ኤስኤምኤስ እና ሌሎች ግንኙነቶች"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"ነባሪ"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"በቅንብሮች የሚወሰን ሆነው ሊደወሉ ወይም ሊነዘሩ የሚችሉ ማሳወቂያዎች"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"ፀጥ ያለ"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"በጭራሽ ድምጽን ወይም ንዝረቶችን የማያሰሙ ማሳወቂያዎች"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"ሁሉንም መተግበሪያዎች ይመልከቱ"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"ማሳወቂያዎችን መላክ ለሚችል ለእያንዳንዱ መተግበሪያ የማሳወቂያ ቅንብሮችን ይቀይሩ"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"በመሣሪያ ላይ የሚታዩ መተግበሪያዎች"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"የምናባዊ ዕውነታ አጋዥ አገልግሎቶች"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ምንም የተጫኑ መተግበሪያዎች እንደ የምናባዊ ዕውነታ አጋዥ አገልግሎቶች ሆነው እንዲሄዱ አልጠየቁም።"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"ለ<xliff:g id="SERVICE">%1$s</xliff:g> የምናባዊ ዕውነታ መዳረሻ ይፈቀድለት?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"በነባሪ ክፈት"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"አገናኞችን በመክፈት ላይ"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"የሚደገፉ አገናኞችን ክፈት"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"የሚደገፉ አገናኞች በዚህ መተግበሪያ ውስጥ ይከፈታሉ"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"በዚህ መተግበሪያ ውስጥ የሚከፈቱ አገናኞች"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"ስትጠይቅ ክፈት"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"የሚደገፉ አገናኞች"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"ሌሎች ነባሪዎች"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"ሌሎች ነባሪ ምርጫዎች"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"አገናኝን ያክሉ"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"አንድ መተግበሪያ በመተግበሪያው ውስጥ በራስ-ሰር ለመክፍት አገናኞችን ማረጋገጥ ይችላል። "<annotation id="url">"በለጠ ለመረዳት"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> የተረጋገጡ አገናኞች</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> የተረጋገጡ አገናኞች</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">እነዚህ አገናኞች ተረጋግጠዋል እና በዚህ መተግበሪያ ውስጥ በራስ-ሰር ይከፈታሉ።</item>
+      <item quantity="other">እነዚህ አገናኞች ተረጋግጠዋል እና በዚህ መተግበሪያ ውስጥ በራስ-ሰር ይከፈታሉ።</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"እሺ"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"ሌሎች የሚደገፉ አገናኞችን በመፈተሽ ላይ…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"ይቅር"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> የሚደገፉ አገናኞች</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> የሚደገፉ አገናኞች</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"አክል"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"በ<xliff:g id="APP_LABEL">%s</xliff:g> ውስጥ ይከፈታል"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> በ<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> ውስጥ ጥቅም ላይ ውሏል"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"ውስጣዊ ማከማቻ"</string>
     <string name="storage_type_external" msgid="125078274000280821">"ውጫዊ ማከማቻ"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"ካሜራ አልተፈቀደም"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"ቅጽበታዊ ገጽ እይታ አልተፈቀደም"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"ይህን መተግበሪያ መክፈት አልተቻለም"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"ጥያቄዎች ካልዎት የእርስዎን የአይቲ አስተዳዳሪ ያነጋግሩ"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"ተጨማሪ ዝርዝሮች"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"የእርስዎ አስተዳዳሪ ቅንብሮችን፣ ፈቃዶችን፣ የኮርፖሬት መዳረሻን፣ የአውታረ መረብ እንቅስቃሴን እና የመሣሪያዎ አካባቢያዊ መረጃን ጨምሮ ከእርስዎ የስራ መገለጫ ጋር የተጎዳኙ መተግበሪያዎችን እና ውሂብን መከታተል እና ማቀናበር ይችላል።"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"የእርስዎ አስተዳዳሪ ቅንብሮችን፣ ፈቃዶችን፣ የኮርፖሬት መዳረሻን፣ የአውታረ መረብ እንቅስቃሴን እና የመሣሪያዎ አካባቢያዊ መረጃን ጨምሮ ከዚህ ተጠቃሚ ጋር የተጎዳኙ መተግበሪያዎችን እና ውሂብን መከታተል እና ማቀናበር ይችላል።"</string>
@@ -4348,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ገደቦች</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"የአገልግሎት አቅራቢ ውሂብ የሂሳብ አከፋፈል ከመሳሪያ የሂሳብ አከፋፈል የተለየ ሊሆን ይችላል"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"የአገልግሎት አቅራቢ አውታረ መረቦች የሚጠቀሙበትን ውሂብ አያካትትም"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"የአገልግሎት አቅራቢ አውታረ መረቦች የሚጠቀሙበትን ውሂብ አያካትትም"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ጥቅም ላይ ውሏል"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"የውሂብ ማስጠንቀቂያ አዘጋጅ"</string>
     <string name="data_warning" msgid="2925054658166062884">"የውሂብ ማስጠንቀቂያ"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(ለተጠቃሚ <xliff:g id="USER">%s</xliff:g> ተራግፏል)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(ለተጠቃሚ <xliff:g id="USER">%s</xliff:g> ተሰናክሏል)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"የራስ-ሙላ አገልግሎት"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"ራስ-ሰር፣ ሙላ፣ ራስ-ሙላ"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"የይለፍ ቃላት"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"ራስ-ሰር፣ ሙላ፣ ራስ-ሙላ፣ የይለፍ ቃል"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;ይህን መተግበሪያ የሚያምኑት መሆንዎን ያረጋግጡ&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ራስ-ሙላ&gt;%1$s&lt;/xliff:g&gt; ምን በራስ መሞላት እንደሚችል ለማወቅ በማያ ገጽዎ ላይ ያለውን ነገር ይጠቀማል።"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"ራስ-ሙላ"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"የምዝግብ ማስታወሻ ደረጃ"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"የአውታረ መረቡን የክወና ሁነታን ለውጥ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"የሚመረጠው የአውታረ መረብ አይነት"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"አገልግሎት አቅራቢ"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"የቅንብሮች ስሪት"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"የአገልግሎት አቅራቢ ቅንብሮች ስሪት"</string>
     <string name="call_category" msgid="641461844504128789">"በመደወል ላይ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"የአገልግሎት አቅራቢ የቪዲዮ ጥሪ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"የሥርዓት ምርጫ"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ሲሙን ያስወጡትና እንደገና ያስገቡት። ችግሩ ከቀጠለ መሣሪያዎን ዳግም ያስነሱት።"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ሲሙን እንደገና ለማብራት ይሞክሩ። ችግሩ ከቀጠለ መሣሪያዎን ዳግም ያስነሱት።"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"አውታረ መረብን ማግበር"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"የአገልግሎት አቅራቢን መቀየር"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ገቢር ነው"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"የሲም ቅንብሮችን ለማዘመን መታ ያድርጉ"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"ወደ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ተቀይሯል"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"አጥፋ"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"በይነመረብ"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMዎች"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"የአውሮፕላን ሁነታ አውታረ መረቦችን አሳይ"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"በአውሮፕላን ሁነታ ውስጥ አውታረ መረቦችን ያግኙ እና ያገናኙ።"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"ከWi‑Fi አውታረ መረቦችን ያገኙ እና ያገናኙ"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"አውሮፕላን፣ የአውሮፕላን ድህንነቱ የተጠበቀ"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"ጥሪዎች እና ኤስኤምኤስ"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"የWi-Fi ጥሪ ማድረጊያ"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"አይገኝም"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ለጊዜው አይገኝም"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM የለም"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ምርጫዎች"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"የአውታረ መረብ ምርጫዎች"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ከይፋዊ አውታረ መረቦች ጋር አገናኝ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"የአውታረ መረብ ግንኙነት በይነመረብ፣ ገመድ-አልባ፣ ውሂብ፣ wifi፣ wi-fi፣ wi fi፣ ተንቀሳቃሽ ስልክ፣ ሞባይል፣ የተንቀሳቃሽ ስልክ አገልግሎት አቅራቢ፣ 4ጂ፣ 3ጂ፣ 2ጂ፣ lte፣ ኤልቲኢ"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"የአውሮፕላን ሁነታ አውታረመረቦችን ይመልከቱ"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"የአውሮፕላን ሁነታ አውታረመረቦችን መመልከት"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"አውታረመረቦችን ያብሩ"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"አውታረ መረቦችን ያጥፉ"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"በይነመረብዎን ዳግም ያስጀምሩ?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"ይህ የስልክ ጥሪዎን ይጨርሳል"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ይህ የስልክ ጥሪዎን ይጨርሳል"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"በይነመረብዎን ዳግም በማስጀመር ላይ…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"ግንኙነትን ያስተካክሉ"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"የአውሮፕላን ሁነታ አውታረ መረቦች ይገኛሉ"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"አውታረ መረቦችን ለመቀየር፣ የኢተርኔት ግንኙነት ያቋርጡ"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"በሚገናኙበት ጊዜ አውታረ መረቦችን መቀየር አይቻልም"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"የአውሮፕላን ሁነታ አውታረ መረቦች"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"ተገናኝቷል"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"በይነመረብ በራስ-ሰር አይገናኝም"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"ቀለም"</string>
     <string name="category_name_others" msgid="2366006298768550310">"ሌሎች"</string>
     <string name="category_name_general" msgid="7737273712848115886">"ጠቅላላ"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"ሁሉንም መተግበሪያዎች ይመልከቱ"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"ብልህ ማስተላለፍ"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"ዘመናዊ ማስተላለፍ ነቅቷል"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"የስልክ ቁጥር ያስገቡ"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"የስልክ ቁጥር ይቀራል።"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"እሺ"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2ጂ ይፍቀዱ"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"የ2ጂ የተንቀሳቃሽ ስልክ ግንኙነቶችን ይጠቀሙ። ለአደጋ ጊዜ ጥሪዎች 2ጂ ሁልጊዜ በርቷል።"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3e952d7..b47c29e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -56,9 +56,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"يمكنك تصغير النص الظاهر على الشاشة أو تكبيره."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"تصغير"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"تكبير"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"استخدام \"التدوير التلقائي\""</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"نموذج نص"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"ساحر أوز العجيب"</string>
@@ -264,8 +263,8 @@
     <string name="networks" msgid="5184501333492775095">"تحديد المشغل"</string>
     <string name="sum_carrier_select" msgid="1669911795517995916">"اختيار مشغل شبكة"</string>
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"التاريخ والوقت"</string>
-    <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"تعيين التاريخ والوقت"</string>
-    <string name="date_and_time_settings_summary" msgid="334967758944498010">"تعيين التاريخ والوقت والمنطقة الزمنية والتنسيقات"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"ضبط التاريخ والوقت"</string>
+    <string name="date_and_time_settings_summary" msgid="334967758944498010">"ضبط التاريخ والوقت والمنطقة الزمنية والتنسيقات"</string>
     <string name="date_time_auto" msgid="4239202185055225869">"ضبط الوقت تلقائيًا"</string>
     <string name="zone_auto_title" msgid="3993580453604839924">"ضبط المنطقة الزمنية تلقائيًا"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"استخدام التنسيق التلقائي المحلي"</string>
@@ -421,15 +420,21 @@
       <item quantity="one">تم إعداد بصمة إصبع واحدة (<xliff:g id="COUNT_0">%1$d</xliff:g>)</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"فتح القفل باستخدام بصمة الإصبع"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"إعداد بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"استخدام بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"ما عليك سوى لمس مستشعر بصمات الإصبع لفتح قفل هاتفك أو السماح بإجراء عمليات الشراء أو تسجيل الدخول إلى التطبيقات. عليك توخي الحذر بخصوص بصمات الإصبع التي تضيفها، فأي بصمات إصبع تتم إضافتها ستتيح لصاحبها تنفيذ هذه الإجراءات."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"قد تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي شديد الأمان."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"القرار لك"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"تنبيه"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"يتم تخزين البيانات التي تسجِّلها بصمة الإصبع بشكل آمن وتظل على هاتفك. يمكنك حذف بياناتك في أي وقت في \"الإعدادات\"."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"قد تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي شديد الأمان."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"سيستخدم هاتفك أحيانًا أحدث صور لبصمة إصبعك لإنشاء نماذج بصمات إصبع محسَّنة."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"استخدم بصمة الإصبع لفتح قفل هاتفك أو الموافقة على عمليات الشراء.\n\nملاحظة: لا يمكنك استخدام بصمة الإصبع لفتح قفل هذا الجهاز. للحصول على المزيد من المعلومات، اتصل بمشرف المؤسسة."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"استخدم بصمة الإصبع لفتح قفل هاتفك أو الموافقة على عمليات الشراء.\n\nملاحظة: قد تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"إلغاء"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"لا، شكرًا"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"التخطي"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"متابعة"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"أوافق"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"التخطي"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"التالي"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"هل تريد تخطّي بصمة الإصبع؟"</string>
@@ -446,16 +451,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"التخطي"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"إلغاء"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"لمس زر الاستشعار"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"انقر مع الاستمرار على رمز بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"زر الاستشعار موجود على الجزء الخلفي لهاتفك. استخدِم إصبع السبابة."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"المستشعر على الشاشة. ابحث عن بصمة إصبع محاطة بدائرة لامعة."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"مستشعر بصمات الإصبع على شاشتك. حرِّك إصبعك على الشاشة للعثور عليه."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"صورة توضيحية تبرز الجهاز وموقع جهاز استشعار بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"الاسم"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"حسنًا"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"حذف"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"المس زر الاستشعار"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"ضع إصبعك على زر الاستشعار ثمّ ارفعه بعد اهتزاز الجهاز"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"ارفع إصبعك ثم المس زر الاستشعار مرة أخرى"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"استمر في وضع إصبعك ورفعه لإضافة الأجزاء المختلفة لبصمة الإصبع"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"تمت إضافة بصمة الإصبع"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"عندما يظهر لك هذا الرمز، استخدِم بصمة الإصبع لتأكيد الهوية أو للموافقة على عمليات الشراء."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"تنفيذ ذلك لاحقًا"</string>
@@ -1256,14 +1270,10 @@
     <string name="search_settings" msgid="7573686516434589771">"بحث"</string>
     <string name="display_settings" msgid="7197750639709493852">"الشاشة"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"التدوير التلقائي للشاشة"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"إيقاف"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"تفعيل"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"تفعيل - استنادًا للوجه"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"تفعيل تقنية \"التعرّف على الوجوه\""</string>
     <string name="color_mode_title" msgid="8666690832113906028">"الألوان"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"طبيعية"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"مُحسنة"</string>
@@ -1308,7 +1318,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"تفعيل / لن يتم إيقاف الشاشة إذا كنت تنظر إليها."</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"غير مفعّل"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"يجب السماح بالوصول إلى الكاميرا."</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"يمكنك النقر لإدارة الأذونات في \"خدمات تخصيص الأجهزة\"."</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"منع إطفاء الشاشة إذا كنت تنظر إليها"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"‏يستخدم إعداد \"استعراض الشاشة\" الكاميرا الأمامية لمعرفة ما إذا كان أحد ينظر إلى الشاشة. يعمل هذا الإعداد على الجهاز ولا يتم تخزين أي صور أو إرسالها إلى Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"تفعيل ميزة \"استعراض الشاشة\""</string>
@@ -1389,7 +1402,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"عندما تكون الشاشة داكنة، ستُضاء لعرض الإشعارات الجديدة."</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"إظهار الوقت والمعلومات دائمًا"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"يزيد استخدام البطارية"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"نص غامق"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"نص غامق"</string>
     <string name="title_font_size" msgid="570613010306330622">"حجم الخط"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"يمكنك تكبير النص أو تصغيره."</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"‏إعدادات قفل شريحة SIM"</string>
@@ -1562,6 +1575,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"مستخدمون آخرون"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"مساحة التخزين للجهاز"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"وحدة تخزين محمولة"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"المنبّهات والتذكيرات"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"السماح بضبط المنبّهات أو التذكيرات"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"المنبّهات والتذكيرات"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"يمكنك السماح لهذا التطبيق بضبط المنبّهات أو الموقّتات الأخرى استنادًا إلى الأحداث. سيسمح هذا الأذن بتنشيط التطبيق وتشغيله حتى في حال عدم استخدام الجهاز. تجدر الإشارة إلى أن إبطال هذا الأذن قد يسبب خللاً في عمل التطبيق، وعلى وجه الخصوص لن تعمل أي منبّهات تم ضبطها بواسطة التطبيق."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"جدول زمني، منبّه، تذكير، حدث، فعالية"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"تم استخدام <xliff:g id="USED">%1$s</xliff:g> من <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"مستخدمة من <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1811,7 +1829,8 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"خدمات الموقع الجغرافي"</string>
     <string name="location_title" msgid="5819154746934945021">"موقعي"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"الموقع الجغرافي للملف الشخصي للعمل"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"وصول تطبيقات إلى الموقع الجغرافي"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"خدمة الموقع الجغرافي غير مفعّلة"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="zero"> يمتلك <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> تطبيق من إجمالي <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> تطبيق حق الوصول إلى بيانات الموقع الجغرافي.</item>
@@ -1821,24 +1840,24 @@
       <item quantity="other"> يمتلك <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> تطبيق من إجمالي <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> تطبيق حق الوصول إلى بيانات الموقع الجغرافي.</item>
       <item quantity="one"> يمتلك تطبيق واحد (<xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g>) من إجمالي <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> تطبيق حق الوصول إلى بيانات الموقع الجغرافي.</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"تطبيقات استخدمت إذن الوصول إلى الموقع الجغرافي مؤخرًا"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"عرض التفاصيل"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"لم تطلب أي تطبيقات الوصول إلى الموقع الجغرافي مؤخرًا."</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"لم يصل أي تطبيق إلى بيانات الموقع الجغرافي مؤخرًا."</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"استخدام عالٍ للبطارية"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"استخدام منخفض للبطارية"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"‏البحث عن Wi‑Fi وبلوتوث"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"‏البحث عن شبكات Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"‏يمكنك السماح للتطبيقات والخدمات بالبحث عن الأجهزة المجاورة في أي وقت، حتى في حال إيقاف Wi‑Fi. ويمكن استخدام هذه البيانات مثلاً لتحسين الميزات والخدمات المستندة إلى الموقع الجغرافي."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"البحث عن بلوتوث"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"يمكنك السماح للتطبيقات والخدمات بالبحث عن الأجهزة المجاورة في أي وقت، حتى في حال إيقاف البلوتوث. ويمكن استخدام هذه البيانات مثلاً لتحسين الميزات والخدمات المستندة إلى الموقع الجغرافي."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"خدمات الموقع الجغرافي"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"خدمات الموقع الجغرافي للعمل"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"رصد المنطقة الزمنية للموقع الجغرافي"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"رصد المنطقة الزمنية للموقع الجغرافي"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"‏تسمح الميزة باستخدام الموقع الجغرافي للجهاز لرصد المنطقة الزمنية الحالية. يمكن أن تتأثر دقة رصد المنطقة الزمنية بإعدادات الموقع الجغرافي الأخرى، مثلاً \"البحث عن شبكات Wi-Fi\"."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"الميزة مفعّلة"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"الميزة غير مفعّلة"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"تم إيقاف الرصد التلقائي للمنطقة الزمنية"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ميزة التعرّف التلقائي على المنطقة الزمنية غير مفعّلة."</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"تم إيقاف ميزة رصد المنطقة الزمنية للموقع الجغرافي"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ميزة رصد المنطقة الزمنية للموقع الجغرافي غير متاحة."</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"غير مسموح بتغييرات رصد المنطقة الزمنية للموقع الجغرافي."</string>
@@ -2025,10 +2044,10 @@
     <string name="enable_text" msgid="8570798764647110430">"تفعيل"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"محو مساحة التخزين"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"إزالة التحديثات"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"لقد اخترت تشغيل هذا التطبيق بشكل تلقائي لبعض الإجراءات."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"بعض الأنشطة التي اخترتها يتم فتحها في هذا التطبيق تلقائيًا."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"لقد اخترت السماح لهذا التطبيق بإنشاء الأدوات والوصول إلى بياناتها."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"لم يتم ضبط إعدادات تلقائية."</string>
-    <string name="clear_activities" msgid="341345438786077236">"محو الإعدادات التلقائية"</string>
+    <string name="clear_activities" msgid="488089228657585700">"محو الإعدادات المفضّلة التلقائية"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"ربما لم يتم تصميم هذا التطبيق ليلائم شاشتك، يمكنك التحكم في كيفية ضبطه ليلائم شاشتك هنا."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"السؤال عند الإطلاق"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"تغيير حجم التطبيق"</string>
@@ -2240,7 +2259,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"يمكنك تخصيص هذا الجهاز ليتوافق مع احتياجاتك. ويمكن تغيير ميزات \"سهولة الاستخدام\" هذه لاحقًا من خلال الإعدادات."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"تغيير حجم الخط"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"أجهزة قارئ الشاشة"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"الصوت والنص على الشاشة"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"الشرح"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"الصوت"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"الإعدادات العامة"</string>
     <string name="display_category_title" msgid="6638191682294461408">"العرض"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"النص وشاشة العرض"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"جعل الشاشة أقل سطوعًا"</string>
@@ -2397,7 +2418,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"الأحمر والأخضر"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"الأحمر والأخضر"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"الأزرق والأصفر"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"تقليل السطوع"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"تقليل السطوع"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"يمكنك ضبط درجة سطوع الشاشة على مستوى أقل من الحد الأدنى لسطوع هاتفك."</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"يمكنك ضبط درجة سطوع الشاشة على مستوى أقل من الحد الأدنى لسطوع جهازك اللوحي."</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"‏يمكنك تقليل درجة سطوع الشاشة لتصبح أنسب للقراءة.&lt;br/&gt;&lt;br/&gt; يمكن الاستفادة من هذه الميزة عندما: &lt;ol&gt; &lt;li&gt; تكون أقلّ درجة سطوع تلقائية في هاتفك غير كافية&lt;/li&gt; &lt;li&gt; تستخدم هاتفك في الظلام، مثلاً عندما تستخدمه ليلاً أو في غرفة مظلمة قبل النوم&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3510,8 +3531,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"وجه"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"بصمة إصبع، إضافة بصمة إصبع"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"تعتيم الشاشة، شاشة تعمل باللمس، بطارية، سطوع ذكي، سطوع ديناميكي، سطوع تلقائي"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"إضاءة خافتة للشاشة، سكون، بطارية، مهلة غلق الشاشة، استعراض الشاشة، عرض، شاشة، عدم نشاط"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"تدوير، قلب، دوران، عمودي، أفقي، اتجاه، رأسي، عرضي"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"‏ترقية، android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"الرجاء عدم الإزعاج، جدول زمني، إشعارات، حظر، صامت، اهتزاز، سكون، عمل، تركيز، صوت، كتم الصوت، يوم، يوم من الأسبوع، عطلة نهاية الأسبوع، ليلة من الأسبوع، حدث"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"شاشة، وقت القفل، مهلة غلق الشاشة، شاشة قفل"</string>
@@ -3680,9 +3703,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"نغمات الرنين"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"الأصوات والاهتزازات الأخرى"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"الإشعارات"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"محادثة"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"تم إرسالها مؤخرًا"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"عرض كل التطبيقات من آخر ٧ أيام"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"إعدادات متقدّمة"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"عام"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"إشعارات العمل"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"الإشعارات التكيّفية"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"أولوية الإشعارات التكيّفية"</string>
@@ -3744,7 +3768,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"يظهر في خيار منسدل وفي شريط الحالة وفي شاشة القفل"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"إخفاء الإشعارات الصامتة في شريط الحالة"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"وميض الضوء"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"الإشعارات على شاشة القفل"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"الخصوصية"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"تخطي شاشة القفل"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"بعد فتح القفل بالوجه، انتقِل مباشرة إلى آخر شاشة مُستخدَمة."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"شاشة القفل، شاشة القفل، التخطي، التجاوز"</string>
@@ -3845,7 +3869,8 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> إشعار تقريبًا في الأسبوع</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"أبدًا"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"الوصول إلى الإشعارات"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"إشعارات التطبيقات والأجهزة"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"التحكّم في الإشعارات التي ستظهر في التطبيقات والأجهزة"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"الوصول إلى إشعارات الملف الشخصي للعمل محظور"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"لا يُمكن للتطبيقات قراءة الإشعارات"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3868,17 +3893,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"إيقاف"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"إلغاء"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"أنواع الإشعارات المسموح بها"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"الإشعارات الجارية المهمة"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"إشعارات المحادثات"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"إشعارات التنبيه"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"الإشعارات الصامتة"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"الوقت الفعلي"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"التواصل في الوقت الفعلي من التطبيقات المستخدمة والتنقّل والمكالمات الهاتفية والمزيد"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"المحادثات"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"الرسائل القصيرة والمراسلات الأخرى"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"تلقائيًا"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"الإشعارات التي يمكنها استصدار رنين أو اهتزاز بناءً على الإعدادات"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"صامت"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"الإشعارات التي لا تصدِر صوتًا أو اهتزازًا مطلقًا"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"عرض كل التطبيقات"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"تغيير إعدادات الإشعارات لكل تطبيق يمكنه إرسال إشعارات"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"التطبيقات المعروضة على الجهاز"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"خدمات مساعد الواقع الافتراضي"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"لم تطلب أي تطبيقات مثبَّتة أن يتم تشغيلها كخدمات مساعد واقع افتراضي."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"هل تريد السماح لخدمة <xliff:g id="SERVICE">%1$s</xliff:g> بالوصول إلى خدمة الواقع الافتراضي؟"</string>
@@ -4190,9 +4215,42 @@
     <string name="launch_by_default" msgid="892824422067985734">"الفتح تلقائيًا"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"فتح الروابط"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"فتح الروابط المتوافقة"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"يتم فتح الروابط المتوافقة في هذا التطبيق"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"الروابط المراد فتحها في هذا التطبيق"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"فتح بدون سؤال"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"الروابط المتوافقة"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"الإعدادات التلقائية الأخرى"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"الإعدادات المفضّلة الأخرى"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"إضافة رابط"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"يمكن للتطبيق التحقّق من الروابط ليتم فتحها تلقائيًا في التطبيق. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="zero"><xliff:g id="COUNT_1">%d</xliff:g> رابط تم التحقّق منه</item>
+      <item quantity="two">رابطان (<xliff:g id="COUNT_1">%d</xliff:g>) تم التحقّق منهما</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> روابط تم التحقّق منها</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> رابطًا تم التحقّق منه</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> رابط تم التحقّق منه</item>
+      <item quantity="one">رابط واحد (<xliff:g id="COUNT_0">%d</xliff:g>) تم التحقّق منه</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="zero">تم التحقّق من الروابط ويتم فتحها في هذا التطبيق تلقائيًا.</item>
+      <item quantity="two">تم التحقّق من الرابطين ويتم فتحهما في هذا التطبيق تلقائيًا.</item>
+      <item quantity="few">تم التحقّق من الروابط ويتم فتحها في هذا التطبيق تلقائيًا.</item>
+      <item quantity="many">تم التحقّق من الروابط ويتم فتحها في هذا التطبيق تلقائيًا.</item>
+      <item quantity="other">تم التحقّق من الروابط ويتم فتحها في هذا التطبيق تلقائيًا.</item>
+      <item quantity="one">تم التحقّق من الرابط ويتم فتحه في هذا التطبيق تلقائيًا.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"حسنًا"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"جارٍ البحث عن روابط أخرى متوافقة…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"إلغاء"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="zero"><xliff:g id="COUNT_1">%d</xliff:g> رابط متوافق</item>
+      <item quantity="two">رابطان متوافقان (<xliff:g id="COUNT_1">%d</xliff:g>)</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> روابط متوافقة</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> رابطًا متوافقًا</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> رابط متوافق</item>
+      <item quantity="one">رابط واحد متوافق (<xliff:g id="COUNT_0">%d</xliff:g>)</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"إضافة"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"يتم فتحه في <xliff:g id="APP_LABEL">%s</xliff:g>."</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"يتم استخدام <xliff:g id="SIZE">%1$s</xliff:g> في <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"وحدة التخزين الداخلية"</string>
     <string name="storage_type_external" msgid="125078274000280821">"وحدة تخزين خارجية"</string>
@@ -4527,7 +4585,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"غير مسموح باستخدام الكاميرا"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"غير مسموح بالتقاط لقطة شاشة"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"يتعذّر فتح هذا التطبيق."</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"إذا كانت لديك أسئلة، يُرجى التواصل مع مشرف تكنولوجيا المعلومات."</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"مزيد من التفاصيل"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"يمكن للمشرف مراقبة التطبيقات والبيانات المرتبطة بالملفات الشخصية للعمل وإدارتها، بما في ذلك الإعدادات والأذونات والدخول إلى المؤسسة ونشاط الشبكة ومعلومات موقع الجهاز."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"يمكن للمشرف مراقبة التطبيقات والبيانات المرتبطة بهذا المستخدم وإدارتها، بما في ذلك الإعدادات والأذونات والدخول إلى المؤسسة ونشاط الشبكة ومعلومات موقع الجهاز."</string>
@@ -4616,7 +4675,7 @@
       <item quantity="one">قيد واحد</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"قد تختلف طريقة احتساب بيانات مشغِّل شبكة الجوّال عن طريقة الاحتساب على الجهاز."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"استبعاد البيانات التي تستخدمها شبكات مشغّلي شبكات الجوّال"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"تم استبعاد البيانات التي تستخدمها شبكات مشغِّلي شبكات الجوّال"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> مستخدَمة"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ضبط تحذيرات استخدام البيانات"</string>
     <string name="data_warning" msgid="2925054658166062884">"تحذيرات البيانات"</string>
@@ -5005,7 +5064,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(تم إلغاء التثبيت للمستخدم <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(غير مغعّلة للمستخدم <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"خدمة الملء التلقائي"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"ملء، تعبئة، ملء تلقائي"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"كلمات المرور"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"تلقائي، ملء، ملء تلقائي، كلمة مرور"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"‏&lt;b&gt;تأكّد من أنك تثق بهذا التطبيق&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; تستخدم البيانات المعروضة على الشاشة لتحديد ما يمكن ملؤه تلقائيًا."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"الملء التلقائي"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"مستوى التسجيل"</string>
@@ -5207,7 +5267,7 @@
     <string name="mobile_network_disable_sim_explanation" msgid="2851862257846773796">"‏لإيقاف شريحة SIM هذه، يمكنك إزالتها."</string>
     <string name="mobile_network_tap_to_activate" msgid="4139979375717958102">"يمكنك النقر لتفعيل <xliff:g id="CARRIER">%1$s</xliff:g>."</string>
     <string name="mobile_network_esim_swap_confirm_title" msgid="2762744961192218789">"هل تريد التبديل إلى <xliff:g id="CARRIER">%1$s</xliff:g>؟"</string>
-    <string name="mobile_network_esim_swap_confirm_body" msgid="8168680839542031781">"‏لا يمكن تفعيل أكثر من شريحة SIM واحدة تم تنزيلها في آن واحد.\n\nلن يؤدي اختيار <xliff:g id="CARRIER1">%1$s</xliff:g> كبديل إلى إلغاء خدمة <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
+    <string name="mobile_network_esim_swap_confirm_body" msgid="8168680839542031781">"‏لا يمكن تفعيل أكثر من شريحة SIM واحدة تم تنزيلها.\n\nلن يؤدي اختيار <xliff:g id="CARRIER1">%1$s</xliff:g> كبديل إلى إلغاء خدمة <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="8695772737522378095">"التبديل إلى <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="mobile_network_erase_sim" msgid="4629071168032714930">"‏محو بيانات شريحة SIM"</string>
     <string name="mobile_network_erase_sim_error_dialog_title" msgid="6680959559589234726">"‏يتعذّر محو بيانات شريحة SIM"</string>
@@ -5216,7 +5276,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"تغيير وضع تشغيل الشبكة"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"نوع الشبكة المفضّل"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"مشغّل شبكة جوّال"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"إصدار الإعدادات"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"إعدادات مشغّل شبكة الجوّال المخصّصة لهذا الاشتراك"</string>
     <string name="call_category" msgid="641461844504128789">"الاتصال"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"مكالمة فيديو باستخدام مشغّل شبكة الجوال"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"اختيار النظام"</string>
@@ -5241,7 +5301,7 @@
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"هل تريد التبديل إلى <xliff:g id="CARRIER_NAME">%1$s</xliff:g>؟"</string>
     <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"‏هل تريد التبديل إلى استخدام شريحة SIM؟"</string>
     <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"‏لا يمكن تفعيل أكثر من شريحة SIM واحدة في آنٍ واحد.\n\nلن يؤدي التبديل إلى <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> إلى إلغاء خدمة <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
-    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"‏لا يمكن تفعيل أكثر من شريحة SIM واحدة تم تنزيلها في آنٍ واحد.\n\nلن يؤدي التبديل إلى <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> إلى إلغاء خدمة <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"‏لا يمكن تفعيل أكثر من شريحة SIM واحدة تم تنزيلها.\n\nلن يؤدي التبديل إلى <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> إلى إلغاء خدمة <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
     <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"‏لا يمكن تفعيل أكثر من شريحة SIM واحدة في آنٍ واحد.\n\nلن يؤدي التبديل إلى إلغاء خدمة <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"التبديل إلى <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"جارٍ الاتصال بالشبكة…"</string>
@@ -5265,6 +5325,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‏يجب إزالة شريحة SIM ثم إدخالها مرة أخرى. إذا استمرت المشكلة، عليك إعادة تشغيل الجهاز."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"‏حاوِل تفعيل شريحة SIM مرة أخرى. إذا استمرت المشكلة، عليك إعادة تشغيل الجهاز."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"تفعيل الشبكة"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"جارٍ تبديل مشغِّل شبكة الجوّال"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"مشغّل شبكة الجوّال <xliff:g id="CARRIER_NAME">%1$s</xliff:g> مفعّل"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"‏انقر لتعديل إعدادات شريحة SIM."</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"تم التبديل إلى <xliff:g id="CARRIER_NAME">%1$s</xliff:g>."</string>
@@ -5433,8 +5494,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"غير مفعّلة"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"الإنترنت"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"‏شرائح SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"إظهار الشبكات المتاحة في وضع الطيران"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"البحث عن الشبكات المتاحة في وضع الطيران والاتصال بها"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"‏البحث عن شبكات Wi‑Fi والاتصال بها"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"وضع الطيران، آمنة في وضع الطيران"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"‏المكالمات والرسائل القصيرة SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"‏الاتصال عبر Wi-Fi"</string>
@@ -5448,22 +5508,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"غير متاحة"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"غير متاح مؤقتًا"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"‏بلا شريحة SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"التفضيلات"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"الإعدادات المفضَّلة للشبكة"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"‏الاتصال بشبكات Wi-Fi عامة"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏الاتصال بالشبكة، الإنترنت، لاسلكي، بيانات، wifi، wi-fi، wi fi، خلوي، جهاز جوّال، مشغل شبكة الجوال، جيل رابع، جيل ثالث، جيل ثاني، lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"عرض الشبكات المتاحة في وضع الطيران"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"عرض الشبكات المتاحة في وضع الطيران"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"تفعيل الشبكات"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"إيقاف الشبكات"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"هل تريد إعادة ضبط شبكات الإنترنت؟"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"سيؤدي هذا إلى إنهاء مكالمتك الهاتفية."</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"سيؤدي هذا إلى إنهاء مكالمتك الهاتفية."</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"جارٍ إعادة ضبط شبكات الإنترنت…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"حل مشكلة اتصال البيانات"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"الشبكات متاحة في وضع الطيران."</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"للتبديل بين الشبكات، يجب فصل إيثرنت."</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"لا يمكن التبديل بين الشبكات أثناء الاتصال بشبكة إيثرنت."</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"الشبكات المتاحة في وضع الطيران"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"متصلة بالإنترنت"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"لن يتم الاتصال بالإنترنت تلقائيًا."</string>
@@ -5484,6 +5543,10 @@
     <string name="category_name_color" msgid="937514550918977151">"اللون"</string>
     <string name="category_name_others" msgid="2366006298768550310">"غير ذلك"</string>
     <string name="category_name_general" msgid="7737273712848115886">"عام"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"عرض كل التطبيقات"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"إعادة التوجيه الذكية"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"تم تفعيل ميزة \"إعادة التوجيه الذكية\"."</string>
@@ -5497,4 +5560,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"إدخال رقم الهاتف"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"رقم الهاتف مفقود."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"حسنًا"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"السماح بشبكة الجيل الثاني"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"استخدام اتصال شبكة جوّال الجيل الثاني: شبكة الجيل الثاني مفعّلة دائمًا لمكالمات الطوارئ"</string>
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 87e56d5..09a3558 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"স্ক্ৰীণৰ আখৰ সৰু বা ডাঙৰ কৰক।"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"সৰু কৰক"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"ডাঙৰ কৰক"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"স্বয়ং-ঘূৰ্ণনৰ সুবিধা ব্যৱহাৰ কৰক"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"পাঠৰ নমুনা"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"অষ্ট্ৰেলিয়াৰ বিস্ময়কৰ যাদুকৰ"</string>
@@ -405,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ফিংগাৰপ্ৰিণ্ট ছেট আপ</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"ফিংগাৰপ্ৰিণ্টৰ সৈতে আনলক কৰক"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"নিজৰ ফিংগাৰপ্ৰিণ্ট ছেট আপ কৰক"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰক"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"আপোনাৰ ফ’ন আনলক কৰা, ক্ৰয়ক কৰ্তৃত্ব প্ৰদান কৰা অথবা এপত ছাইন ইন কৰিবলৈ মাত্ৰ ফিংগাৰপ্ৰিণ্ট ছেন্সৰটোত স্পৰ্শ কৰক। আপুনি কাৰ ফিংগাৰপ্ৰিণ্ট যোগ কৰে তাকলৈ সাৱধান হওক। যোগ কৰা এটা ফিংগাৰপ্ৰিণ্টেই এই কামবোৰৰ যিকোনো কাম কৰিব পাৰিব।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"এটা শক্তিশালী আৰ্হি অথবা পিনতকৈ আপোনাৰ ফিংগাৰপ্ৰিণ্টটো কম সুৰক্ষিত হ’ব পাৰে।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"নিয়ন্ত্ৰণ আপোনাৰ হাতত"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"মনত ৰাখিব"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"ফিংগাৰপ্ৰিণ্টে ৰেকৰ্ড কৰা ডেটা সুৰক্ষিতভাৱে ষ্ট’ৰ কৰা হয় আৰু সেয়া আপোনাৰ ফ’নটোৰ পৰা কেতিয়াও আঁতৰি নাযায়। আপুনি যিকোনো সময়তে ছেটিঙত নিজৰ ডেটা মচিব পাৰে।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"এটা শক্তিশালী আৰ্হি অথবা পিনতকৈ আপোনাৰ ফিংগাৰপ্ৰিণ্টটো কম সুৰক্ষিত হ’ব পাৰে।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"উন্নত ফিংগাৰপ্ৰিণ্টৰ মডেল সৃষ্টি কৰিবলৈ আপোনাৰ ফ’নটোৱে মাজে সময়ে আপোনাৰ শেহতীয়া ফিংগাৰপ্ৰিণ্টৰ প্ৰতিচ্ছবি ব্যৱহাৰ কৰিব।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"আপোনাৰ ফ\'নটো আনলক কৰিবলৈ বা ক্ৰয়ৰ অনুমোদন জনাবলৈ আপোনাৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰক৷\n\nটোকা: আপুনি এই ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰিব নোৱাৰে৷ অধিক তথ্যৰ বাবে, আপোনাৰ প্ৰতিষ্ঠানৰ প্ৰশাসকৰ লগত যোগাযোগ কৰক৷"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"আপোনাৰ ফিংগাৰপ্ৰিণ্টটো ব্যৱহাৰ কৰি আপোনাৰ ফ’নটো আনলক কৰক বা ক্ৰয়ত অনুমোদন দিয়ক।\n\nটোকা: এটা জটিল আৰ্হি বা পিনতকৈ আপোনাৰ ফিংগাৰপ্ৰিণ্টটো কম সুৰক্ষিত হ’ব পাৰে।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"বাতিল কৰক"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"নালাগে, ধন্যবাদ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"এৰি যাওক"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"চলাই ৰাখক"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"সন্মত"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"এৰি যাওক"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"পৰৱৰ্তী"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"ফিংগাৰপ্ৰিণ্ট ছেট আপ নকৰাকৈ এৰি যাব নেকি?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"এৰি যাওক"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"বাতিল কৰক"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"ছেন্সৰটো স্পৰ্শ কৰক"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"ফিংগাৰপ্ৰিণ্টৰ চিহ্নটোত স্পৰ্শ কৰি ধৰি ৰাখক"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"ফিংগাৰপ্ৰিণ্টটো আপোনাৰ ফোনৰ পিছফালে আছে। আপোনাৰ তৰ্জনী আঙুলি ব্যৱহাৰ কৰক।"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"এইটো স্ক্ৰীনখনত আছে। এটা উজ্জ্বল বৃত্তৰ জৰিয়তে ফিংগাৰপ্ৰিণ্ট বিচাৰক।"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"ফিংগাৰপ্ৰিণ্ট ছেন্সৰটো আপোনাৰ স্ক্ৰীনত আছে। সেইটো বিচাৰিবলৈ আপোনাৰ আঙুলিটো স্ক্ৰীনখনৰ চাৰিওফালে ঘূৰাওক।"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"ডিভাইচ আৰু ফিংগাৰপ্ৰিণ্ট ছেন্সৰ অৱস্থানৰ সৈতে চিত্ৰণ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"নাম"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ঠিক"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"মচক"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"ছেন্সৰটো স্পৰ্শ কৰক"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"আপোনাৰ আঙুলিটো ছেন্সৰটোত ৰাখক আৰু এটা কম্পন অনুভৱ কৰাৰ পিছত আঁতৰাওক"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"ওপৰলৈ উঠাওক, তাৰ পিছত পুনৰ স্পৰ্শ কৰক"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"আপোনাৰ ফিংগাৰপ্ৰিণ্টৰ সকলো অংশ যোগ কৰিবলৈ আঙুলিটো কেইবাবাৰো উঠাব আৰু পুনৰ লগাব লাগিব"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ফিংগাৰপ্ৰিণ্ট যোগ কৰা হ’ল"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"আপুনি যেতিয়া এই আইকনটো দেখা পায়, তেতিয়া চিনাক্তকৰণৰ বাবে বা ক্ৰয়ৰ অনুমতি দিবলৈ আপোনাৰ ফিংগাৰপ্ৰিণ্টটো ব্যৱহাৰ কৰক"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"এইটো পিছত কৰিব"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Search"</string>
     <string name="display_settings" msgid="7197750639709493852">"ডিছপ্লে’"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"স্বয়ং-ঘূৰ্ণন স্ক্ৰীণ"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"অফ কৰা আছে"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"অন কৰা আছে"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"অন আছে - মুখাৱয়ব ভিত্তিক"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"মুখাৱয়ব চিনাক্তকৰণ সক্ষম কৰক"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ৰংবোৰ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"প্ৰাকৃতিক"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"বৃদ্ধি কৰা হ’ল"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"অন / আপুনি যদি চাই থাকে তেন্তে স্ক্ৰীণখন কেতিয়াও বন্ধ নহয়"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"অফ আছে"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"কেমেৰাৰ এক্সেছৰ দৰকাৰ"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"ডিভাইচ ব্যক্তিগতকৰণ সেৱাসমূহৰ অনুমতি পৰিচালনা কৰিবলৈ টিপক"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"আপুনি চাই থাকিলে স্ক্ৰীণখন বন্ধ হোৱাত বাধা দিয়ে।"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"স্ক্ৰীণৰ সতর্কতাই কোনোবাই স্ক্ৰীণখন চাই আছে নেকি জানিবলৈ সন্মুখৰ কেমেৰা ব্যৱহাৰ কৰে। এই সুবিধাটোৱে ডিভাইচত কাম কৰে আৰু প্ৰতিচ্ছবিবোৰ কেতিয়াও ষ্ট\'ৰ কৰা বা Googleলৈ পঠিওৱা নহয়।"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"স্ক্ৰীনৰ সতর্কতা অন কৰক"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"স্ক্ৰীনখন গাঢ় ৰঙৰ হৈ থকা সময়ত, এইটোৱে নতুন জাননীসমূহৰ বাবে অন কৰে"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"সময় আৰু তথ্য সদায় দেখুৱাওক"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"বেটাৰীৰ বৰ্ধিত ব্যৱহাৰ"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"ব’ল্ড কৰা পাঠ"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"ব’ল্ড কৰা পাঠ"</string>
     <string name="title_font_size" msgid="570613010306330622">"ফণ্টৰ আকাৰ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"পাঠ ডাঙৰ বা সৰু কৰক"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"ছিম কাৰ্ড লক কৰা ছেটিংসমূহ"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"অন্য ব্যৱহাৰকাৰীসকল"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ডিভাইচৰ সঞ্চয়াগাৰ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"প\'ৰ্টেবল সঞ্চয়াগাৰ"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"এলাৰ্ম আৰু ৰিমাইণ্ডাৰ"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"এলাৰ্ম অথবা ৰিমাইণ্ডাৰ ছেট কৰিবলৈ অনুমতি দিয়ক"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"এলাৰ্ম আৰু ৰিমাইণ্ডাৰ"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"এই এপ্‌টোক এলাৰ্ম অথবা অন্য সময় ভিত্তিক অনুষ্ঠানৰ সময়সূচী নিৰ্ধাৰণ কৰিবলৈ দিয়ক। এইটোৱে আপুনি ডিভাইচটো ব্যৱহাৰ কৰি নথকাৰ সময়তো অন্য এপক সক্ৰিয় হ’বলৈ আৰু চলিবলৈ অনুমতি দিয়ে। মনত ৰাখিব যে এই অনুমতিটো প্ৰত্যাহাৰ কৰাৰ ফলত এপ্‌টোৱে ভালদৰে কাম নকৰা হ’ব পাৰে, বিশেষকৈ এপ্‌টোৱে সময়সূচী নিৰ্ধাৰণ কৰা এলাৰ্মসমূহে আৰু কাম নকৰে।"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"সময়সূচী, এলাৰ্ম, ৰিমাইণ্ডাৰ, অনুষ্ঠান"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g>ৰ ভিতৰত <xliff:g id="USED">%1$s</xliff:g> ব্যৱহৃত হৈছে"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g>ৰ ব্যৱহৃত"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"অৱস্থান সেৱাসমূহ"</string>
     <string name="location_title" msgid="5819154746934945021">"মোৰ অৱস্থান"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"কৰ্মস্থানৰ প্ৰ’ফাইলৰ বাবে অৱস্থান"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"অৱস্থানলৈ এপৰ এক্সেছ"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"অৱস্থান সুবিধা অফ আছে"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g>টাৰ ভিতৰত <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>টা এপে অৱস্থান এক্সেছ কৰিব পাৰে</item>
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g>টাৰ ভিতৰত <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>টা এপে অৱস্থান এক্সেছ কৰিব পাৰে</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"শেহতীয়াকৈ কৰা অৱস্থান এক্সেছ"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"সবিশেষ চাওক"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"বৰ্তমান কোনো এপে অৱস্থানৰ তথ্য় বিচাৰি অনুৰোধ কৰা নাই"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"শেহতীয়াকৈ কোনো এপে অৱস্থান এক্সেছ কৰা নাই"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"অত্যাধিক বেটাৰি ব্যৱহাৰ"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"বেটাৰিৰ কম ব্যৱহাৰ"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"ৱাই-ফাই আৰু ব্লুটুথ স্কেনিং"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"ৱাই-ফাই স্কেনিং"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"ৱাই-ফাই অফ থকা অৱস্থাতো এপ্ আৰু সেৱাসমূহক যিকোনো সময়ত ৱাই-ফাই নেটৱৰ্কবোৰ স্কেন কৰিবলৈ দিয়ক। এই কাৰ্যটো, যেনে, অৱস্থান সম্পৰ্কীয় সুবিধা আৰু সেৱাসমূহক উন্নত কৰিবলৈ ব্য়ৱহাৰ কৰিব পাৰি।"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ব্লুটুথ স্কেনিং"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ব্লুটুথ অফ থকা অৱস্থাতও এপ্ আৰু সেৱাসমূহক যিকোনো সময়ত নিকটৱৰ্তী ডিভাইচবোৰ স্কেন কৰিবলৈ দিয়ক। এই কাৰ্যটো, যেনে, অৱস্থান সম্পৰ্কীয় সুবিধা আৰু সেৱাসমূহক উন্নত কৰিবলৈ ব্য়ৱহাৰ কৰিব পাৰি।"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"অৱস্থান সেৱা"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"কৰ্মস্থানৰ বাবে অৱস্থান সেৱা"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"অৱস্থানৰ সময় মণ্ডল চিনাক্তকৰণ"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"অৱস্থানৰ সময় মণ্ডল চিনাক্তকৰণ"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"বৰ্তমানৰ সময় মণ্ডলটো চিনাক্ত কৰিবলৈ ডিভাইচটোৰ অৱস্থান ব্যৱহাৰ কৰিবলৈ দিয়ে। ৱাই-ফাই স্কেনিঙৰ দৰে অন্য অৱস্থান ছেটিংসমূহে সময় মণ্ডলৰ চিনাক্তকৰণৰ সঠিকতা প্ৰভাৱিত কৰিব পাৰে।"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"অন আছ"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"অফ আছে"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"স্বয়ংক্ৰিয়ভাৱে সময় মণ্ডল চিনাক্ত কৰা সুবিধাটো অক্ষম কৰা আছে"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"স্বয়ংক্ৰিয় সময় মণ্ডল অফ হৈ আছে"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"অৱস্থানৰ সময় মণ্ডল চিনাক্তকৰণৰ সুবিধাটো অক্ষম কৰা হৈছে"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"অৱস্থানৰ সময় মণ্ডল চিনাক্তকৰণৰ সুবিধাটো সমৰ্থিত নহয়"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"অৱস্থানৰ সময় মণ্ডল চিনাক্তকৰণৰ সালসলনিৰ অনুমতি দিয়া নহয়"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"সক্ষম কৰক"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"সঞ্চয়াগাৰ মচক"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"আপডেইটবিলাক আঁতৰাওক"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"আপুনি কিছুমান কাৰ্যৰ কাৰণে এই এপক ডিফ\'ল্টভাৱে লঞ্চ কৰাৰ বিকল্প বাছি লৈছে।"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"আপুনি বাছনি কৰা কিছুমান কাৰ্যকলাপ ডিফ’ল্ট হিচাপে এই এপ্‌টোত খোল খায়।"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"আপুনি এই এপটোক ৱিজেট সৃষ্টি কৰিবলৈ আৰু সেইবিলাকৰ ডেটা চাবলৈ অনুমতি দিবলৈ বাছনি কৰিছে।"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"কোনো ডিফ’ল্ট ছেট কৰা হোৱা নাই৷"</string>
-    <string name="clear_activities" msgid="341345438786077236">"ডিফল্টবিলাক মচক"</string>
+    <string name="clear_activities" msgid="488089228657585700">"ডিফ’ল্ট অগ্ৰাধিকাৰসমূহ মচক"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"এই এপটো আপোনাৰ স্ক্ৰীণৰ উপযোগীকৈ তৈয়াৰ কৰা নহবও পাৰে। আপুনি ই কেনেকৈ নিজকে আপোনাৰ স্ক্ৰীণত খাপ খাই তাক ইয়াত নিয়ন্ত্ৰণ কৰিব পাৰিব।"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"আৰম্ভ কৰাৰ সময়ত সোধক"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"এপ্ স্কেল কৰক"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"আপুনি আপোনাৰ প্ৰয়োজনীতাসমূহৰ সৈতে মিলাকৈ এই ডিভাইচটো কাষ্টমাইজ কৰিব পাৰে। এই সাধ্য সুবিধাসমূহ পিছত ছেটিংসমূহ-লৈ গৈ সলনি কৰিব পাৰিব।"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ফণ্টৰ আকাৰ সলনি কৰক"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"স্ক্ৰীণ ৰিডাৰ"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"অডিঅ\' আৰু স্ক্ৰীণত প্ৰদৰ্শিত পাঠ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"কেপশ্বন"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"অডিঅ’"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"সাধাৰণ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ডিছপ্লে’"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"পাঠ আৰু ডিছপ্লে’"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"স্ক্ৰীনখন গাঢ় কৰক"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ৰঙা-সেউজীয়া"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ৰঙা-সেউজীয়া"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"নীলা-হালধীয়া"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"উজ্জ্বলতা কমাওক"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"উজ্জ্বলতা কমাওক"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"আপোনাৰ ফ’নটোৰ ন্যূনতম উজ্জ্বলতাতকৈ স্ক্ৰীনখন গাঢ় কৰি তোলে"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"আপোনাৰ টেবলেটটোৰ ন্যূনতম উজ্জ্বলতাতকৈ স্ক্ৰীনখন গাঢ় কৰি তোলে"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"আপোনাৰ স্ক্ৰীনখন গাঢ় কৰি তোলে যাতে পঢ়িবলৈ আৰু সুবিধাজনক হয়।&lt;br/&gt;&lt;br/&gt; এইটো এই ক্ষেত্ৰসমূহত সহায়ক হ’ব পাৰে: &lt;ol&gt; &lt;li&gt; আপোনাৰ ফ’নটোৰ ডিফ’ল্ট ন্যূনতম উজ্জ্বলতা তথাপি যদি বেছি উজ্জ্বল হয়&lt;/li&gt; &lt;li&gt; আপুনি নিজৰ ফ’নটো কোনো অন্ধকাৰ স্থানত ব্যৱহাৰ কৰি থাকিলে যেনে, ৰাতি অথবা শোৱাৰ আগতে এটা অন্ধকাৰ কোঠাত ব্যৱহাৰ কৰি থাকোঁতে&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"চেহেৰা"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"ফিংগাৰপ্ৰিণ্ট, ফিংগাৰপ্ৰিণ্ট যোগ কৰক"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"অনুজ্জ্বল স্ক্ৰীণ, টাচ্চস্ক্ৰীণ, বেটাৰি, স্মার্ট উজ্জ্বলতা, গতিশীল উজ্জ্বলতা, স্বয়ংক্ৰিয় উজ্জ্বলতা"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"অনুজ্জ্বল স্ক্ৰীণ, নিদ্ৰা, বেটাৰি, টাইমআউট, মনোযোগ, ডিছপ্লে’, স্ক্ৰীণ, নিষ্ক্ৰিয়তা"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"ঘূৰোৱা, লুটিওৱা, ঘূৰ্ণন, প\'ৰ্ট্ৰেইট, লেণ্ডস্কেইপ, দিশ, উলম্ব, অনুভূমিক"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"আপগ্ৰেইড, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"ডিএনডি, সূচী, জাননী, অৱৰোধ, নীৰৱতা, কম্পন, নিদ্ৰা, কৰ্ম, ফ\'কাছ, ধ্বনি, মিউট, দিন, কৰ্মদিন, কৰ্মদিনৰ ৰাতি, কাৰ্যক্ৰম"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"স্ক্ৰীণ, লক কৰা সময়, টাইমআউট, লকস্ক্ৰীণ"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ৰিংট\'নসমূহ"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"অইন ধ্বনি আৰু কম্পনসমূহ"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"জাননী"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"বাৰ্তালাপ"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"অলপতে পঠিওৱা হ’ল"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"যোৱা ৭ দিনৰ সকলোখিনি চাওক"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"উচ্চখাপৰ"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"সাধাৰণ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"কৰ্মস্থান সম্পৰ্কীয় জাননীসমূহ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"অভিযোজিত জাননীসমূহ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"অভিযোজিত জাননীৰ অগ্ৰাধিকাৰ"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"পুল-ডাউন শ্বেড, ষ্টেটাছ বাৰ আৰু লক স্ক্ৰীণত দেখুৱাওক"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"স্থিতি দণ্ডত নীৰৱ জাননীসমূহ লুকুৱাওক"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"অনুজ্জ্বল পোহৰ"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"লকস্ক্ৰীনত দেখা পোৱা জাননীসমূহ"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"গোপনীয়তা"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"লক স্ক্ৰীণ বাদ দিয়ক"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"মুখাৱয়বৰদ্বাৰা আনলক কৰি, পোনপটীয়াকৈ শেহতীয়াকৈ ব্যৱহাৰ কৰা স্ক্ৰীণলৈ যাওক"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"লক স্ক্ৰীণ, লকস্ক্ৰীণ, বাদ দিয়ক, প্ৰতিহত কৰক"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="other">~প্ৰতি সপ্তাহে <xliff:g id="NUMBER_1">%d</xliff:g>টা জাননী</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"কেতিয়াও পঠোৱা নহয়"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"জাননীত অনুমতি"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"ডিভাইচ আৰু এপৰ জাননী"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"আপোনাৰ এপ্‌ আৰু ডিভাইচত কোনবোৰ জাননী দেখুৱাব লাগে নিয়ন্ত্ৰণ কৰক"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"কৰ্মস্থানৰ প্ৰ\'ফাইলৰ জাননীসমূহত প্ৰৱেশ কৰাৰ অনুমতি অৱৰোধ কৰা হৈছে"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"এপসমূহে জাননী পঢ়িব নোৱাৰে"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"অফ কৰক"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"বাতিল কৰক"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"অনুমতিপ্ৰাপ্ত জাননীৰ প্ৰকাৰ"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"চলি থকা গুৰুত্বপূৰ্ণ জাননী"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"বাৰ্তালাপৰ জাননী"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"সতৰ্কতামূলক জাননী"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"নীৰৱ জাননী"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"ৰিয়েল-টাইম"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"ব্যৱহাৰ হৈ থকা এপ্‌, নেভিগেশ্বন, ফ’ন কল আৰু অধিকৰ পৰা পোৱা ৰিয়েল-টাইমৰ যোগাযোগ"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"বাৰ্তালাপ"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS আৰু অন্য যোগাযোগ"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"ডিফ’ল্ট"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"ছেটিঙৰ ওপৰত ভিত্তি কৰি ৰিং অথবা কম্পন কৰিব পৰা জাননী"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"নীৰৱ"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"কেতিয়াও শব্দ অথবা কম্পন নকৰা জাননী"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"আটাইবোৰ এপ্‌ চাওক"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"জাননী পঠিয়াব পৰা প্ৰতিটো এপৰ বাবে জাননীৰ ছেটিং সলনি কৰক"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"ডিভাইচত দেখুওৱা এপ্‌"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"ভিআৰ সহায়ক সেৱা"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ইনষ্টল কৰি থোৱা কোনো এপে ভিআৰ সহায়ক সেৱা হিচাপে চলাবলৈ অনুৰোধ কৰা নাই।"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR সেৱাক <xliff:g id="SERVICE">%1$s</xliff:g>ত প্ৰৱেশৰ অনুমতি দিয়ে নে?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"ডিফ’ল্ট অনুযায়ী খোলক"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"লিংক খোলা"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"সমৰ্থিত লিংকসমূহ খোলা"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"সমৰ্থিত লিংকসমূহ এই এপ্‌টোত খোল খায়"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"এই এপ্‌টোত খুলিবলৈ থকা লিংক"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"নুসোধাকৈ খোলক"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"সমৰ্থিত লিংকসমূহ"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"অন্য ডিফ\'ল্টসমূহ"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"অন্য ডিফ’ল্ট অগ্ৰাধিকাৰ"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"লিংক যোগ দিয়ক"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"এটা এপে তাত স্বয়ংক্ৰিয়ভাৱে খুলিবলৈ লিংকসমূহ সত্যাপন কৰিব পাৰে। "<annotation id="url">"অধিক জানক"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> টা সত্যাপন কৰা লিংক</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> টা সত্যাপন কৰা লিংক</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">এই লিংকসমূহৰ সত্যাপন কৰা হৈছে আৰু সেইসমূহ স্বয়ংক্ৰিয়ভাৱে এই এপ্‌টোত খোল খায়।</item>
+      <item quantity="other">এই লিংকসমূহৰ সত্যাপন কৰা হৈছে আৰু সেইসমূহ স্বয়ংক্ৰিয়ভাৱে এই এপ্‌টোত খোল খায়।</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ঠিক আছে"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"সমৰ্থিত অন্য লিংকৰ বাবে পৰীক্ষা কৰি থকা হৈছে…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"বাতিল কৰক"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> টা সমৰ্থিত লিংক</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> টা সমৰ্থিত লিংক</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"যোগ দিয়ক"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g>ত খোল খায়"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>ৰ <xliff:g id="SIZE">%1$s</xliff:g> ব্যৱহাৰ হ’ল"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"অভ্যন্তৰীণ ষ্ট’ৰেজ"</string>
     <string name="storage_type_external" msgid="125078274000280821">"বাহ্যিক ষ্ট’ৰেজ"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"কেমেৰাক অনুমতি দিয়া হোৱা নাই"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"স্ক্ৰীণশ্বটৰ অনুমতি নাই"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"এই এপটো খুলিব নোৱাৰি"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"আপোনাৰ কিবা প্ৰশ্ন থাকিলে আপোনাৰ আইটি প্ৰশাসকৰ সৈতে যোগাযোগ কৰক"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"অধিক বিৱৰণ"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"আপোনাৰ এডমিনে আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইলৰ ছেটিংসমূহ, অনুমতিসূুহ, কৰ্পৰেট প্ৰৱেশ, নেটৱৰ্ক কাৰ্যকলাপ আৰু ডিভাইচৰ অৱস্থানৰ তথ্যৰ সৈতে জড়িত এপ্ আৰু ডেটা নিৰীক্ষণ কৰাৰ লগতে পৰিচালনা কৰিব পাৰে।"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"আপোনাৰ প্ৰশাসকে এই ব্যৱহাৰকাৰীৰ সৈতে জড়িত ছেটিংসমূহ, অনুমতিসমূহ, কৰ্পৰেট প্ৰৱেশ, নেটৱৰ্ক কাৰ্যকলাপ আৰু ডিভাইচৰ অৱস্থানৰ তথ্যকে আদি কৰি সকলো এপ্ আৰু ডেটা নিৰীক্ষণ কৰাৰ লগতে পৰিচালনা কৰিব পাৰে।"</string>
@@ -4348,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g>টা সীমাবদ্ধতা</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"বাহকৰ ডেটা গণনা কাৰ্য ডিভাইচৰ গণনাতকৈ পৃথক হ’ব পাৰে"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"বাহকৰ নেটৱৰ্কসমূহে ব্যৱহাৰ কৰা ডেটা বহিৰ্ভূত কৰে"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"বাহকৰ নেটৱর্কে ব্যৱহাৰ কৰা ডেটা বহিৰ্ভূত কৰে"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> খৰচ কৰা হৈছে"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ডেটা ব্যৱহাৰৰ সকীয়নি ছেট কৰক"</string>
     <string name="data_warning" msgid="2925054658166062884">"ডেটা সকিয়নী"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(ব্যৱহাৰকাৰী <xliff:g id="USER">%s</xliff:g>ৰ বাবে আনইনষ্টল কৰা হৈছে)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g>ৰ বাবে অক্ষম কৰা হৈছে)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"স্বয়ংপূৰ্তি সেৱা"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"স্বয়ং, পূৰ কৰা, স্বয়ংপূৰ্তি"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"পাছৱৰ্ড"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"স্বয়ংক্ৰিয়, পূৰ, স্বয়ংক্রিয়ভাৱে পূৰ হোৱা, পাছৱৰ্ড"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;আপুনি এই এপটোক বিশ্বাস কৰাটো নিশ্চিত কৰক&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; এ স্বয়ংভৰ্তিৰ বাবে নিৰ্ধাৰণ কৰিবলৈ আপোনাৰ স্ক্ৰীণত দেখা দিয়া বস্তুবোৰ ব্য়ৱহাৰ কৰে।"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"স্বয়ংপূৰ্তি"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"লগিঙৰ স্তৰ"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"নেটৱৰ্ক অপাৰেটিং ম\'ডটো সলনি কৰক"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ প্ৰকাৰ"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"বাহক"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ছেটিঙৰ সংস্কৰণ"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"বাহকৰ ছেটিঙৰ সংস্কৰণ"</string>
     <string name="call_category" msgid="641461844504128789">"কল ছেটিং"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"বাহকৰ ভিডিঅ\' কলিং"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"ছিষ্টেম বাছনি"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ছিমখন আঁতৰাওক আৰু পুনৰ ভৰাওক। সমস্যাটো অব্যাহত থাকিলে আপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰক।"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ছিমখন পুনৰ অন কৰিবলৈ চেষ্টা কৰক। সমস্যাটো অব্যাহত থাকিলে আপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰক।"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"নেটৱৰ্ক সক্ৰিয়কৰণ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"বাহক সলনি কৰা কাৰ্য"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> সক্ৰিয় হৈ আছে"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"ছিমৰ ছেটিং আপডে’ট কৰিবলৈ টিপক"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>লৈ সলনি কৰা হ’ল"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"অফ আছে"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"ইণ্টাৰনেট"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"ছিম"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"এয়াৰপ্লে’ন ম’ডত উপলব্ধ নেটৱৰ্কসমূহ দেখুৱাওক"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"এয়াৰপ্লে’ন ম’ডত নেটৱৰ্ক বিচাৰক আৰু সংযোগ কৰক।"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"ৱাই-ফাই নেটৱৰ্ক বিচাৰক আৰু তাত সংযোগ কৰক"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"এয়াৰপ্লেন, এয়াৰপ্লেন-সুৰক্ষিত"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"কল আৰু এছএমএছ"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"ৱাই-ফাই কলিং"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"উপলব্ধ নহয়"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"সাময়িকভাৱে উপলব্ধ নহয়"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"ছিম নাই"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"অগ্ৰাধিকাৰ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"নেটৱৰ্কৰ অগ্ৰাধিকাৰ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ৰাজহুৱা নেটৱৰ্কসমূহৰ সৈতে সংযোগ কৰক"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"নেটৱৰ্ক সংযোগ, ইণ্টাৰনেট, বেতাঁৰ, ডেটা, ৱাইফাই, ৱাই-ফাই, ৱাই ফাই, চেলুলাৰ, ম’বাইল, চেল কেৰিয়াৰ, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"এয়াৰপ্লেন ম’ডৰ নেটৱৰ্ক চাওক"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"এয়াৰপ্লে’ন ম’ডত উপলব্ধ নেটৱৰ্কসমূহ চাই থকা হৈছে"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"নেটৱৰ্ক অন কৰক"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"নেটৱৰ্ক অফ কৰক"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"আপোনাৰ ইণ্টাৰনেট ৰিছেট কৰিবনে?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"এইটোৱে আপোনাৰ ফ’ন কলটোৰ অন্ত পেলাব"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"এইটোৱে আপোনাৰ ফ’ন কলটোৰ অন্ত পেলাব"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"আপোনাৰ ইণ্টাৰনেট ৰিছেট কৰি থকা হৈছে…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"সংযোগ ঠিক কৰক"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"এয়াৰপ্লেন ম’ডৰ নেটৱৰ্ক উপলব্ধ"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"নেটৱৰ্ক সলনি কৰিবলৈ ইথাৰনেটৰ পৰা সংযোগ বিচ্ছিন্ন কৰক"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"সংযুক্ত হৈ থাকোঁতে নেটৱৰ্ক সলনি কৰিব নোৱাৰি"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"এয়াৰপ্লেন ম’ডত উপলব্ধ নেটৱৰ্ক"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"সংযোজিত হৈ আছে"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"ইণ্টাৰনেট স্বয়ংক্ৰিয়ভাৱে সংযুক্ত নহ’ব"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"ৰং"</string>
     <string name="category_name_others" msgid="2366006298768550310">"অন্যান্য"</string>
     <string name="category_name_general" msgid="7737273712848115886">"সাধাৰণ"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"আটাইবোৰ এপ্‌ চাওক"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"স্মাৰ্ট ফৰৱাৰ্ডিং"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"স্মাৰ্ট ফৰৱাৰ্ডিঙৰ সুবিধাটো সক্ষম কৰা আছে"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ফ’ন নম্বৰটো দিয়ক"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ফ’ন নম্বৰটো নাই।"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ঠিক আছে"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2Gৰ অনুমতি দিয়ক"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G চেলুলাৰ সংযোগ ব্যৱহাৰ কৰক। জৰুৰীকালীন কলৰ বাবে 2G সদায় অন হৈ থাকে।"</string>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index da2488d..6b01c37 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Ekrandakı mətni kiçildin və ya böyüdün."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Kiçildin"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Böyüdün"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Avtodönüşdən istifadə edin"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Mətn nümunəsi"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Ozlu Heyrətamiz Sehrbaz"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> barmaq izi quraşdırması</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Barmaq izi ilə kiliddən çıxarın"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Barmaq izinizi ayarlayın"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Barmaq izinizi istifadə edin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Telefonunuzu kiliddən çıxarmaq, alışları təsdiqləmək və ya tətbiqlərə daxil olmaq üçün sadəcə barmaq izi sensoruna toxunun. Kimin barmaq izini əlavə etdiyinizə diqqət edin. Hətta əlavə edilmiş bir iz bunlardan hər hansı birini edə bilər."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Barmaq izi güclü model və ya PIN-dən daha az güvənli ola bilər."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Hər şey nəzarətinizdədir"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Unutmayın"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Barmaq izi ilə yazılmış data güvənli saxlanılır və heç vaxt telefondan silinmir. Datanı istənilən vaxt ayarlarda silə bilərsiniz."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Barmaq izi güclü model və ya PIN-dən daha az güvənli ola bilər."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Daha qabaqcıl barmaq izi modelləri yaratmaq üçün telefonunuz bəzən son barmaq izi şəkillərinizdən istifadə edəcək."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Telefonu kiliddən çıxarmaq və ya satınalmaları təsdiq etmək üçün barmaq izindən istifadə edin.\n\nYadda saxlayın: Bu cihazı kiliddən çıxarmaq üçün barmaq izindən istifadə edə bilməzsiniz. Ətraflı məlumat üçün təşkilat admini ilə əlaqə saxlayın."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Telefonu kiliddən çıxarmaq və ya satınalmaları təsdiqləmək üçün barmaq izindən istifadə edin.\n\nYadda saxlayın: Barmaq izi güclü nümunə və ya PIN\'dən daha az təhlükəsiz ola bilər."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Ləğv edin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Xeyr, təşəkkürlər"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Keçin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Davam edin"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Razıyam"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ötürün"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Növbəti"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Barmaq izi ötürülsün?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Ötürün"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Ləğv edin"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Sensora toxunun"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Barmaq izi ikonasına toxunub saxlayın"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Bu, telefonun arxa hissəsindədir. İkinci barmağınızı istifadə edin."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"O, ekrandadır. İşıq saçan dairə ilə barmaq izini axtarın."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Barmaq izi sensoru ekranınızdadır. Tapmaq üçün barmağınızı ekranda hərəkət etdirin."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Cihaz və barmaq izi sensoru ilə illustrasiya"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Ad"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Silin"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Sensora toxunun"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Barmağı sensora qoyun və vibrasiyə hiss edənə qədər saxlayın"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Qaldırın və təkrar toxunun"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Barmaq izini tam əlavə etmək üçün barmağınızı qaldırmağa davam edin"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Barmaq izi əlavə edildi"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Bu ikonanı görən zaman identifikasiya və ya satınalmaları təsdiq etmək üçün barmaq izindən istifadə edin"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Daha sonra edin"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Axtarış"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ekran"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Avtodönüşlü ekran"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Deaktiv"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Aktiv"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Aktiv - Üz əsaslı"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Üz Aşkarlanmasını aktiv edin"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Rənglər"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Təbii"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Artan"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aktiv/ Ekrana baxırsınızsa, sönməyəcək"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Deaktiv"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Kamera girişi lazımdır"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Cihaz fərdiləşdirmə xidmətlərinin icazələrini idarə etmək üçün toxunun"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Ekrana baxırsınızsa, onu sönməyə qoymayacaq"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Ekran həssaslığı ekrana baxdığınızı bilmək üçün ön kameradan istifadə edir. Bu, cihazda işləyir. Şəkillər heç vaxt Google\'da saxlanılmır, yaxud göndərilmir."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Ekran həssaslığını aktiv edin"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Ekran tünd olduqda o, yeni bildirişləri göstərmək üçün aktiv olur"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Həmişə vaxt və bilgini göstər"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Batareya istifadəsi artdı"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Qalın mətn"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Qalın mətn"</string>
     <string name="title_font_size" msgid="570613010306330622">"Şrift ölçüsü"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Mətni kiçildin və ya böyüdün"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SİM kart kilidi parametrləri"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Digər istifadəçilər"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Cihaz yaddaşı"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Daşınan yaddaş ehtiyatı"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Siqnallar və xatırladıcılar"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Siqnal və xatırladıcıları ayarlamağa icazə verin"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Siqnallar və xatırladıcılar"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Bu tətbiqin siqnallar və ya digər vaxta əsaslanan tədbirləri planlaşdırmasına icazə verin. Bu, cihazı istifadə etmədiyiniz zaman belə tətbiqin oyanmasına və işləməsinə imkan verəcəkdir. Nəzərə alın ki, bu icazəni ləğv etsəniz, tətbiq düzgün işləməyə bilər, xüsusən də tətbiqin planlaşdırdığı siqnallar işləməyəcək."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"cədvəl, siqnal, xatırladıcı, tədbir"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> üzrə <xliff:g id="USED">%1$s</xliff:g> istifadə"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> istifadə olunub"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Məkan xidmətləri"</string>
     <string name="location_title" msgid="5819154746934945021">"Mənim yerləşməm"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"İş profili üçün yer"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Tətbiqin məkana girişi"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Məkan deaktivdir"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>/<xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> tətbiqin məkana giriş icazəsi var</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g>/<xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> tətbiqin məkana giriş icazəsi var</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Məkana ən son giriş"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Detallara baxın"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Son vaxtlar heç bir tətbiq tərəfindən məkan sorğusu olmayıb"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Son vaxtlarda məkana girişi edən tətbiq yoxdur"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Çox batareya istifadəsi"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Az batareya istifadəsi"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi və Bluetooth skanlaması"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi skan edilir"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi‑Fi deaktiv olsa belə, tətbiq və xidmətlərin Wi‑Fi şəbəkələrini istənilən zaman skan etməsinə icazə verin. Məsələn, bu, məkanla bağlı funksiya və xidmətləri təkmilləşdirmək üçün istifadə edilə bilər."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth skan edilir"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth deaktiv olsa belə, tətbiq və xidmətlərə yaxınlıqdakı cihazları istənilən zaman skan etməsinə icazə verin. Məsələn, bu, məkanla bağlı funksiya və xidmətləri təkmilləşdirmək üçün istifadə edilə bilər."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Məkan Xidmətləri"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"İş üçün məkan xidmətləri"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Məkan üzrə saat qurşağının aşkarlanması"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Məkan üzrə saat qurşağının aşkarlanması"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Cari saat qurşağını aşkarlamaq üçün cihazın məkanının istifadəsinə imkan verir. Wi‑Fi skanlaması kimi digər məkan ayarları saat qurşağının aşkarlanma dəqiqliyinə təsir edə bilər."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Aktiv"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Deaktiv"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Saat qurşağının avtomatik aşkarlanması deaktiv edilib"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Avtomatik saat qurşağı deaktivdir"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Məkan üzrə saat qurşağının aşkarlanması deaktiv edilib"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Məkan üzrə saat qurşağının aşkarlanması dəstəklənmir"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Məkan üzrə saat qurşağının aşkarlanması dəyişikliklərinə icazə verilmir"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Aktivləşdirin"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Yaddaşı təmizləyin"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Güncəlləşmələri qaldırın"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Siz bu tətbiqi defolt olaraq bəzi əməliyyatlar üçün işəsalımlı etdiniz."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Seçdiyiniz bəzi fəaliyyətlər bu tətbiqdə defolt olaraq açılır."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Siz bu tətbiqə widget yaratmaq və onların məlumatlarını əldə etməyə imkan vermə seçimini etmisiniz."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Varsayılan ayarlanmayıb."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Varsayılanları təmizlə"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Defolt tərcihləri silin"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Bu tətbiq ekranınıza uyğunlaşa bilməz. Ekranınıza necə uyğunlaşması haqqında burada idrə edə bilərsiniz."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Başladılanda soruş"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Tətbiqi ölçün"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Bu cihazı ehtiyacınıza uyğun fərdiləşdirə bilərsiniz. Bu əlçatımlıq xüsusiyyətləri daha sonra Ayarlardan dəyişdirilə bilər."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Şriftin ölçüsünü dəyişin"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekran oxuyucuları"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio və ekran mətni"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtitrlər"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Ümumi"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekran"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Mətn və displey"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekranı qaraldın"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Qırmızı-yaşıl"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Qırmızı-yaşıl"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Mavi-sarı"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Parlaqlığı Azaldın"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Parlaqlığı azaldın"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Ekranı telefonunuzun minimum parlaqlığından qaranlıq edin"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Ekranı planşetinizin minimum parlaqlığından qaranlıq edin"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Rahat oxumaq üçün ekranı qaraldın.&lt;br/&gt;&lt;br/&gt; Bu, aşağıdakı hallarda faydalı ola bilər: &lt;ol&gt; &lt;li&gt; Telefonunuzun defolt minimum parlaqlığı hələ də çox parlaq olduqda&lt;/li&gt; &lt;li&gt; Gecə və ya yatmazdan əvvəl qaranlıq otaqda olmaq kimi qaranlıq yerlərdə telefonunuzu istifadə etdiyiniz zaman&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"üz"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"barmaq izi, barmaq izi əlavə edin"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"qara ekran, sensor ekran, batareya, yeni parlaqlıq, dinamik parlaqlıq, avtomatik parlaqlıq"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"qara ekran, yuxu rejimi, batareya, fasilə, diqqət, displey, ekran, fəaliyyətsizlik"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"fırladın, çevirin, fırlatma, portret, mənzərə, orientir, vertikal, horizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"güncəlləyin, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, cədvəl, bildiriş, blok, səssiz, vibrasiya, yuxu, iş, fokus, səs, səssiz, gün, həftə içi, həftə sonu, həftə gecəsi, tədbir"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ekran, kilid vaxtı, zaman aşımı, kilid ekranı"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Zəng səsləri"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Digər səs və vibrasiyalar"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Bildirişlər"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Söhbət"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Ən son göndərilənlər"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Son 7 gün ərzində olanların hamısına baxın"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Qabaqcıl ayarlar"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Ümumi"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"İş bildirişləri"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptiv bildirişlər"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptiv bildiriş prioriteti"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Aşağı açılan menyu, status paneli &amp; kilid ekranında görünür"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Status panelində səssiz bildirişləri gizlədin"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Parıltı işığı"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Kilid ekranında bildirişlər"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Məxfilik"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Kilid ekranını keçin"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Üz ilə kilidi açdıqdan sonra birbaşa əsas səhifə ekranına keçin"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ekran kilidi, ekrankilidi, keçin, ötürün"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">Həftə ərzində ~<xliff:g id="NUMBER_0">%d</xliff:g> bildiriş</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Heç vaxt"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Bildiriş girişi"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Cihaz və tətbiq bildirişləri"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Tətbiqlər və cihazlarınızda hansı bildirişlərin göstərildiyinə nəzarət edin"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"İş profili bildirişlərinə giriş blok edilib"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Tətbiqlər bildirişləri oxuya bilmir"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Söndür"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Ləğv edin"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"İcazə verilən bildiriş növləri"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Vacib cari bildirişlər"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Söhbət bildirişləri"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Xəbərdarlıq bildirişləri"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Səssiz bildirişlər"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Real zaman"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"İstifadə edilən tətbiqlər, naviqasiya, telefon zəngləri və daha çoxundan real zamanda rabitə"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Söhbətlər"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS və digər rabitələr"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Defolt"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Ayarlara əsasən zəng çala və ya vibrasiya edə bilən bildirişlər"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Səssiz"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Heç vaxt səs və ya vibrasiya etməyən bildirişlər"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Bütün tətbiqlərə baxın"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Bildiriş göndərə bilən hər bir tətbiq üçün bildiriş ayarlarını dəyişdirin"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Cihazda göstərilən tətbiqlər"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR köməkçi xidmətləri"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Heç bir tətbiq VR köməkçi xidmətləri kimi çalışma sorğusu göndərməyib."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR xidmətinə <xliff:g id="SERVICE">%1$s</xliff:g> üçün girişə icazə verilsin?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Defolt olaraq açın"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Linklər açılır"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Dəstəklənən linkləri açın"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Dəstəklənən keçidlər bu tətbiqdə açılır"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Bu tətbiqdə açmaq üçün keçidlər"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Soruşmadan açın"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Dəstəklənən linklər"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Digər defoltlar"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Digər defolt tərcihlər"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Keçid əlavə edin"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Tətbiq keçidlərin avtomatik tətbiqdə açılması üçün onları doğrulaya bilər. "<annotation id="url">"Ətraflı məlumat"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> doğrulanmış keçid</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> doğrulanmış keçid</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Bu keçidlər doğrulanıb və avtomatik olaraq bu tətbiqdə açılır.</item>
+      <item quantity="one">Bu keçid doğrulanıb və avtomatik olaraq bu tətbiqdə açılır.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Digər dəstəklənən keçidlər yoxlanılır…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Ləğv edin"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dəstəklənən keçid</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> dəstəklənən keçid</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Əlavə edin"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> tətbiqində açılır"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> <xliff:g id="STORAGE_TYPE">%2$s</xliff:g> yaddaşında istifadə edilib"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"daxili yaddaş"</string>
     <string name="storage_type_external" msgid="125078274000280821">"xarici yaddaş"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Kameraya icazə verilmir"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Skrinşota icazə verilmir"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Bu tətbiqi açmaq mümkün deyil"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Sualınız varsa, IT admini ilə əlaqə saxlayın"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Daha ətraflı"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Admin ayarlar, icazələr, korporativ giriş, şəbəkə fəaliyyəti və cihazın məkan məlumatı da daxil olmaqla bu iş profili ilə əlaqəli tətbiq və dataya nəzarət edə və idarə edə bilər."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Admin ayarlar, icazələr, korporativ giriş, şəbəkə fəaliyyəti və cihazın məkan məlumatı da daxil olmaqla bu istifadəçi ilə əlaqəli tətbiq və dataya nəzarət edə və idarə edə bilər."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 məhdudiyyət</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operator data hesablanması cihazınızın hesablamasından fərqli ola bilər"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Operator şəbəkələri tərəfindən istifadə edilən data daxil deyil"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Operator şəbəkələri tərəfindən istifadə edilən data daxil deyil"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> istifadə edildi"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Data xəbərdarlığı ayarlayın"</string>
     <string name="data_warning" msgid="2925054658166062884">"Data xəbərdarlığı"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g> üçün silindi)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g> üçün deaktiv edildi)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Avtodoldurma xidməti"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"avtomatik, doldurmaq, avtomatik doldurmaq"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Parollar"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"avto, doldur, avto doldurma, parol"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Bu tətbiqə etibar etdiyinizə əmin olun&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Avtodoldurma&gt;%1$s&lt;/xliff:g&gt;  nəyin avtomatik doldurula biləcəyini müəyyən etmək üçün ekrandakılardan istifadə edir."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Avtodoldurma"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Giriş səviyyəsi"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Şəbəkə əməliyyat rejimini dəyişin"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tərcih edilmiş şəbəkə növü"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Ayarlar versiyası"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operator ayarları versiyası"</string>
     <string name="call_category" msgid="641461844504128789">"Zəng edilir"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operator video zəngi"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sistem seçin"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM-i çıxarıb yenidən taxın. Problem həll olmasa, cihazı yenidən başladın."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM-i yenidən aktiv etməyə çalışın. Problem həll olmasa, cihazı yenidən başladın."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Şəbəkənin aktiv edilməsi"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operator dəyişdirilir"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktivdir"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ayarlarını yeniləmək üçün toxunun"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatoruna keçdiniz"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Deaktiv"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"İnternet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-lər"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Təyyarə rejimi şəbəkələrini göstərin"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Təyyarə rejimində şəbəkələri tapın və onlara qoşulun."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Wi‑Fi şəbəkələrini tapın və qoşulun"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"təyyarə, güvənli təyyarə şəbəkəsi"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Zənglər və SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi Zəngi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"əlçatmazdır"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Müvəqqəti olaraq əlçatan deyil"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM yoxdur"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Tərcihlər"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Şəbəkə tərcihləri"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"İctimai şəbəkələrə qoşulun"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"şəbəkə bağlantısı, internet, simsiz, data, wifi, wi-fi, wi fi, mobil şəbəkə, mobil, mobil operator, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Təyyarə rejimi şəbəkələrinə baxın"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Təyyarə rejimi şəbəkələrinə baxılır"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Şəbəkələri aktiv edin"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Şəbəkələri deaktiv edin"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"İnternet sıfırlansın?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Bu, telefon zəngini bitirəcək"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Bu, telefon zəngini bitirəcək"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"İnternet sıfırlanır…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Bağlantını düzəldin"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Təyyarə rejimi şəbəkələri əlçatandır"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Şəbəkələri dəyişmək üçün etherneti ayırın"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Qoşulduqdan sonra şəbəkələri dəyişmək olmur"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Təyyatə rejimi şəbəkələri"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Qoşulub"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"İnternet avtomatik qoşulmayacaq"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Rəng"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Digərləri"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Ümumi"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Bütün tətbiqlərə baxın"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Ağıllı Yönləndirmə"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Ağıllı Yönləndirmə aktivdir"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefon nömrəsini daxil edin"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefon nömrəsi yoxdur."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G şəbəkəsinə icazə verin"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G mobil bağlantılardan istifadə edin. Təcili zənglər üçün 2G həmişə aktivdir."</string>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 7532143..3e9ed55 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -53,9 +53,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Omogućava da tekst na ekranu bude manji ili veći."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Umanji"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Uvećaj"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Koristite automatsko rotiranje"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Primer teksta"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Čarobnjak iz Oza"</string>
@@ -409,15 +408,21 @@
       <item quantity="other">Podešeno je <xliff:g id="COUNT_1">%1$d</xliff:g> otisaka prstiju</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Otključajte otiskom prsta"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Podesite otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Koristite otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Samo dodirnite senzor za otisak prsta da biste otključali telefon, dali ovlašćenje za kupovine ili se prijavili u aplikacije. Vodite računa o tome čije otiske prstiju dodajete. Čak i samo jedan dodati otisak može da obavlja bilo koje od ovih radnji."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Otisak prsta može da bude manje bezbedan od jakog šablona ili PIN-a."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Vi imate kontrolu"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Imajte na umu"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Podaci koji se zabeleže pomoću otiska prsta bezbedno se čuvaju i ostaju samo na telefonu. Možete da izbrišete podatke u bilo kom trenutku u Podešavanjima."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Otisak prsta može da bude manje bezbedan od jakog šablona ili PIN-a."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Telefon će povremeno koristiti nedavne slike otiska prsta da bi pravio poboljšane modele otiska prsta."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Otključavajte telefon ili odobravajte kupovine pomoću otiska prsta.\n\nNapomena: Ne možete da otključavate ovaj uređaj pomoću otiska prsta. Više informacija zatražite od administratora organizacije."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Otključavajte telefon ili odobravajte kupovine pomoću otiska prsta.\n\nNapomena: Otisak prsta može da bude manje bezbedan od jakog šablona ili PIN-a."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, hvala"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Nastavi"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Prihvatam"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Dalje"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Preskačete otiske prstiju?"</string>
@@ -434,16 +439,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Preskoči"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Dodirnite senzor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Dodirnite i zadržite ikonu otiska prsta"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Nalazi se na zadnjoj strani telefona. Koristite kažiprst."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Na ekranu je. Potražite otisak prsta sa svetlećim krugom."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Senzor za otisak prsta je na ekranu. Pomerajte prst preko ekrana da biste ga pronašli."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustracija sa uređajem i lokacijom senzora za otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Naziv"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Potvrdi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Izbriši"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Dodirnite senzor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Stavite prst na senzor i podignite ga kada osetite vibraciju"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Podignite, pa opet dodirnite"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Nastavite da podižete prst da biste dodali različite delove otiska prsta"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Otisak prsta je dodat"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Kada vidite ovu ikonu, koristite otisak prsta radi identifikacije ili odobravanja kupovina"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Uradiću to kasnije"</string>
@@ -1196,14 +1210,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Pretraga"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ekran"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automatsko rotiranje ekrana"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Isključeno"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Uključeno"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Uključeno – na osnovu lica"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Omogući prepoznavanje lica"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Boje"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Prirodne"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Pojačane"</string>
@@ -1248,7 +1258,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Uključeno/ekran se neće isključiti ako gledate u njega"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Isključeno"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Potreban je pristup kameri"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Dodirnite da biste upravljali dozvolama za usluge personalizacije uređaja"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Sprečava isključivanje ekrana ako gledate u njega"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Pažnja ekrana koristi prednju kameru da bi utvrdila da li neko gleda u ekran. Radi na uređaju, a slike se nikada ne čuvaju niti šalju Google-u."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Uključite pažnju ekrana"</string>
@@ -1329,7 +1342,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kada je ekran taman, uključuje se ambijentalni ekran za nova obaveštenja"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Uvek prikazuj vreme i podatke"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Potrošnja baterije je povećana"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Podebljani tekst"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Podebljani tekst"</string>
     <string name="title_font_size" msgid="570613010306330622">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Omogućava da tekst bude veći ili manji"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Zaključavanje SIM kartice"</string>
@@ -1499,6 +1512,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Ostali korisnici"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Memorija uređaja"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Prenosna memorija"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmi i podsetnici"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Dozvoli podešavanje alarma ili podsetnika"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmi i podsetnici"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Dozvolite ovoj aplikaciji da zakazuje alarme ili druge događaje zasnovane na vremenu. Time dozvoljavate aplikaciji da se probudi i radi čak i kada ne koristite uređaj. Imajte na umu da aplikacija možda neće ispravno raditi ako opozovete ovu dozvolu. Konkretno, nijedan alarm koji je aplikacija zakazala neće više raditi."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"zakazati, alarm, podsetnik, događaj"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Koristi se <xliff:g id="USED">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"od ukupno <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1748,31 +1766,32 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Usluge lokacije"</string>
     <string name="location_title" msgid="5819154746934945021">"Moja lokacija"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokacija za poslovni profil"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Pristup aplikacije lokaciji"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokacija je isključena"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> aplikacija od <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ima pristup lokaciji</item>
       <item quantity="few"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> aplikacije od <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> imaju pristup lokaciji</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> aplikacija od <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ima pristup lokaciji</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Nedavni pristup lokaciji"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Prikaži detalje"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Nijedna aplikacija nije nedavno tražila lokaciju"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nijedna aplikacija nije nedavno pristupila lokaciji"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Velika potrošnja baterije"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Mala potrošnja baterije"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi i Bluetooth skeniraju"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi skeniranje"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Dozvolite aplikacijama i uslugama da traže Wi‑Fi mreže u bilo kom trenutku, čak i kada je Wi‑Fi isključen. Ovo može da se koristi, na primer, za poboljšanje funkcija i usluga zasnovanih na lokaciji."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth skeniranje"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Dozvolite aplikacijama i uslugama da traže uređaje u blizini u svakom trenutku, čak i kada je Bluetooth isključen. Ovo može da se koristi, na primer, za poboljšanje funkcija i usluga zasnovanih na lokaciji."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Usluge lokacije"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usluge lokacije za posao"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Otkrivanje vremenske zone lokacije"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Otkrivanje vremenske zone lokacije"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Omogućava da se lokacija uređaja koristi za otkrivanje aktuelne vremenske zone. Druga podešavanja lokacije, poput Wi‑Fi skeniranja, mogu da utiču na preciznost otkrivanja vremenske zone."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Uključeno"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Isključeno"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatsko otkrivanje vremenske zone je onemogućeno"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatska vremenska zona je isključena"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Otkrivanje vremenske zone lokacije je onemogućeno"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Otkrivanje vremenske zone lokacije nije podržano"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Promene otkrivanja vremenske zone lokacije nisu dozvoljene"</string>
@@ -1953,10 +1972,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Omogući"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Obriši memorijski prostor"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Deinstaliraj ažuriranja"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Izabrali ste podrazumevano pokretanje ove aplikacije za neke radnje."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Neke aktivnosti koje ste izabrali se podrazumevano otvaraju u ovoj aplikaciji."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Izabrali ste da dozvolite ovoj aplikaciji da pravi vidžete i pristupa njihovim podacima."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Nisu postavljene podrazumevane vrednosti."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Obriši podrazumevano"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Obriši podrazumevana podešavanja"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Ova aplikacija možda nije dizajnirana za vaš ekran. Ovde možete da kontrolišete kako će se prilagoditi vašem ekranu."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Pitaj pri pokretanju"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Promeni veličinu aplikacije"</string>
@@ -2168,7 +2187,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Možete da prilagodite ovaj uređaj prema potrebama. Te funkcije pristupačnosti možete kasnije da promenite u Podešavanjima."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Promenite veličinu fonta"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Čitači ekrana"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvuk i tekst na ekranu"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Titl"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Zvuk"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Opšte"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Prikaz"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst i prikaz"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Zatamnjuje ekran"</string>
@@ -2322,7 +2343,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Plavo-žuto"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Smanjite osvetljenost"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Smanjite osvetljenost"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Zatamnite ekran više od minimalne osvetljenosti telefona"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Zatamnite ekran više od minimalne osvetljenosti tableta"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Zatamnite ekran da bi vam čitanje bilo prijatnije.&lt;br/&gt;&lt;br/&gt; To može da vam bude korisno: &lt;ol&gt; &lt;li&gt; kada je podrazumevana minimalna osvetljenost telefona i dalje jaka&lt;/li&gt; &lt;li&gt; kada koristite telefon u mraku, na primer, noću ili u tamno sobi pre odlaska na spavanje&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3378,8 +3399,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"lice"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"otisak prsta, dodaj otisak prsta"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"zatamniti ekran, dodirni ekran, baterija, pametna osvetljenost, dinamička osvetljenost, automatska osvetljenost"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"zatamnjenje ekrana, spavanje, baterija, gašenje ekrana, pažnja, prikaz, ekran, neaktivnost"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"rotiraj, obrni, rotacija, uspravno, vodoravno, položaj, vertikalno, horizontalno"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"nadogradnja, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"ne uznemiravaj, raspored, obaveštenja, blokiraj, tišina, vibracija, spavanje, rad, koncentracija, zvuk, isključi zvuk, dan, radni dan, vikend, radni dan uveče, događaj"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ekran, vreme zaključavanja, gašenje ekrana, zaključan ekran"</string>
@@ -3548,9 +3571,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Melodije zvona"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Drugi zvukovi i vibracije"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Obaveštenja"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Konverzacija"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nedavno poslato"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Pogledajte sve iz poslednjih 7 dana"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Napredna"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Opšte"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Poslovna obaveštenja"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Prilagodljiva obaveštenja"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioritet prilagodljivog obaveštenja"</string>
@@ -3612,7 +3636,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Prikaži na kliznom panelu, statusnoj traci i zaključanom ekranu"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Sakrij nečujna obaveštenja na statusnoj traci"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Uključi treperenje lampice"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Obaveštenja na zaključanom ekranu"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privatnost"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Preskoči zaključan ekran"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Posle otključavanja licem idi direktno na poslednji ekran"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"zaključani ekran, preskočiti, zaobići"</string>
@@ -3704,7 +3728,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> obaveštenja nedeljno</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nikad"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Pristup obaveštenjima"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Obaveštenja na uređajima i u aplikacijama"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Kontrolišite koja obaveštenja se prikazuju u aplikacijama i na uređajima"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Pristup obaveštenjima poslovnog profila je blokiran"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Aplikacije ne mogu da čitaju obaveštenja"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3724,17 +3749,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Isključi"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Otkaži"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Dozvoljeni tipovi obaveštenja"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Važna aktivna obaveštenja"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Obaveštenja za konverzaciju"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Zvučna obaveštenja"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Nečujna obaveštenja"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"U realnom vremenu"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Obaveštenja u realnom vremenu iz aplikacija koje se koriste, navigacija, telefonski pozivi i drugo"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Konverzacije"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS i druga obaveštenja"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Podrazumevano"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Obaveštenja koja mogu da zvone ili vibriraju na osnovu podešavanja"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Nečujno"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Obaveštenja koja nikada ne proizvode zvuk niti vibracije"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Prikaži sve aplikacije"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Promenite podešavanja obaveštenja za svaku aplikaciju koja može da šalje obaveštenja"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Aplikacije koje se prikazuju na uređaju"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Usluge pomagača za virtuelnu realnost"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nijedna instalirana aplikacija nije zahtevala da se pokrene kao usluga pomagača za virtuelnu realnost."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Želite li da dozvolite pristup usluzi virtuelne realnosti za <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4028,9 +4053,33 @@
     <string name="launch_by_default" msgid="892824422067985734">"Podrazumevano otvaraj"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Otvaranje linkova"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Otvaraj podržane linkove"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Podržani linkovi se otvaraju u ovoj aplikaciji"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Linkovi koji se otvaraju u ovoj aplikaciji"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Otvaraj bez pitanja"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Podržani linkovi"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Druge podrazumevane aplikacije"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Druga podrazumevana podešavanja"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Dodaj link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Aplikacija može da potvrđuje linkove kako bi se automatski otvarali u njoj. "<annotation id="url">"Saznajte više"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> potvrđeni link</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> potvrđena linka</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> potvrđenih linkova</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Ovi linkovi su potvrđeni i automatski se otvaraju u ovoj aplikaciji.</item>
+      <item quantity="few">Ovi linkovi su potvrđeni i automatski se otvaraju u ovoj aplikaciji.</item>
+      <item quantity="other">Ovi linkovi su potvrđeni i automatski se otvaraju u ovoj aplikaciji.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Potvrdi"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Traže se drugi podržani linkovi…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Otkaži"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> podržani link</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> podržana linka</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> podržanih linkova</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Dodaj"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Otvara se u:<xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"Koristi se <xliff:g id="SIZE">%1$s</xliff:g> u: <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"interna memorija"</string>
     <string name="storage_type_external" msgid="125078274000280821">"spoljna memorija"</string>
@@ -4335,7 +4384,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Kamera nije dozvoljena"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Pravljenje snimaka ekrana nije dozvoljeno"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Ne možete da otvorite ovu aplikaciju"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Ako imate pitanja, obratite se IT administratoru"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Još detalja"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Administrator može da nadgleda aplikacije i podatke povezane sa poslovnim profilom, uključujući podešavanja, dozvole, korporativni pristup, aktivnosti na mreži i informacije o lokaciji uređaja, kao i da upravlja njima."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Administrator može da nadgleda aplikacije i podatke povezane sa ovim korisnikom, uključujući podešavanja, dozvole, korporativni pristup, aktivnosti na mreži i informacije o lokaciji uređaja, kao i da upravlja njima."</string>
@@ -4415,7 +4465,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ograničenja</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Obračun podataka kod mobilnog operatera se možda razlikuje od obračuna uređaja."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ne obuhvata podatke koje koriste mreže mobilnih operatera"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Ne obuhvata podatke koje koriste mreže mobilnih operatera"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Potrošili ste <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Podesi upozorenje o podacima"</string>
     <string name="data_warning" msgid="2925054658166062884">"Upozorenje za potrošnju podataka"</string>
@@ -4765,7 +4815,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(deinstalirano za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Usluga automatskog popunjavanja"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automatski, popunjavanje, automatsko popunjavanje"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Lozinke"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automatski, popuniti, automatski popuniti, lozinka"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Uverite se da je ova aplikacija pouzdana&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google automatsko popunjavanje&gt;%1$s&lt;/xliff:g&gt; koristi sadržaj ekrana za utvrđivanje podataka koji mogu automatski da se popune."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Automatsko popunjavanje"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Nivo evidentiranja"</string>
@@ -4973,7 +5024,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Promena režima rada mreže"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Željeni tip mreže"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Mobilni operater"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Verzija podešavanja"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Verzija podešavanja mobilnog operatera"</string>
     <string name="call_category" msgid="641461844504128789">"Pozivanje"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Video pozivanje preko operatera"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Izbor sistema"</string>
@@ -5022,6 +5073,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Uklonite SIM karticu, pa je stavite ponovo. Ako se problem i dalje javlja, restartujte uređaj."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Probajte ponovo da uključite SIM karticu. Ako se problem i dalje javlja, restartujte uređaj."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivacija mreže"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Prelazak na drugog mobilnog operatera"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Mobilni operater <xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktivan"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Dodirnite da biste ažurirali podešavanja SIM-a"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Prešli ste na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5173,7 +5225,7 @@
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Dozolite aplikacijama koje mogu da se prikazuju preko drugih aplikacija da prekrivaju sadržaj ekrana Podešavanja"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Mediji"</string>
     <string name="media_controls_summary" msgid="3573121049460596520">"Medija plejer u Brzim podešavanjima"</string>
-    <string name="media_controls_resume_description" msgid="7702723104730495227">"Prikazuje medija plejer u dužem periodu da bi se lako nastavila reprodukcija"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Prikazuje medija plejer duže vreme da bi se lako nastavila reprodukcija"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Sakrij plejer"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Prikaži plejer"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nije dostupan nijedan plejer"</string>
@@ -5184,8 +5236,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Isključeno"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM kartice"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Prikaži mreže za režim rada u avionu"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Pronađite mreže i povežite se sa njima u režimu rada u avionu."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Pronađite WiFi mreže i povežite se sa njima"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, bezbedno po avion"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Pozivi i SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Pozivanje preko WiFi-a"</string>
@@ -5199,22 +5250,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nedostupno"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Privremeno je nedostupno"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nema SIM kartice"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Podešavanja"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Podešavanja mreže"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Povežite se sa javnim mrežama"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"mrežna veza, internet, bežično, podaci, wifi, wi-fi, wi fi, mobilni telefon, mobilni, mobilni operater, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Prikaži mreže za režim rada u avionu"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Prikazuju se mreže za režim rada u avionu"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Uključite mreže"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Isključite mreže"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Želite li da resetujete internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Ovim završavate telefonski poziv"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Ovim završavate telefonski poziv"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Resetuje se internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Reši problem sa povezivanjem"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Dostupne su mreže za režim rada u avionu"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Da biste promenili mrežu, prekinite eternet vezu"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ne možete da promenite mrežu dok ste povezani"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mreže u režimu rada u avionu"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Automatsko povezivanje na internet nije moguće"</string>
@@ -5235,6 +5285,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Boja"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Drugo"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Opšte"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Prikaži sve aplikacije"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Pametno prosleđivanje"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Pametno prosleđivanje je omogućeno"</string>
@@ -5248,4 +5302,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Unesite broj telefona"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Nije naveden broj telefona."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Potvrdi"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Dozvolite 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Koristite 2G mobilne veze. 2G je uvek uključen za hitne pozive."</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 1b660a4..6483145 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -54,9 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Павелічэнне або памяншэнне тэксту на экране."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Паменшыць"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Павялічыць"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Выкарыстоўваць аўтапаварот"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Прыклад тэксту"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Чараўнік краіны Оз"</string>
@@ -413,15 +412,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> адбітка пальца наладжана</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Сканер адбіткаў пальцаў"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Наладзьце адбітак пальца"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Сканер адбіткаў пальцаў"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Проста дакраніцеся да сканера адбіткаў пальцаў, каб разблакіраваць свой тэлефон, аўтарызаваць куплю або ўвайсці ў праграму. Уважліва сачыце за тым, чые адбіткі пальцаў вы дадаяце. Любое з гэтых дзеянняў будзе даступнае для ўладальніка нават аднаго з адбіткаў пальцаў."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Выкарыстанне адбітка пальца можа быць менш бяспечным, чым складаны ўзор разблакіроўкі або PIN-код."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Усё пад кантролем"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Важная інфармацыя"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Даныя, запісаныя сканерам адбітка пальца, будуць захоўвацца толькі на вашым тэлефоне. Вы можаце ў любы час выдаліць іх у Наладах."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Выкарыстанне адбітка пальца можа быць менш бяспечным, чым складаны ўзор разблакіроўкі або PIN-код."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Каб ствараць больш дасканалыя ўзоры адбітка пальца, сканер вашага тэлефона будзе перыядычна запісваць новыя відарысы."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Для ўхвалення куплі ці разблакіроўкі тэлефона можна карыстацца адбіткам пальца.\n\nЗаўвага. Вы не можаце выкарыстоўваць адбітак пальца для разблакіроўкі гэтай прылады. Для атрымання дадатковай інфармацыі звяжыцеся з адміністратарам арганізацыі."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Для ўхвалення куплі ці разблакіроўкі тэлефона можна карыстацца адбіткам пальца.\n\nЗаўвага. Выкарыстанне адбітка пальца можа быць менш бяспечным, чым складаны ўзор разблакіроўкі або PIN-код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Скасаваць"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Не, дзякуй"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Прапусціць"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Далей"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Згаджаюся"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Прапусціць"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Далей"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Не наладжваць адбітак?"</string>
@@ -438,16 +443,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Прапусціць"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Скасаваць"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Дакраніцеся да сканера"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Націсніце і ўтрымлівайце значок адбітка пальца"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Ён на задняй панэлі тэлефона. Карыстайцеся ўказальным пальцам."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Элемент знаходзіцца на экране. Знайдзіце адбітак пальца ў крузе, які свеціцца."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Сканер адбіткаў пальцаў знаходзіцца на экране. Каб яго знайсці, павадзіце пальцам па экране."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Відарыс, які паказвае, дзе размяшчаецца датчык адбіткаў пальцаў на прыладзе"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Імя"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ОК"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Выдаліць"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Дакраніцеся да сканера"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Прыкладзіце палец да сканера і ўтрымлівайце яго, пакуль не адчуеце вібрацыю"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Падыміце і дакраніцеся зноў"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Дакраніцеся некалькі разоў, каб адбітак быў больш дакладны"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Адбітак пальца дададзены"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Гэты значок паказвае, што вы можаце спраўджваць сваю асобу або ўхваляць куплі адбіткам пальца"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Пазней"</string>
@@ -1216,14 +1230,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Пошук"</string>
     <string name="display_settings" msgid="7197750639709493852">"Дысплэй"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Аўтаматычны паварот экрана"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Выключана"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Уключана"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Укл. – З улікам паставы галавы"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Уключыць выяўленне твару"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Колеры"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Натуральныя"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Яркія"</string>
@@ -1268,7 +1278,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Укл. / Калі глядзець на экран, ён не будзе выключацца"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Выключана"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Патрабуецца доступ да камеры"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Націсніце, каб кіраваць дазволамі для Сэрвісаў персаналізацыі прылады"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Не дазваляе экрану выключацца, калі на яго глядзяць"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Адаптыўны рэжым з дапамогай пярэдняй камеры вызначае, калі хто-небудзь глядзіць на экран. Функцыя працуе толькі на прыладзе: відарысы не захоўваюцца і не адпраўляюцца ў Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Уключыць адаптыўны рэжым"</string>
@@ -1349,7 +1362,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Цёмны экран уключаецца, калі прыходзяць новыя апавяшчэнні"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Заўсёды паказваць час і даныя"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Павышанае выкарыстанне зараду"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Тлусты шрыфт"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Тлусты шрыфт"</string>
     <string name="title_font_size" msgid="570613010306330622">"Памер шрыфту"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Павялічыць або паменшыць тэкст"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Налады блакіроўкі SIM-карты"</string>
@@ -1520,6 +1533,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Iншыя карыстальнікi"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Сховішча на прыладзе"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Партатыўнае сховішча"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Будзільнікі і напаміны"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Дазволіць наладжваць будзільнікі і напаміны"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Будзільнікі і напаміны"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Дазвольце гэтай праграме ўключаць будзільнікі і задаваць час падзей. Дзякуючы гэтаму праграма будзе абуджацца і працаваць, нават калі вы не выкарыстоўваеце прыладу. Звярніце ўвагу, што скасаванне дазволу можа прывесці да збояў у працы праграмы, у прыватнасці, будуць адключаны будзільнікі, зададзеныя праграмай."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"расклад, будзільнік, напамін, падзея"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Выкарыстана <xliff:g id="USED">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Усяго <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1769,7 +1787,8 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Службы геалакацыі"</string>
     <string name="location_title" msgid="5819154746934945021">"Маё месцазнаходжанне"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Месца для рабочага профілю"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Доступ праграмы да геаданых"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Вызначэнне месцазнаходжання адключана"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> праграма з <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> мае доступ да даных месцазнаходжання</item>
@@ -1777,24 +1796,24 @@
       <item quantity="many"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> праграм з <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> маюць доступ да даных месцазнаходжання</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> праграмы з <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> маюць доступ да даных месцазнаходжання</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Доступ да апошняга вызначэння месцазнаходжання"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Паказаць падрабязныя звесткі"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"У апошні час праграмы не запытвалі інфармацыю пра месцазнаходжанне"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"У апошні час ніводная праграма не атрымлівала доступу да звестак пра месцазнаходжанне"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Выс. узровень выкарыст. акум."</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Нізкі ўзровень выкарыст. акум."</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Праверка Wi‑Fi і Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Пошук сетак Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Дазвольце праграмам і сэрвісам шукаць сеткі Wi‑Fi, нават калі Wi‑Fi не падключаны. Гэту функцыю можна выкарыстоўваць для паляпшэння працы геасэрвісаў."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Сканіраванне Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дазвольце праграмам і сэрвісам шукаць прылады паблізу, нават калі Bluetooth выключаны. Гэту функцыю можна выкарыстоўваць для паляпшэння працы геасэрвісаў."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Службы геалакацыі"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Службы геалакацыі для працы"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Вызначэнне часавага пояса месцазнаходжання"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Вызначэнне часавага пояса месцазнаходжання"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Дазваляе выкарыстоўваць для вызначэння бягучага часавага пояса звесткі пра месцазнаходжанне прылады. На дакладнасць вызначэння часавага пояса могуць уплываць іншыя налады месцазнаходжання, напрыклад пошук сетак Wi-Fi."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Уключана"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Выключана"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Аўтаматычнае вызначэнне часавага пояса выключана"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Аўтаматычнае вызначэнне часавага пояса выключана"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Вызначэнне часавага пояса месцазнаходжання выключана"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Вызначэнне часавага пояса месцазнаходжання не падтрымліваецца"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Не дазволена змяняць вызначэнне часавага пояса месцазнаходжання"</string>
@@ -1977,10 +1996,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Уключанае"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Ачысціць сховішча"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Выдаліць абнаўленні"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Вы выбралi запуск гэтага дадатку па змаўчаннi для некаторых дзеянняў."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Некаторыя выбраныя вамі дзеянні стандартна адкрываюцца ў гэтай праграме."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Вы дазволілі гэтаму дадатку ствараць віджэты і атрымліваць доступ да іх даных."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Стандартныя налады не зададзены"</string>
-    <string name="clear_activities" msgid="341345438786077236">"Скінуць налады па змаўчанні"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Ачысціць стандартныя налады"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Магчыма, гэта прыкладанне не разлічана для вашага экрана. Наладзьце яго."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Запытваць падчас запуску"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Шкала прыкладання"</string>
@@ -2192,7 +2211,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Вы можаце наладзіць гэту прыладу так, каб яна адпавядала вашым патрэбам. Гэтыя спецыяльныя функцыі можна змяніць у Наладах."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Змяніць памер шрыфту"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Праграмы чытання з экрана"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аўдыя і тэкст на экране"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Субцітры"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аўдыя"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Агульныя налады"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Дысплэй"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Тэкст і дысплэй"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Зацямніць экран"</string>
@@ -2347,7 +2368,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Чырвоны і зялёны"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Чырвоны і зялёны"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Сіні і жоўты"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Паменшыць яркасць"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Паменшыць яркасць"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Зрабіць экран тэлефона цямнейшым, чым пры мінімальным узроўні яркасці"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Зрабіць экран планшэта цямнейшым, чым пры мінімальным узроўні яркасці"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Зацямніце экран, каб было зручней чытаць.&lt;br/&gt;&lt;br/&gt; Гэта можа быць карысным у наступных выпадках: &lt;ol&gt; &lt;li&gt; узровень стандартнай мінімальнай яркасці на вашым тэлефоне даволі высокі;&lt;/li&gt; &lt;li&gt; вы выкарыстоўваеце тэлефон ва ўмовах цемнаты, напрыклад ноччу ці ў цёмным памяшканні перад адыходам да сну.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3422,8 +3443,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"твар"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"адбітак пальца, дадаць адбітак пальца"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"зацямненне экрана, сэнсарны экран, акумулятар, разумная яркасць, дынамічная яркасць, аўтаматычная яркасць"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"цёмны экран, рэжым сну, акумулятар, час чакання, увага, дысплэй, экран, бяздзейнасць"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"павярнуць, пераключыцца, паварот, кніжная, альбомная, арыентацыя, вертыкальная, гарызантальная"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"абнавіць, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"не турбаваць, расклад, апавяшчэнні, заблакіраваць, адключыць гук, вібрацыя, рэжым сну, актыўны рэжым, фокус, гук, без гуку, дзень, будні дзень, выхадныя дні, будні вечар, падзея"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"экран, час блакіроўкі, час чакання, экран блакіроўкі"</string>
@@ -3592,9 +3615,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Рынгтоны"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Іншыя гукі і вібрацыя"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Апавяшчэнні"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Размова"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Нядаўна адпраўленыя"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Прагледзець усё за апошнія 7 дзён"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Пашыраныя налады"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Агульныя налады"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Апавяшчэнні працоўнага профілю"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Адаптыўныя апавяшчэнні"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Прыярытэт адаптыўных апавяшчэнняў"</string>
@@ -3656,7 +3680,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Паказваць на апушчанай шторцы, панэлі стану і на экране блакіроўкі"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Хаваць апавяшчэнні без гуку на панэлі стану"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Мігценне святла"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Апавяшчэнні экрана блакіроўкі"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Прыватнасць"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Прапускаць экран блакіроўкі"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Пасля распазнавання твару вяртацца на папярэдні экран"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Экран блакіроўкі, экран блакіроўкі, прапусціць, абысці"</string>
@@ -3751,7 +3775,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> апавяшчэння ў тыдзень</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Ніколі"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Доступ да апавяшчэнняў"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Апавяшчэнні прылад і праграм"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Кіруйце паказам апавяшчэнняў у праграмах і на прыладах"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Доступ да апавяшчэнняў працоўнага профілю заблакіраваны"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Прыкладанні не могуць чытаць апавяшчэнні"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3772,17 +3797,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Адключыць"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Скасаваць"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Дазволеныя тыпы апавяшчэнняў"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Важныя ўваходныя апавяшчэнні"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Апавяшчэнні пра паведамленні"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Апавяшчэнні з абвесткамі"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Апавяшчэнні без гуку"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"У рэальным часе"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Апавяшчэнні праграм, навігатара, тэлефонных выклікаў і г. д."</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Размовы"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS і іншыя апавяшчэнні"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Стандартна"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Апавяшчэнні, для якіх у залежнасці ад налад выкарыстоўваецца званок або вібрацыя"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Бязгучны рэжым"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Апавяшчэнні, для якіх гук або вібрацыя ніколі не выкарыстоўваюцца"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Паказаць усе праграмы"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Змяніць налады апавяшчэнняў для кожнай праграмы, якая можа адпраўляць апавяшчэнні"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Праграмы, якія паказваюцца на прыладзе"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Дапаможныя VR-сэрвісы"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Усталяваныя праграмы не запытвалі выканання ў якасці службы-памочніка віртуальнай рэальнасці (VR)."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Дазволіць сэрвісу віртуальнай рэальнасці (VR) доступ да <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4082,9 +4107,36 @@
     <string name="launch_by_default" msgid="892824422067985734">"Адкрываць стандартна"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Адкрыццё спасылак"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Адкрыць спасылкі, якія падтрымліваюцца"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Спасылкі, якія падтрымліваюцца, адкрываюцца ў гэтай праграме"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Спасылкі, якія будуць адкрывацца ў гэтай праграме"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Адкрываць без запыту"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Спасылкі, якія падтрымліваюцца"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Іншыя налады па змаўчанні"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Іншыя стандартныя налады"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Дадаць спасылку"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Праграма можа спраўджваць спасылкі, якія будуць адкрывацца ў ёй аўтаматычна. "<annotation id="url">"Даведацца больш"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> спраўджаная спасылка</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> спраўджаныя спасылкі</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> спраўджаных спасылак</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> спраўджанай спасылкі</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Гэта спраўджаныя спасылкі, яны адкрываюцца ў праграме аўтаматычна.</item>
+      <item quantity="few">Гэта спраўджаныя спасылкі, яны адкрываюцца ў праграме аўтаматычна.</item>
+      <item quantity="many">Гэта спраўджаныя спасылкі, яны адкрываюцца ў праграме аўтаматычна.</item>
+      <item quantity="other">Гэта спраўджаныя спасылкі, яны адкрываюцца ў праграме аўтаматычна.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ОК"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Ідзе пошук іншых спасылак, якія падтрымліваюцца…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Скасаваць"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> спасылка, якая падтрымліваецца</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> спасылкі, якія падтрымліваюцца</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> спасылак, якія падтрымліваюцца</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> спасылкі, якія падтрымліваюцца</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Дадаць"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Адкрываецца ў праграме \"<xliff:g id="APP_LABEL">%s</xliff:g>\""</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"Выкарыстана <xliff:g id="SIZE">%1$s</xliff:g> ў <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"унутранае сховішча"</string>
     <string name="storage_type_external" msgid="125078274000280821">"знешняе сховішча"</string>
@@ -4399,7 +4451,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Выкарыстанне камеры забаронена"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Здымкі экрана забаронены"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Не ўдалося адкрыць праграму"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Калі ў вас ёсць пытанні, звярніцеся да IT-адміністратара"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Дадатковая інфармацыя"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"У вашага адміністратара ёсць магчымасць маніторынгу і адміністравання праграм і даных, звязаных з вашым працоўным профілем, у тым ліку налад, дазволаў, карпаратыўнага доступу, сеткавай актыўнасці і геаданых."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"У вашага адміністратара ёсць магчымасць маніторынгу і адміністравання праграм і даных, звязаных з гэтым карыстальнікам, у тым ліку налад, дазволаў, карпаратыўнага доступу, сеткавай актыўнасці і геаданых."</string>
@@ -4482,7 +4535,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> абмежавання</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Улік даных аператара можа адрознівацца ад уліку прылады"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Выключае трафік пра сеткі, якія належаць аператарам"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Выключае трафік праз сеткі, якія належаць аператарам"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> выкарыстана"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Укл. папярэджанне пра трафік"</string>
     <string name="data_warning" msgid="2925054658166062884">"Папярэджанне пра трафік"</string>
@@ -4845,7 +4898,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(выдалена для карыстальніка <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(адключана для карыстальніка <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Служба аўтазапаўнення"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"аўтаматычнае, запаўненне, аўтазапаўненне"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Паролі"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"аўта, запаўненне, аўтазапаўненне, пароль"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Упэўніцеся, што давяраеце гэтай праграме&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Аўтазапаўненне Google&gt;%1$s&lt;/xliff:g&gt; выкарыстоўвае тое, што знаходзіцца на вашым экране, каб вызначыць, што можна запоўніць аўтаматычна."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Аўтазапаўненне"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Узровень запісаў"</string>
@@ -5054,7 +5108,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Змяніць рэжым работы сеткі"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Прыярытэтны тып сеткі"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Аператар"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Версія налад"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Версія налад аператара"</string>
     <string name="call_category" msgid="641461844504128789">"Выклік"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Відэавыклікі праз аператара"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Выбар сістэмы"</string>
@@ -5103,6 +5157,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Выдаліце SIM-карту і ўстаўце яе зноў. Калі праблема застанецца, перазапусціце прыладу."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Паспрабуйце зноў уключыць SIM-карту. Калі праблема застанецца, перазапусціце прыладу."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Актывацыя сеткі"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Пераключаецца аператар"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Сетка \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\" актыўная"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Націсніце, каб абнавіць налады SIM-карты"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Пераключана на сетку \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\""</string>
@@ -5267,8 +5322,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Выключана"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"інтэрнэт"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-карты"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Паказваць сеткі ў рэжыме палёту"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Знаходзіць сеткі ў рэжыме палёту і падключацца да іх."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Знайсці сеткі Wi-Fi і падключыцца"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"самалёт, бяспека ў самалёце"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Выклікі і SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi-тэлефанія"</string>
@@ -5282,22 +5336,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"недаступны"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Часова недаступны"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Няма SIM-карты"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Параметры"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Параметры сеткі"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Падключацца да агульнадаступных сетак"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"падключэнне да сеткі, інтэрнэт, бесправадны, даныя, wifi, wi-fi, wi fi, сотавая сетка, мабільны, аператар сотавай сувязі, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Праглядзець сеткі рэжыма палёту"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Прагляд сетак у рэжыме палёту"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Уключыць сеткі"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Выключыць сеткі"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Скінуць налады інтэрнэту?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Гэта дзеянне завершыць ваш выклік"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Гэта дзеянне завершыць ваш выклік"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Налады інтэрнэту скідваюцца…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Выправіць праблему з падключэннем"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Сеткі даступныя ў рэжыме палёту"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Каб падключыцца да сетак, выключыце Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Пакуль падключана праз Ethernet, нельга пераключыць сетку"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Сеткі ў рэжыме палёту"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Падключана"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Аўтаматычнае падключэнне да інтэрнэту адсутнічае"</string>
@@ -5318,6 +5371,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Колер"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Іншае"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Агульныя налады"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Паказаць усе праграмы"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Функцыя разумнай пераадрасацыі"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Функцыя разумнай пераадрасацыі ўключана"</string>
@@ -5331,4 +5388,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Увядзіце нумар тэлефона"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Нумар тэлефона адсутнічае."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ОК"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Дазволіць 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Выкарыстоўваць сотавае падключэнне 2G. Для экстранных выклікаў сетка 2G заўсёды ўключана."</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0e0ab78..f322f67 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Намаляване на размера"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Увеличаване на размера"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Използване на автоматичното завъртане"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Автоматичното завъртане въз основа на лицето използва предната камера, за да види дали някой гледа в екрана и под какъв ъгъл. Функцията ви дава възможност да четете, докато лежите. Изображенията не се съхраняват, нито се изпращат до Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Научете повече&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Примерен текст"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Вълшебникът от Оз"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Глава 11: Удивителният изумруден град на Оз"</string>
@@ -403,15 +404,21 @@
       <item quantity="one">Настроен е <xliff:g id="COUNT_0">%1$d</xliff:g> отпечатък</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Отключване с отпечатък"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Настройване на отпечатъка ви"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Използване на отпечатъка ви"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Трябва само да докоснете сензора за отпечатъци, за да отключите телефона си, да оторизирате покупки или да влизате в приложения. Внимавайте чии отпечатъци добавяте – с всеки един от тях ще могат да се извършват изброените действия."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Отпечатъкът ви може да е по-малко сигурен в сравнение с надеждна фигура или ПИН код."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Контролът е във ваши ръце"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Имайте предвид следното"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Данните, записани от сензора за отпечатъци, се съхраняват надеждно и остават на телефона ви. Можете да ги изтриете по всяко време от настройките."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Отпечатъкът ви може да е по-малко сигурен в сравнение с надеждна фигура или ПИН код."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Телефонът ви периодично ще използва скорошните ви пръстови изображения, за да създава подобрени модели на отпечатъците."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Използвайте отпечатъка си, за да отключвате телефона си или да одобрявате покупки.\n\nЗабележка: Не можете да отключвате това устройство с отпечатъка си. За повече информация се свържете с администратора на организацията си."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Използвайте отпечатъка си, за да отключвате телефона си или да одобрявате покупки.\n\nЗабележка: Отпечатъкът ви може да е по-малко сигурен в сравнение с надеждна фигура или ПИН код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Отказ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Не, благодаря"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Пропускане"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Напред"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Приемам"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Пропускане"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Напред"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Да се пропусне ли отпечатъкът?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Пропускане"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Отказ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Докоснете сензора"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Докоснете и задръжте иконата на отпечатък"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Намира се на гърба на телефона ви. Използвайте показалеца си."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"На екрана е. Потърсете отпечатъка със сияещ кръг."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Сензорът за отпечатъци се намира на екрана ви. За да го откриете, преместете пръста си по дисплея."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Илюстрация с устройството и местоположението на сензора за отпечатък"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Име"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ОK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Изтриване"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Докоснете сензора"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Поставете пръста си върху сензора и го вдигнете, след като усетите вибриране"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Вдигнете пръст и докоснете отново"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Продължавайте да вдигате пръста си, за да добавите различните части от отпечатъка си"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Отпечатъкът е добавен"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Когато видите тази икона, използвайте отпечатъка си за идентификация или за одобряване на покупки"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"По-късно"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Вкл. – Екранът няма да се изключи, ако гледате в него"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Изключено"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Необходим е достъп до камерата"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Докоснете, за да управлявате разрешенията за услугите за персонализиране на устройството"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Предотвратява изключването на екрана ви, ако гледате в него"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Функцията „Внимание към екрана“ използва предната камера, за да види дали някой гледа в екрана. Тя работи на устройството и изображенията не се съхраняват, нито се изпращат до Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Вкл. на функцията „Внимание към екрана“"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Екранът се включва при нови известия, когато е изключен"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Часът и информ. да се показват"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"По-интензивно използване на батерията"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Удебелен текст"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Удебелен текст"</string>
     <string name="title_font_size" msgid="570613010306330622">"Размер на шрифта"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Уголемяване или намаляване на текст"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Заключване на SIM картата"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Други потребители"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Хранилище на устройството"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Преносимо хранилище"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Будилници и напомняния"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Разрешаване на задаване на будилници и напомняния"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Будилници и напомняния"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Разрешете на това приложение да задава будилници и да насрочва други събития, свързани с време. Това ще даде възможност на приложението да се активира и изпълнява дори когато не използвате устройството. Обърнете внимание, че отмяната на това разрешение може да възпрепятства работата на приложението (зададените от него будилници вече няма да работят)."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"насрочване, будилник, напомняне, събитие"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Използвали сте <xliff:g id="USED">%1$s</xliff:g> от <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Използвано от <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Услуги за местоположение"</string>
     <string name="location_title" msgid="5819154746934945021">"Моето местоположение"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Местоп. за служ. потр. профил"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Достъп на прилож. до местопол."</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Функцията за местоположението е изключена"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> от <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> приложения имат достъп до местоположението</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> от <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> приложения има достъп до местоположението</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Скорошен достъп до местоположението"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Преглед на подробностите"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Нито едно приложение не е заявило достъп до местоположението наскоро"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Наскоро приложенията не са осъществявали достъп до местоположението"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Висок разход на батерията"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Нисък разход на батерията"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Сканиране за Wi‑Fi и Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Сканиране за Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Разрешете на приложенията и услугите да сканират за Wi‑Fi мрежи по всяко време дори когато функцията за Wi‑Fi e изключена. Това може да послужи например за подобряване на базиращите се на местоположението функции и услуги."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Сканиране за устройства с Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Разрешете на приложенията и услугите да сканират за устройства в близост по всяко време дори когато функцията за Bluetooth e изключена. Това може да послужи например за подобряване на базиращите се на местоположението функции и услуги."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Услуги за местоположение"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Услуги за местоположение за служебни цели"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Установяване на часовата зона чрез местоположението"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Установяване на часовата зона чрез местоположение"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Разрешава местоположението на устройството да се използва за установяване на текущата часова зона. Други настройки за местоположението, като например сканирането за Wi-Fi, могат да повлияят на точността на установяването на часовата зона."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Включено"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Изключено"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Автоматичното установяване на часовата зона е деактивирано"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Автоматичната часова зона е изключена"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Установяването на часовата зона чрез местоположението е деактивирано"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Установяването на часовата зона чрез местоположението не се поддържа"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Не се разрешават промени в установяването на часовата зона чрез местоположението"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Активиране"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Изчистване на данните"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Деинсталиране на актуализации"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Избрахте да стартирате това приложение по подразбиране за някои действия."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Някои избрани от вас действия се отварят по подразбиране в това приложение."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Избрахте да разрешите на това приложение да създава приспособления и да осъществява достъп до данните им."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Не са зададени стандартни."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Изчистване"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Изчистване на предпочитанията по подразбиране"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Възможно е това приложение да не е създадено за екрана ви. Можете да контролирате оттук как то се настройва към него."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Да се пита при стартиране"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Приложението да се мащабира"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Можете да персонализирате устройството така, че да отговаря на нуждите ви. Тези функции за достъпност могат да бъдат променени по-късно от „Настройки“."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Промяна на размера на шрифта"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Екранни четци"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио и екранен текст"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Надписи"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аудио"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Общи"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Дисплей"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Текст и показване"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Затъмняване на екрана"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Червено-зелено"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Червено-зелено"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Синьо-жълто"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Намаляване на яркостта"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Намаляване на яркостта"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Направете екрана по-тъмен, отколкото с настройката за минимална яркост на телефона ви"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Направете екрана по-тъмен, отколкото с настройката за минимална яркост на таблета ви"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Затъмнете екрана си така, че да ви е по-удобно да четете.&lt;br/&gt;&lt;br/&gt; Това може да бъде полезно, когато: &lt;ol&gt; &lt;li&gt; екранът е твърде светъл при стандартната настройка за минимална яркост на телефона ви;&lt;/li&gt; &lt;li&gt; използвате телефона си на тъмно, като например през нощта или в тъмна стая преди лягане.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"лице"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"отпечатък, добавяне на отпечатък"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"затъмняване на екрана, сензорен екран, батерия, интелигентна яркост, динамична яркост, автоматична яркост"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"затъмняване на екрана, спящ режим, батерия, време за изчакване, внимание, дисплей, екран, неактивност"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"завъртане, обръщане, завъртане, вертикален режим, хоризонтален режим, ориентация, вертикално, хоризонтално"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"надстройване, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"режим „Не безпокойте“, график, известия, блокиране, тих режим, вибриране, спящ режим, работа, фокусиране, звук, заглушаване, спиране, ден, ден от седмицата, уикенд, делнична нощ, събитие"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"екран, време за заключване, време за изчакване, заключване на екрана"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Мелодии"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Други звуци и вибриране"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Известия"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Разговор"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Наскоро изпратили известия"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Преглед на всички от последните 7 дни"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Разширени"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Общи"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Служебни известия"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Адаптивни известия"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Приоритет на адаптивните известия"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Показване в падащия панел, в лентата на състоянието и на заключения екран"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Скриване на беззвучните известия в лентата на състоянието"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Премигваща светлина"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Известия на заключения екран"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Поверителност"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Пропускане на заключения екран"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"След отключване с лице отваряне на последния използван екран"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"заключен екран, пропускане, заобикаляне"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> известие на седмица</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Никога"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Достъп до известията"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Известия в приложенията и на устройствата"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Контролирайте кои известия да се показват в приложенията и на устройствата ви"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Достъпът до известията в служебния потребителски профил е блокиран"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Приложенията не могат да четат известията"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Изключване"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Отказ"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Разрешени типове известия"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Важни текущи известия"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Известия за разговори"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Известия за сигнализиране"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Беззвучни известия"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"В реално време"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Съобщения в реално време от използвани приложения, навигация, телефонни обаждания и др."</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Разговори"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS и други съобщения"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"По подразбиране"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Известия, при които телефонът звъни или вибрира в зависимост от настройките"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Беззвучни"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Известия, при които телефонът не издава звук и не вибрира"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Преглед на всички приложения"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Промяна на настройките за известия за всяко приложение, което може да изпраща известия"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Приложения, показвани на устройството"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Помощни услуги за VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Никое инсталирано приложение не е заявило да се изпълнява като помощна услуга за VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Искате ли <xliff:g id="SERVICE">%1$s</xliff:g> да има достъп като услуга за VR?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Отваряне по подразбиране"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Отваряне на връзки"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Отваряне на поддържани връзки"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Поддържаните връзки се отварят в това приложение"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Връзки, които да се отварят в това приложение"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Отваряне без запитване"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Поддържани връзки"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Други стандартни настройки"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Други предпочитания по подразбиране"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Добавяне на връзка"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Съответното приложение може да потвърждава връзките, така че да се отварят автоматично в него. "<annotation id="url">"Научете повече"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> потвърдени връзки</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> потвърдена връзка</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Тези връзки са потвърдени и автоматично се отварят в това приложение.</item>
+      <item quantity="one">Тази връзка е потвърдена и автоматично се отваря в това приложение.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Проверява се за други поддържани връзки…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Отказ"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> поддържани връзки</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> поддържана връзка</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Добавяне"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Отваря се в(ъв) <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"Използва/т се <xliff:g id="SIZE">%1$s</xliff:g> от <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"вътрешно хранилище"</string>
     <string name="storage_type_external" msgid="125078274000280821">"външно хранилище"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Използването на камерата не е разрешено"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Екранните снимки не са разрешени"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Това приложение не може да бъде отворено"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Ако имате въпроси, свържете се със системния си администратор"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Още подробности"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Администраторът ви може да наблюдава и управлява приложенията и данните, свързани със служебния ви потребителски профил, включително настройките, разрешенията, корпоративния достъп, мрежовата активност и информацията за местоположението на устройството."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Администраторът ви може да наблюдава и управлява приложенията и данните, свързани с този потребител, включително настройките, разрешенията, корпоративния достъп, мрежовата активност и информацията за местоположението на устройството."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="one">1 ограничение</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Отчетените от оператора данни може да се различават от показаните на устройството"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Изключва данните, които се използват от мрежите на операторите"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Изключва данните, които се използват от мрежите на операторите"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Използвали сте <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Задаване на предупр. за данните"</string>
     <string name="data_warning" msgid="2925054658166062884">"Предупреждение за данните"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(деинстал. за потребителя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(деактивирано за потребителя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Услуга за автоматично попълване"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"автомативно, попълване, автоматично попълване"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Пароли"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"автоматично, попълване, автоматично попълване, парола"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Уверете се, че имате доверие на това приложение&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Функцията на Google за автоматично попълване&gt;%1$s&lt;/xliff:g&gt; използва това, което е на екрана ви, за да определи какво може да се попълни автоматично."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Автоматично попълване"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Ниво на регистриране"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Промяна на операционния режим на мрежата"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Предпочитан тип мрежа"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Оператор"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Версия на настройките"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Версия на настройките за оператора"</string>
     <string name="call_category" msgid="641461844504128789">"Обаждания"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Видеообаждания от оператора"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Избор на система"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Премахнете SIM картата и я поставете отново. Ако проблемът не се отстрани, рестартирайте устройството си."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Включете отново SIM картата. Ако проблемът не се отстрани, рестартирайте устройството си."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Активиране на мрежа"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Превключване на оператора"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Услугата <xliff:g id="CARRIER_NAME">%1$s</xliff:g> е активна"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Докоснете, за да актуализирате настройките за SIM картата"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Превключихте към <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Изкл."</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM карти"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Показване на мрежите за самолетен режим"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Намиране и свързване с мрежи в самолетен режим."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Намиране на Wi‑Fi мрежи и свързване с тях"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"самолет, безопасно за използване по време на полет"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Обаждания и SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Обаждания през Wi‑Fi"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"не е налице"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Временно не е налице"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Няма SIM карта"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Предпочитания"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Предпочитания за мрежата"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Свързване с обществени мрежи"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"връзка с мрежата, интернет, безжична мрежа, данни, Wi-Fi, мобилни данни, мобилна мрежа, мобилен оператор, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Преглед на мрежите за самолетен режим"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Преглеждате мрежите за самолетен режим"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Включване на мрежите"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Изключване на мрежите"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Да се нулира ли мрежата ви за интернет?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Това ще прекрати телефонното ви обаждане"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Това ще прекрати телефонното ви обаждане"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Мрежата ви за интернет се нулира…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Отстраняване на проблеми с връзката"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Мрежите за самолетен режим са налице"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"За да превключите мрежите, прекъснете връзката с Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Не може да се превключи към друга мрежа, докато сте свързани"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Мрежи за самолетен режим"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Свързано"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Няма автоматично да се установи връзка с интернет"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Цвят"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Други"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Общи"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Вижте всички приложения"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Интелигентно препращане"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Функцията „Интелигентно препращане“ е активирана"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Въведете телефонен номер"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Липсва телефонен номер."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Разрешаване на 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Използване на 2G мобилни връзки. Опцията за 2G е винаги включена за спешните обаждания."</string>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 360737b..8dbab8c 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"স্ক্রিনের টেক্সট ছোট বা বড় করুন।"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"আরো ছোট করুন"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"আরো বড় করুন"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"অটো-রোটেট ব্যবহার করুন"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"স্যাম্পেল টেক্সট"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"দ্যা ওয়ান্ডারফুল উইজার্ড অফ অজ"</string>
@@ -405,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি আঙ্গুলের ছাপ সেট-আপ</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"আঙ্গুলের ছাপ দিয়ে আনলক করুন"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"\'ফিঙ্গারপ্রিন্ট\' সেট আপ করুন"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"আঙ্গুলের ছাপ ব্যবহার করুন"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"আপনার ফোন আনলক, কেনাকাটা অনুমোদন বা অ্যাপে সাইন-ইন করতে শুধু আঙ্গুলের ছাপ নেওয়ার সেন্সরে স্পর্শ করুন। কার আঙুলের ছাপ যোগ করছেন সেই ব্যাপারে সতর্ক থাকুন। এমনকি একটি আঙুলের ছাপ যোগ করলেও এই কাজগুলির সবকটি করা যাবে।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"একটি জটিল প্যাটার্ন বা পিনের তুলনায় আপনার আঙ্গুলের ছাপ কম নিরাপদ হতে পারে।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"নিয়ন্ত্রণ আপনার কাছেই আছে"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"মনে রাখবেন"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"\'ফিঙ্গারপ্রিন্ট\'-এর সহায়তার রেকর্ড করা ডেটা নিরাপদে সেভ করা থাকে এবং আপনার ফোন থেকে কখনও তা মুছে যায় না। \'সেটিংস\' থেকে যেকোনও সময় আপনার ডেটা মুছে ফেলতে পারেন।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"একটি জটিল প্যাটার্ন বা পিনের তুলনায় আপনার \'ফিঙ্গারপ্রিন্ট\' কম নিরাপদ হতে পারে।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"আরও ভাল \'ফিঙ্গারপ্রিন্ট\' মডেল তৈরি করার জন্য সম্প্রতি \'ফিঙ্গারপ্রিন্ট\'-এর সহায়তায় যেসব ছবি সেভ করা হয়েছে, আপনার ফোন সেই সব ছবি মাঝে মাঝে ব্যবহার করবে।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"আপনার ফোন আনলক বা কেনাকাটাগুলির অনুমোদন করতে আপনার আঙ্গুলের ছাপ ব্যবহার করুন। \n\nদ্রষ্টব্য: আপনি এই ডিভাইসটি আনলক করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারবেন না। আরও তথ্যের জন্য, আপনার প্রতিষ্ঠানের প্রশাসকের সাথে যোগাযোগ করুন।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"আপনার ফোন আনলক বা কেনাকাটাগুলি অনুমোদন করতে আপনার আঙ্গুলের ছাপ ব্যবহার করুন।\n\nদ্রষ্টব্য: একটি দৃঢ় বা সুরক্ষিত প্যাটার্ন বা পিনের তুলনায় আপনার আঙ্গুলের ছাপ কম সুরক্ষিত হতে পারে।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"বাতিল করুন"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"না থাক"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"এড়িয়ে যান"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"চালিয়ে যান"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"সম্মত"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"এড়িয়ে যান"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"পরবর্তী"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"আঙ্গুলের ছাপ এড়িয়ে যেতে চান?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"এড়িয়ে যান"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"বাতিল করুন"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"সেন্সর স্পর্শ করুন"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"\'ফিঙ্গারপ্রিন্ট\' আইকন টাচ করে ধরে থাকুন"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"এটি আপনার ফোনের পিছনে আছে। আপনার তর্জনী ব্যবহার করুন।"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"স্ক্রিনে দেখা যাচ্ছে। বৃত্তাকার উজ্জ্বল ফিঙ্গারপ্রিন্টের আইকন খুঁজুন"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"আপনার স্ক্রিনে \'ফিঙ্গারপ্রিন্ট\' সেন্সর আছে। সম্পূর্ণ স্ক্রিন জুড়ে আঙুল সরিয়ে এটি খুঁজুন।"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"ডিভাইস এবং আঙ্গুলের ছাপ সেন্সরের অবস্থানের সাথে চিত্রালংকরণ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"নাম"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ঠিক আছে"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"মুছুন"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"সেন্সর স্পর্শ করুন"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"সেন্সরে আপনার আঙ্গুল রাখুন এবং আপনি একটি কম্পন অনুভব করার পর সরিয়ে নিন"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"আঙ্গুল তুলুন, তারপর আবার স্পর্শ করুন"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"আপনার আঙ্গুলের ছাপের বিভিন্ন অংশ যোগ করার জন্য বারবার আঙুল তুলে আবার স্পর্শ করতে থাকুন"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"আঙ্গুলের ছাপ যোগ করা হয়েছে"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"আপনি যখন এই আইকনটি দেখতে পাবেন তখন নিজের পরিচয় নিশ্চিত করতে অথবা কেনাকাটা অনুমোদন করতে আঙ্গুলের ছাপ দিন"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"এটি পরে করুন"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"সার্চ"</string>
     <string name="display_settings" msgid="7197750639709493852">"ডিসপ্লে"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"অটো-রোটেট স্ক্রিন"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"বন্ধ আছে"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"চালু আছে"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"চালু আছে - মুখের হিসেবে"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"ফেস ডিটেকশন চালু করুন"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"রঙ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"স্বাভাবিক"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"বুস্ট করা"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"চালু আছে / আপনি এটির দিকে তাকিয়ে থাকলে স্ক্রিন বন্ধ হবে না"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"বন্ধ আছে"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"ক্যামেরা অ্যাক্সেস করার অনুমতি দিতে হবে"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"\'ডিভাইস ব্যক্তিগতকরণ পরিষেবা\' সংক্রান্ত অনুমতি ম্যানেজ করতে ট্যাপ করুন"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"আপনি এটির দিকে তাকিয়ে থাকলে ডিভাইসের স্ক্রিন বন্ধ হতে দেয় না"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"স্ক্রিন অ্যাটেনশন ফিচারটি মোবাইলের সামনের ক্যামেরা ব্যবহার করে জানতে পারে যে কেউ স্ক্রিনের দিকে তাকিয়ে আছে কিনা। এটি ডিভাইসে কাজ করে এবং ছবি কখনই স্টোর করা বা Google-কে পাঠানো হয় না।"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"\'স্ক্রিন অ্যাটেনশন\' চালু করুন"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"স্ক্রিন অন্ধকার থাকা অবস্থায় নতুন বিজ্ঞপ্তি এলে সেটি চালু হয়ে যায়"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"সবসময় সময় এবং তথ্য দেখান"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ব্যাটারির ব্যবহার বেড়ে যায়"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"বোল্ড টেক্সট"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"বোল্ড টেক্সট"</string>
     <string name="title_font_size" msgid="570613010306330622">"ফন্ট সাইজ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"টেক্সট বড় বা ছোট করুন"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"সিম কার্ড লক সেটিংস"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"অন্য ব্যবহারকারীরা"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ডিভাইসের স্টোরেজ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"পোর্টেবল স্টোরেজ"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"অ্যালার্ম এবং রিমাইন্ডার"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"অ্যালার্ম এবং রিমাইন্ডার সেট করতে অনুমতি দিন"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"অ্যালার্ম এবং রিমাইন্ডার"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"অ্যালার্ম শিডিউল করা বা অন্য সময় ভিত্তিক ইভেন্টের জন্য এই অ্যাপকে অনুমতি দিন। আপনি ডিভাইস ব্যবহার না করলেও এর ফলে অ্যাপ কাজ করা শুরু করে দেবে। মনে রাখবেন অনুমতি না দিলে অ্যাপ ঠিকভাবে কাজ নাও করতে পারে, বিশেষ করে অ্যাপে শিডিউল করা যেকোনও অ্যালার্ম নাও বাজতে পারে।"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"শিডিউল, অ্যালার্ম, রিমাইন্ডার, ইভেন্ট"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> এর মধ্যে <xliff:g id="USED">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"লোকেশন পরিষেবা"</string>
     <string name="location_title" msgid="5819154746934945021">"আমার লোকেশন"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"কাজের প্রোফাইলের জন্য লোকেশন"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"লোকেশনে অ্যাপের অ্যাক্সেস"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"লোকেশন বন্ধ করা আছে"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g>টি অ্যাপের মধ্যে <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>টি লোকেশন অ্যাক্সেস করতে পারবে</item>
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g>টি অ্যাপের মধ্যে <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>টি লোকেশন অ্যাক্সেস করতে পারবে</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"সম্প্রতি লোকেশন অ্যাক্সেসের অ্যাক্টিভিটি"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"বিবরণ দেখুন"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"সম্প্রতি কোনও অ্যাপ্লিকেশন লোকেশন অ্যাক্সেসের অনুরোধ করেনি"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"সম্প্রতি কোনও অ্যাপ লোকেশন অ্যাক্সেস করেনি"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"উচ্চ ব্যাটারির ব্যবহার"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"কম ব্যাটারির ব্যবহার"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"ওয়াই-ফাই এবং ব্লুটুথ স্ক্যানিং"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"ওয়াই-ফাই স্ক্যানিং"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"ব্লুটুথ বন্ধ থাকলেও অ্যাপ এবং পরিষেবাগুলিকে যেকোনও সময় ওয়াই-ফাই নেটওয়ার্ক স্ক্যান করার অনুমতি দিন। এটি বিভিন্ন ক্ষেত্রে কাজে লাগতে পারে, যেমন লোকেশন-ভিত্তিক বৈশিষ্ট্য এবং পরিষেবার উন্নতির জন্য।"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ব্লুটুথ স্ক্যানিং"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ব্লুটুথ বন্ধ থাকলেও অ্যাপ এবং পরিষেবাগুলিকে যেকোনও সময় আশেপাশে থাকা অন্যান্য ডিভাইস স্ক্যান করার অনুমতি দিন। এটি বিভিন্ন ক্ষেত্রে কাজে লাগতে পারে, যেমন লোকেশন-ভিত্তিক বৈশিষ্ট্য এবং পরিষেবার উন্নতির জন্য।"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"লোকেশন পরিষেবা"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"কাজের জন্য অবস্থান ভিত্তিক পরিষেবা"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"বর্তমান টাইম জোন শনাক্ত করার জন্য ডিভাইসের লোকেশন ব্যবহার করতে অনুমতি দেয়। অন্যান্য লোকেশন সেটিংস যেমন ওয়াই-ফাই স্ক্যানিং নির্ভুলভাবে টাইম জোন শনাক্ত করার ব্যাপারটি প্রভাবিত করতে পারে।"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"চালু আছে"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"বন্ধ আছে"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"টাইম জোন অটোমেটিক শনাক্ত করার বিকল্প বন্ধ করা আছে"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"অটোমেটিক টাইম জোন বন্ধ করা আছে"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প বন্ধ করা আছে"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প কাজ করছে না"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প পরিবর্তনের অনুমতি নেই"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"সক্ষম করুন"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"স্টোরেজ সাফ করুন"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"আপডেটগুলি আনইনস্টল করুন"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"কিছু ক্রিয়ার জন্য আপনি ডিফল্টরূপে এই অ্যাপ্লিকেশান লঞ্চ করা চয়ন করেছেন।"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"আপনার বেছে নেওয়া কিছু অ্যাক্টিভিটি এই অ্যাপে ডিফল্ট হিসেবে খুলবে।"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"আপনি এই অ্যাপ্লিকেশানটিকে উইজেটগুলিকে তৈরি করা এবং তাদের ডেটা অ্যাক্সেস করার মঞ্জুরি দেওয়া চয়ন করেছেন৷"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"কোনো ডিফল্ট সেট করা নেই৷"</string>
-    <string name="clear_activities" msgid="341345438786077236">"ডিফল্টগুলি সাফ করুন"</string>
+    <string name="clear_activities" msgid="488089228657585700">"ডিফল্ট পছন্দ মুছে ফেলুন"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"এই অ্যাপ্লিকেশানটি হয়ত আপনার স্ক্রীনের জন্য ডিজাইন করা হয়নি। আপনার স্ক্রীনে এটি কীভাবে সামঞ্জস্য করবে আপনি তা এখানে নিয়ন্ত্রণ করতে পারেন।"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"লঞ্চ করার সময় জিজ্ঞাসা করুন"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"স্কেল অ্যাপ্লিকেশন"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"আপনি এই ডিভাইসটি নিজের পছন্দমত সেট করতে পারেন৷ এই অ্যাক্সেসিবিলিটি বৈশিষ্ট্যগুলি পরে সেটিংসে গিয়ে পরিবর্তন করা যাবে৷"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"হরফের মাপ পরিবর্তন করুন"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"স্ক্রিন রিডার"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"অডিও এবং অন-স্ক্রিন পাঠ্য"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"ক্যাপশন"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"অডিও"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"সাধারণ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ডিসপ্লে"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"টেক্সট এবং ডিসপ্লে"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"স্ক্রিনের উজ্জ্বলতা কমান"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"লাল-সবুজ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"লাল-সবুজ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"নীল-হলুদ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"উজ্জ্বলতা কমান"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"উজ্জ্বলতা কমান"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"স্ক্রিনের উজ্জ্বলতা আপনার ফোনের নূন্যতম উজ্জ্বলতার চেয়েও কম করুন"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"স্ক্রিনের উজ্জ্বলতা আপনার ট্যাবলেটের নূন্যতম উজ্জ্বলতার চেয়েও কম করুন"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"স্ক্রিনের উজ্জ্বলতা কমিয়ে গাঢ় করুন যাতে সহজেই পড়া যায়।&lt;br/&gt;&lt;br/&gt; এটি নিচের কাজগুলি করার সময় সহায়ক হতে পারে যখন: &lt;ol&gt; &lt;li&gt; আপনার ফোনের ডিফল্ট নূন্যতম উজ্জলতাও প্রয়োজনের চেয়ে বেশি&lt;/li&gt; &lt;li&gt; আপনি অন্ধকারে ফোন ব্যবহার করছেন যেমন, রাতে বা ঘুমানোর আগে অন্ধকার ঘরে&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"ফেস"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"আঙ্গুলের ছাপ, আঙ্গুলের ছাপ যোগ করুন"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"অনুজ্জ্বল স্ক্রিন, টাচস্ক্রিন, ব্যাটারি, স্মার্ট উজ্জ্বলতা, ডায়নামিক উজ্জ্বলতা, অটোমেটিক উজ্জ্বলতা"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"ডিম স্ক্রিন, স্লিপ, ব্যাটারি, টাইম-আউট, অ্যাটেনশন, ডিসপ্লে, স্ক্রিন, ব্যবহার না করা"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"ঘোরান, উল্টান, ঘূর্ণন, পোর্ট্রেট, ল্যান্ডস্কেপ, সজ্জা, উল্লম্ব, অনুভূমিক"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"আপগ্রেড করুন, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"ডিএনডি, সময়সূচি, বিজ্ঞপ্তি, ব্লক করুন, নীরবতা, ভাইব্রেট, স্লিপ, অফিস, ফোকাস, সাউন্ড, মিউট, দিন, কাজের দিন, সপ্তাহান্ত, সপ্তাহের রাত্রি, ইভেন্ট"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"স্ক্রিন, লক টাইম, টাইম-আউট, লক স্ক্রিন"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"রিংটোনগুলি"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"অন্যান্য সাউন্ড এবং ভাইব্রেশন"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"বিজ্ঞপ্তি"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"কথোপকথন"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"সম্প্রতি পাঠানো হয়েছে"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"গত ৭ দিন থেকে সব দেখুন"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"উন্নত"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"সাধারণ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"কর্মস্থলের বিজ্ঞপ্তিগুলি"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"অ্যাডাপটিভ বিজ্ঞপ্তি"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"অ্যাডাপটিভ বিজ্ঞপ্তির অগ্রাধিকার"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"পুল-ডাউন শেড, স্ট্যাটাস বার ও লক স্ক্রিনে দেখানো হয়"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"স্ট্যাটাস বারে সাইলেন্ট বিজ্ঞপ্তি লুকান"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"মিটমিট করা আলো"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"লক স্ক্রিনে বিজ্ঞপ্তি"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"গোপনীয়তা"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"লক স্ক্রিন এড়িয়ে যাওয়া"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"মুখের সাহায্যে আনলক করে সরাসরি শেষবার ব্যবহৃত স্ক্রিনে যান"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"লক স্ক্রিন, লকস্ক্রিন, স্কিপ, বাইপাস"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="other">প্রতি সপ্তাহে ~<xliff:g id="NUMBER_1">%d</xliff:g>টি বিজ্ঞপ্তি</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"কখনও না"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"বিজ্ঞপ্তি অ্যাক্সেস"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"ডিভাইস এবং অ্যাপ বিজ্ঞপ্তি"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"আপনার অ্যাপ ও ডিভাইসে কোন ধরনের বিজ্ঞপ্তি দেখা যাবে তা নিয়ন্ত্রণ করুন"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"কর্মস্থলের প্রোফাইলের বিজ্ঞপ্তিতে অ্যাক্সেস ব্লক করা হয়েছে"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"অ্যাপ্লিকেশানগুলি বিজ্ঞপ্তি পড়তে পারে না"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"বন্ধ করুন"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"বাতিল করুন"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"যে ধরনের বিজ্ঞপ্তিতে অনুমতি দেওয়া হয়েছে"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"চালু থাকা গুরুত্বপূর্ণ বিজ্ঞপ্তি"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"কথোপকথনের বিজ্ঞপ্তি"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"সতর্কতামূলক বিজ্ঞপ্তি"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"নিঃশব্দ বিজ্ঞপ্তি"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"রিয়েল-টাইম"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"ব্যবহার করা অ্যাপের সহায়তায় নেভিগেশন, ফোন কল এবং আরও অনেক কিছু"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"কথোপকথন"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"এসএমএস এবং অন্যান্য কথোপকথন"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"ডিফল্ট"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"সেটিংস অনুযায়ী যেসব বিজ্ঞপ্তির জন্য রিং বা ভাইব্রেট হতে পারে"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"সাইলেন্ট"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"সাউন্ড বা ভাইব্রেশন ছাড়া বিজ্ঞপ্তি"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"সব অ্যাপ দেখুন"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"বিজ্ঞপ্তি পাঠাতে পারে এমন প্রত্যেকটি অ্যাপের বিজ্ঞপ্তির সেটিংস পরিবর্তন করুন"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"ডিভাইসে দেখা যাবে এমন অ্যাপ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"ভিআর(VR) সহায়তাকারী পরিষেবা"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"vr সহায়তাকারী পরিষেবা হিসেবে চলার জন্য কোনো অ্যাপ্লিকেশান ইনস্টল করা নেই৷"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> এর জন্য (ভিআর)VR পরিষেবার অ্যাক্সেসের অনুমতি দেবেন?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"ডিফল্ট দ্বারা খোলে"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"লিঙ্ক খোলা"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"সমর্থিত লিঙ্কগুলি খোলে"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"কাজ করে এমন লিঙ্ক যা এই অ্যাপে খুলবে"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"এই অ্যাপে খুলবে এমন লিঙ্ক"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"জিজ্ঞাসা না করেই খোলে"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"সমর্থিত লিঙ্কগুলি"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"অন্যান্য ডিফল্টগুলি"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"অন্যান্য ডিফল্ট পছন্দ"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"লিঙ্ক যোগ করুন"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"অ্যাপ লিঙ্কগুলি যাচাই করতে পারে যাতে সেগুলি যাচাইকরণের পরে অ্যাপের মধ্যে অটোমেটিক খুলে যায়। "<annotation id="url">"আরও জানুন"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one">যাচাই করা হয়েছে এমন <xliff:g id="COUNT_1">%d</xliff:g>টি লিঙ্ক</item>
+      <item quantity="other">যাচাই করা হয়েছে এমন <xliff:g id="COUNT_1">%d</xliff:g>টি লিঙ্ক</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">এই লিঙ্ক যাচাই করা হয়েছে এবং এটি অটোমেটিক এই অ্যাপে খুলবে।</item>
+      <item quantity="other">এই লিঙ্ক যাচাই করা হয়েছে এবং এটি অটোমেটিক এই অ্যাপে খুলবে।</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ঠিক আছে"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"কাজ করে এমন অন্যান্য লিঙ্ক চেক করা হচ্ছে…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"বাতিল করুন"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one">কাজ করে এমন <xliff:g id="COUNT_1">%d</xliff:g>টি লিঙ্ক</item>
+      <item quantity="other">কাজ করে এমন <xliff:g id="COUNT_1">%d</xliff:g>টি লিঙ্ক</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"যোগ করুন"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g>-এ খুলবে"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>-এ <xliff:g id="SIZE">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"ইন্টার্নাল স্টোরেজ"</string>
     <string name="storage_type_external" msgid="125078274000280821">"এক্সটার্নাল স্টোরেজ"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"ক্যামেরা ব্যবহারের অনুমতি নেই"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"স্ক্রিনশটের অনুমতি নেই"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"এই অ্যাপটি চালু করা যাবে না"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"আপনার যদি কোনও প্রশ্ন থাকে তাহলে আপনার আইটি অ্যাডমিনের সাথে যোগাযোগ করুন"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"আরো বিশদ বিবরণ"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"আপনার প্রশাসক আপনার কর্মস্থলের প্রোফাইলের সাথে সম্পর্কিত অ্যাপ এবং ডেটা নিরীক্ষণ ও পরিচালনা করতে পারেন, যাতে সামিল রয়েছে সেটিংস, অনুমতি, কর্পোরেট অ্যাক্সেস, নেটওয়ার্ক অ্যাক্টিভিটি এবং ডিভাইসের লোকেশন তথ্য।"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"আপনার প্রশাসক এই ব্যবহারকারীর সাথে সম্পর্কিত অ্যাপ এবং ডেটা নিরীক্ষণ ও পরিচালনা করতে পারেন, যাতে সামিল রয়েছে সেটিংস, অনুমতি, কর্পোরেট অ্যাক্সেস, নেটওয়ার্ক অ্যাক্টিভিটি এবং ডিভাইসের লোকেশন তথ্য।"</string>
@@ -4348,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g>টি সীমাবদ্ধতা</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"পরিষেবা প্রদানকারী ডেটার হিসাব, ডিভাইসের হিসাব থেকে ভিন্ন হতে পারে"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"পরিষেবা প্রদানকারী নেটওয়ার্ক যে ডেটা ব্যবহার করে তা অন্তর্ভুক্ত নয়"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"পরিষেবা প্রদানকারী নেটওয়ার্কের ব্যবহৃত ডেটা বাদ দিয়ে"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ডেটা সতর্কতা সেট করুন"</string>
     <string name="data_warning" msgid="2925054658166062884">"ডেটা সতর্কতা"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(ইউজার <xliff:g id="USER">%s</xliff:g> এর জন্য আনইনস্টল হয়েছে)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(ইউজার <xliff:g id="USER">%s</xliff:g> এর জন্য অক্ষম হয়েছে)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"আটোফিল পরিষেবা"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"স্বতঃ, পূরণ, স্বতঃপূরণ"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"পাসওয়ার্ড"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"অটো, ফিল, অটোফিল, পাসওয়ার্ড"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;নিশ্চিত করুন যে এই অ্যাপটি বিশ্বাসযোগ্য&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; কোনও তথ্য নিজে থেকে পূরণ করা যাবে কিনা, তা নির্ণয় করতে &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; অ্যাপটি আপনার স্ক্রিনে যা দেখা যাচ্ছে সেই অনুযায়ী সিদ্ধান্ত নেয়।"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"অটো-ফিল"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"লগ-ইন লেভেল"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"নেটওয়ার্ক অপারেটিং মোড পরিবর্তন করুন"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"পছন্দের নেটওয়ার্ক"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"পরিষেবা প্রদানকারী"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"সেটিংস ভার্সন"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"পরিষেবা প্রদানকারী সম্পর্কিত সেটিংসের ভার্সন"</string>
     <string name="call_category" msgid="641461844504128789">"কল করা হচ্ছে"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"পরিষেবা প্রদানকারীর ভিডিও কলিং"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"সিস্টেমের বেছে নেওয়া"</string>
@@ -4916,9 +4964,9 @@
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"সিম চালু করবেন?"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-এ পাল্টাতে চান?"</string>
     <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"সিম কার্ডে পাল্টাতে চান?"</string>
-    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"যেকোনও সময় শুধুমাত্র একটি সিম কাজ করবে।.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-এ পাল্টালে <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-এর পরিষেবা বাতিল হয়ে যাবে না।"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"যেকোনও সময় শুধুমাত্র একটি সিম কাজ করবে।\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-এ পাল্টালে <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-এর পরিষেবা বাতিল হয়ে যাবে না।"</string>
     <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"যেকোনও সময় শুধুমাত্র একটি ডাউনলোড করা সিম কাজ করবে।\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> পাল্টালে <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-এর পরিষেবা বাতিল হয়ে যাবে না।"</string>
-    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"যেকোনও সময় শুধুমাত্র একটি সিম কাজ করবে।.\n\nপাল্টালে <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-এর পরিষেবা বাতিল করা হবে না।"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"যেকোনও সময় শুধুমাত্র একটি সিম কাজ করবে।\n\nপাল্টালে <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-এর পরিষেবা বাতিল করা হবে না।"</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-এ পাল্টান"</string>
     <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"নেটওয়ার্কে কানেক্ট করা হচ্ছে…"</string>
     <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-এ পাল্টানো হচ্ছে"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"সিম কার্ডটি বের করে আবার ইনসার্ট করুন। এতেও সমস্যা ঠিক না হলে, ডিভাইস রিস্টার্ট করুন।"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"সিমটি আবার চালু করার চেষ্টা করুন। এতেও সমস্যা ঠিক না হলে, ডিভাইস রিস্টার্ট করুন।"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"নেটওয়ার্ক চালু করা"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"পরিষেবা প্রদানকারী পাল্টানো হচ্ছে"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> চালু আছে"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"সিম সেটিংস আপডেট করতে ট্যাপ করুন"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> নেটওয়ার্ক ব্যবহার করা শুরু করেছেন"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"বন্ধ আছে"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"ইন্টারনেট"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"সিম"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"বিমান মোডে উপলভ্য নেটওয়ার্ক দেখুন"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"বিমান মোডে উপলভ্য নেটওয়ার্ক খুঁজে কানেক্ট করুন।"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"ওয়াই-ফাই নেটওয়ার্ক খুঁজে তার সাথে কানেক্ট করুন"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"বিমান, বিমান-সুরক্ষা"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"কল ও এসএমএস"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"ওয়াই-ফাই কলিং"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"উপলভ্য নেই"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"সাময়িকভাবে উপলভ্য নেই"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"কোনও সিম নেই"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"অভিরুচি"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"নেটওয়ার্ক সংক্রান্ত পছন্দ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"সর্বজনীন নেটওয়ার্কে কানেক্ট করুন"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"নেটওয়ার্ক কানেকশন, ইন্টারনেট, ওয়্যারলেস, ডেটা, ওয়াই-ফাই, ওয়াই-ফাই, ওয়াই-ফাই, মোবাইল ডেটা, মোবাইল, মোবাইল পরিষেবা প্রদানকারী, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"বিমান মোড নেটওয়ার্ক দেখুন"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"বিমান মোড নেটওয়ার্ক দেখছেন"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"নেটওয়ার্ক চালু করুন"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"নেটওয়ার্ক বন্ধ করুন"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"ইন্টারনেট কানেকশন রিসেট করবেন?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"এর ফলে আপনার ফোন কলটি কেটে যাবে"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"এর ফলে আপনার ফোন কলটি কেটে যাবে"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"ইন্টারনেট কানেকশন রিসেট করা হচ্ছে…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"কানেক্টিভিটি সংক্রান্ত সমস্যার সমাধান"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"বিমান মোডে উপলভ্য নেটওয়ার্ক"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"নেটওয়ার্ক বদলাতে ইথারনেট ডিসকানেক্ট করুন"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"কানেক্ট থাকার সময় অন্য নেটওয়ার্কে পরিবর্তন করা যাবে না"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"বিমান মোড নেটওয়ার্ক"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"কানেক্ট করা আছে"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"ইন্টারনেট নিজে থেকে কানেক্ট হবে না"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"রঙ"</string>
     <string name="category_name_others" msgid="2366006298768550310">"অন্যান্য"</string>
     <string name="category_name_general" msgid="7737273712848115886">"সাধারণ"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"সমস্ত অ্যাপ দেখুন"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"স্মার্ট ফরওয়ার্ডিং"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"স্মার্ট ফরওয়ার্ডিং চালু আছে"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ফোন নম্বর লিখুন"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ফোন নম্বর নেই।"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ঠিক আছে"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G ব্যবহারের অনুমতি দিন"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G মোবাইল কানেকশন ব্যবহার করুন। জরুরি কলের জন্য, 2G সব সময় চালু থাকে।"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index a94e82b..30d0f5c 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -53,9 +53,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Smanjite ili povećajte tekst na ekranu."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Napravi manji"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Napravi veći"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Koristite automatsko rotiranje"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Uzorak teksta"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Čarobnjak iz Oza"</string>
@@ -409,15 +408,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> otisaka prstiju je postavljeno</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Otključavanje otiskom prsta"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Postavite otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Koristite otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Samo dodirnite senzor za otisak prsta da otključate telefon, odobrite kupovinu ili da se prijavite u aplikacije. Pazite čije otiske prsta dodajete. Samo jedan dodani otisak može izvršiti sve navedeno."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Otisak prsta može biti manje siguran od jakog uzorka ili PIN-a."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Vi imate kontrolu"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Napomena"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Podaci koje snimi Otisak prsta se sigurno pohranjuju i nikada ne napuštaju telefon. Podatke možete izbrisati bilo kada u Postavkama."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Otisak prsta može biti manje siguran od jakog uzorka ili PIN-a."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Telefon će povremeno koristiti nedavne slike otiska prsta da kreira poboljšane modele otiska prsta."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Pomoću otiska prsta otključavajte telefon ili odobravajte kupovinu.\n\nNapomena: otisak prsta ne možete koristiti za otključavanje ovog uređaja. Za više informacija, obratite se administratoru svoje organizacije"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Pomoću otiska prsta otključavajte telefon ili odobravajte kupovinu.\n\nNapomena: otisak prsta može biti manje siguran od jakog uzorka ili PIN-a."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, hvala"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Nastavi"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Prihvatam"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Naprijed"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Preskočiti otisak prsta?"</string>
@@ -434,16 +439,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Preskoči"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Otkaži"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Dodirnite senzor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Dodirnite i držite ikonu otiska prsta"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Nalazi se na poleđini telefona. Koristite kažiprst."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Nalazi se na ekranu. Potražite otisak prsta sa sjajnim krugom."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Senzor za otisak prsta se nalazi na ekranu. Pomjerajte prst po ekranu da ga pronađete."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustracija sa uređajem i lokacijom senzora za otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Naziv"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Uredu"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Izbriši"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Dodirnite senzor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Stavite prst na senzor i podignite ga kad osjetite vibraciju"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Podignite i ponovo dodirnite"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Nastavite podizati prst da dodate različite dijelove otiska prsta"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Dodan je otisak prsta"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Kada vidite ovu ikonu, koristite otisak prsta za identifikaciju ili odobravanje kupovine."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Uradit ću to kasnije"</string>
@@ -1196,14 +1210,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Pretraži"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ekran"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automatsko rotiranje ekrana"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Isključeno"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Uključeno"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Uključeno – na osnovu lica"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Omogućite prepoznavanje lica"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Boje"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Prirodne"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Pojačane"</string>
@@ -1248,7 +1258,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Uključeno / ekran se neće isključiti ako gledate u njega"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Isključeno"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Potreban je pristup kameri"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Dodirnite da upravljate odobrenjima za Usluge personalizacije uređaja"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Sprečava isključivanje ekrana ako gledate u njega"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Funkcija Svjesni ekran koristi prednju kameru da utvrdi gleda li neko u ekran. Funkcionira na uređaju, a slike se nikada ne arhiviraju niti šalju Googleu."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Uključite svjesni ekran"</string>
@@ -1329,7 +1342,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kada je ekran zatamnjen, uključuje se zbog novih obavještenja"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Uvijek prikaži vrijeme i info."</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Povećana potrošnja baterije"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Boldiranje teksta"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Boldiranje teksta"</string>
     <string name="title_font_size" msgid="570613010306330622">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Povećajte ili smanjite tekst"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Postavke zaključavanja SIM kartice"</string>
@@ -1499,6 +1512,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Drugi korisnici"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Uređaj za memoriju"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Prenosiva memorija"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmi i podsjetnici"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Dozvoli postavljanje alarma ili podsjetnika"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmi i podsjetnici"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Dozvolite ovoj aplikaciji da zakazuje alarme ili druge događaje zasnovane na vremenskom rasporedu. To će dozvoliti aplikaciji da se probudi i pokrene čak i kada ne koristite uređaj. Imajte na umu da ukidanje ovog odobrenja može uzrokovati neispravan rad aplikacije, odnosno nijedan alarm koji je aplikacija zakazala više neće funkcionirati."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"raspored, alarm, podsjetnik, događaj"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> se koristi od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>"<xliff:g id="UNIT">^2</xliff:g>"</small></small></string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Se koristi od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1748,31 +1766,32 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Usluge lokacije"</string>
     <string name="location_title" msgid="5819154746934945021">"Moja lokacija"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokacija za poslovni profil"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Pristup aplikacije lokaciji"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokacija je isključena"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> Pristup lokaciji ima sljedeći broj aplikacija: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> od <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
       <item quantity="few"> Pristup lokaciji ima sljedeći broj aplikacija: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> od <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
       <item quantity="other"> Pristup lokaciji ima sljedeći broj aplikacija: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> od <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Nedavni pristup lokaciji"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Prikaži detalje"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Nijedna aplikacija nije zahtijevala utvrđivanje lokacije u posljednje vrijeme"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nijedna aplikacija nije nedavno pristupila lokaciji"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Visoka potrošnja baterije"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Niska potrošnja baterije"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Skeniranje WiFi-ja i Bluetootha"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Skeniranje WiFi-ja"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Dozvolite aplikacijama i uslugama da skeniraju WiFi mreže u svakom trenutku, čak i kada je WiFi mreža isključena. Ovim se, naprimjer, mogu poboljšati funkcije i usluge zasnovane na lokaciji."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Skeniranje Bluetootha"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Dozvolite aplikacijama i uslugama da skeniraju uređaje u blizini u svakom trenutku, čak i kada je Bluetooth isključen. Ovim se, naprimjer, mogu poboljšati funkcije i usluge zasnovane na lokaciji."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Usluge lokacije"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usluge lokacije za posao"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Otkrivanje vremenske zone pomoću lokacije"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Otkrivanje vremenske zone pomoću lokacije"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Omogućava korištenje lokacije uređaja radi određivanja trenutne vremenske zone. Ostale postavke lokacije kao što je skeniranje WiFi mreže mogu uticati na preciznost otkrivanja vremenske zone."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Uključeno"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Isključeno"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatsko određivanje vremenske zone je onemogućeno"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatska vremenska zona je isključena"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Otkrivanje vremenske zone pomoću lokacije je onemogućeno"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Otkrivanje vremenske zone pomoću lokacije nije podržano"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Promjene otkrivanja vremenske zone pomoću lokacije nisu dozvoljene"</string>
@@ -1953,10 +1972,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Omogući"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Obriši pohranu"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Deinstaliraj ažuriranja"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Odabrali ste zadano pokretanje ove aplikacije za neke radnje."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Određene aktivnosti koje ste odabrali se otvaraju u ovoj aplikaciji prema zadanim postavkama."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Odabrali ste da ovoj aplikaciji dodijelite odobrenje za kreiranje vidžeta i pristup njihovim podacima."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Nisu postavljene zadane vrijednosti."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Obriši zadane vrijednosti"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Obriši zadane postavke"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Ova aplikacija možda nije dizajnirana za vaš ekran. Ovdje možete odrediti kako se ona prilagođava vašem ekranu."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Pitaj prilikom pokretanja"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Skaliraj aplikaciju"</string>
@@ -2168,7 +2187,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Ovaj uređaj možete prilagoditi svojim potrebama. Funkcije pristupačnosti se mogu kasnije promijeniti u Postavkama."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Promijenite veličinu fonta"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Čitači ekrana"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvuk i tekst na ekranu"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Titlovi"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Zvuk"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Opće"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Prikaz"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst i prikaz"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Zatamnjivanje ekrana"</string>
@@ -2322,7 +2343,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Plavo-žuto"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Smanjenje osvjetljenja"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Smanjenje osvjetljenja"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Potamnite ekran više od minimalne osvijetljenosti telefona"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Potamnite ekran više od minimalne osvijetljenosti tableta"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Potamnite ekran da vam čitanje bude ugodnije.&lt;br/&gt;&lt;br/&gt; To može biti korisno u slučajevima: &lt;ol&gt; &lt;li&gt; kada je zadana minimalna osvijetljenost telefona i dalje presvijetla&lt;/li&gt; &lt;li&gt; kada koristite telefon u tamnim okruženjima, naprimjer noću ili u tamnoj sobi prije spavanja&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3146,7 +3167,7 @@
     <string name="user_guest" msgid="4545590092001460388">"Gost"</string>
     <string name="user_exit_guest_title" msgid="2653103120908427236">"Uklonite gosta"</string>
     <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Ukloniti gosta?"</string>
-    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Sve aplikacije i podaci iz ove sesije će biti izbrisani."</string>
+    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Sve aplikacije i podaci iz ove sesije će se izbrisati."</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Ukloniti"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Uključi telefonske pozive"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Uključi telefonske pozive i SMS-ove"</string>
@@ -3378,8 +3399,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"lice"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"otisak prsta, dodati otisak prsta"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"zatamnjenje ekrana, ekran osjetljiv na dodir, baterija, pametna osvijetljenost, dinamička osvijetljenost, automatska osvijetljenost"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"zatamni ekran, stanje mirovanja, baterija, istek vremena, pažnja, prikaz, ekran, neaktivnost"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"rotirati, obrnuti, rotacija, uspravno, vodoravno, orijentacija, vertikalno, horizontalno"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"nadograditi, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, raspored, obavještenja, blokirati, tišina, vibriranje, stanje mirovanja, rad, fokusiranje, zvuk, isključenje zvuka, dan, radni dan, vikend, radni dan uvečer, događaj"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ekran, vrijeme zaključavanja, istek vremena, zaključani ekran"</string>
@@ -3548,9 +3571,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Melodije zvona"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Ostali zvukovi i vibracije"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Obavještenja"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Razgovor"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nedavno poslano"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Pogledajte sve tokom posljednjih 7 dana"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Napredno"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Opće"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Obavještenja za posao"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Prilagodljiva obavještenja"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prilagodljivi prioritet obavještenja"</string>
@@ -3612,7 +3636,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Prikaži na padajućoj traci, statusnoj traci i zaključanom ekranu"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Sakrij nečujna obavještenja na statusnoj traci"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Trepćuće svjetlo"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Obavještenja na zaklj. ekranu"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privatnost"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Preskoči zaključani ekran"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Nakon otključavanja licem idi na posljednji korišteni ekran"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"zaključaj ekran, zaljučavanje ekrana, preskoči, zaobilaženje"</string>
@@ -3704,7 +3728,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> obavještenja sedmično</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nikada"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Pristup obavještenjima"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Obavještenja uređaja i aplikacija"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Kontrolirajte koja obavještenja će se prikazivati u aplikacijama i na uređajima"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Pristup obavještenjima radnog profila je blokiran"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Aplikacije ne mogu čitati obavještenja"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3724,17 +3749,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Isključi"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Otkaži"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Dozvoljene vrste obavještenja"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Važna neprekidna obavještenja"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Obavještenja o razgovorima"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Zvučna obavještenja"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Nečujna obavještenja"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"U stvarnom vremenu"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Komunikacija u stvarnom vremenu iz aplikacija koje se koriste, navigacija, telefonski pozivi i drugo"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Razgovori"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS i ostala komunikacija"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Zadano"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Obavještenja koja mogu zvoniti ili vibrirati prema postavkama"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Nečujno"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Obavještenja koja se nikada ne oglašavaju zvukom ili vibracijom"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Pogledajte sve aplikacije"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Promijenite postavke obavještenja za svaku aplikaciju koja može slati obavještenja"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Aplikacije prikazane na uređaju"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Usluge pomagača za VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nijedna instalirana aplikacija nije zatražila da bude pokrenuta kao usluga pomagača za VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Želite li dozvoliti pristup VR-a za uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4028,9 +4053,33 @@
     <string name="launch_by_default" msgid="892824422067985734">"Zadano otvaranje"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Otvaranje linkova"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Otvori podržane linkove"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Podržani linkovi se otvaraju u ovoj aplikaciji"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Linkovi za otvaranje u ovoj aplikaciji"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Otvori bez pitanja"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Podržani linkovi"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Ostale zadane vrijednosti"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Ostale zadane postavke"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Dodajte link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Aplikacija može potvrditi linkove tako da se automatski otvaraju u aplikaciji. "<annotation id="url">"Saznajte više"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> potvrđeni link</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> potvrđena linka</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> potvrđenih linkova</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Ovi linkovi su potvrđeni i automatski se otvaraju u ovoj aplikaciji.</item>
+      <item quantity="few">Ovi linkovi su potvrđeni i automatski se otvaraju u ovoj aplikaciji.</item>
+      <item quantity="other">Ovi linkovi su potvrđeni i automatski se otvaraju u ovoj aplikaciji.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Uredu"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Provjeravanje drugih podržanih linkova…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Otkaži"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> podržani link</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> podržana linka</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> podržanih linkova</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Dodaj"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Otvara se u aplikaciji <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"Iskorišteno <xliff:g id="SIZE">%1$s</xliff:g> (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"unutrašnja pohrana"</string>
     <string name="storage_type_external" msgid="125078274000280821">"vanjska pohrana"</string>
@@ -4335,7 +4384,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Kamera nije dozvoljena"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Snimak ekrana nije dozvoljen"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Nije moguće otvoriti aplikaciju"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Ako imate pitanja, obratite se IT administratoru"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Više detalja"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Vaš administrator može pratiti i upravljati aplikacijama i podacima povezanim s vašim radnim profilom, uključujući postavke, odobrenja, korporativni pristup, aktivnost na mreži i informacije o lokaciji uređaja."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Vaš administrator može pratiti i upravljati aplikacijama i podacima koji su povezani s ovim korisnikom, uključujući postavke, odobrenja, korporativni pristup, aktivnost na mreži i informacije o lokaciji uređaja."</string>
@@ -4415,7 +4465,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ograničenja</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Obračun podataka koji vrši operater se može razlikovati od obračuna koji vrši uređaj."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ne obuhvata podatke koje koriste mreže mobilnog operatera"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Ne obuhvata podatke koje koriste mreže mobilnog operatera"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Iskorišteno je <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Postavi upozor. o prij. podat."</string>
     <string name="data_warning" msgid="2925054658166062884">"Upozorenje o prijenosu podataka"</string>
@@ -4765,7 +4815,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(deinstalirano za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Usluga automatskog popunjavanja"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automatski, popunjavanje, automatsko popunjavanje"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Lozinke"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automatski, popunjavanje, automatsko popunjavanje, lozinka"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Provjerite je li ova aplikacija pouzdana&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Automatsko popunjavanje&gt;%1$s&lt;/xliff:g&gt; koristi sadržaj na vašem ekranu da odredi šta se može automatski popuniti."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Automatsko popunjavanje"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Nivo zapisivanja"</string>
@@ -4953,18 +5004,18 @@
     <string name="mobile_network_list_add_more" msgid="4478586073355236604">"Dodaj još"</string>
     <string name="mobile_network_active_sim" msgid="6397581267971410039">"Aktivno/SIM"</string>
     <string name="mobile_network_inactive_sim" msgid="5829757490580409899">"Neaktivno/SIM"</string>
-    <string name="mobile_network_active_esim" msgid="4673190244386572318">"Aktivno/preuzet SIM"</string>
-    <string name="mobile_network_inactive_esim" msgid="2901035056727849007">"Neaktivno/preuzeti SIM-ovi"</string>
+    <string name="mobile_network_active_esim" msgid="4673190244386572318">"Aktivno/preuzeti SIM"</string>
+    <string name="mobile_network_inactive_esim" msgid="2901035056727849007">"Neaktivno/preuzeti SIM"</string>
     <string name="mobile_network_sim_name" msgid="3187192894150386537">"Naziv i boja SIM-a"</string>
     <string name="mobile_network_sim_name_label" msgid="1452440641628369625">"Naziv"</string>
     <string name="mobile_network_sim_color_label" msgid="5293944087609632340">"Boja (koriste kompatibilne aplikacije)"</string>
     <string name="mobile_network_sim_name_rename" msgid="5967588549571582924">"Sačuvaj"</string>
-    <string name="mobile_network_use_sim_on" msgid="7298332437547707908">"Koristite SIM"</string>
+    <string name="mobile_network_use_sim_on" msgid="7298332437547707908">"Koristi SIM"</string>
     <string name="mobile_network_use_sim_off" msgid="6303281166199670639">"Isključeno"</string>
     <string name="mobile_network_disable_sim_explanation" msgid="2851862257846773796">"Uklonite SIM karticu da onemogućite ovaj SIM"</string>
     <string name="mobile_network_tap_to_activate" msgid="4139979375717958102">"Dodirnite da aktivirate operatera <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="mobile_network_esim_swap_confirm_title" msgid="2762744961192218789">"Prebaciti na operatera <xliff:g id="CARRIER">%1$s</xliff:g>?"</string>
-    <string name="mobile_network_esim_swap_confirm_body" msgid="8168680839542031781">"Aktivan može biti samo po jedan SIM.\n\nPrebacivanjem na operatera <xliff:g id="CARRIER1">%1$s</xliff:g> neće se otkazati usluga operatera <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
+    <string name="mobile_network_esim_swap_confirm_body" msgid="8168680839542031781">"U datom trenutku može biti aktivan samo jedan preuzeti SIM.\n\nPrebacivanjem na mobilnog operatera <xliff:g id="CARRIER1">%1$s</xliff:g> neće se otkazati usluga mobilnog operatera <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="8695772737522378095">"Prebaci na operatera <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="mobile_network_erase_sim" msgid="4629071168032714930">"Izbriši SIM"</string>
     <string name="mobile_network_erase_sim_error_dialog_title" msgid="6680959559589234726">"Nije moguće izbrisati SIM"</string>
@@ -4973,7 +5024,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Promijenite način rada mreže"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferirana vrsta mreže"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operater"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Verzija postavki"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Verzija postavki mobilnog operatera"</string>
     <string name="call_category" msgid="641461844504128789">"Pozivanje"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operater video pozivanja"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Odabir sistema"</string>
@@ -4993,25 +5044,25 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nedostupno kada ste povezani s operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Pogledajte više"</string>
     <string name="see_less" msgid="2642392725363552793">"Prikaži manje"</string>
-    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Uključiti operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Uključiti mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Uključiti SIM?"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Prebaciti na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
     <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Prebaciti se na korištenje SIM kartice?"</string>
-    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"U jednom trenutku može biti aktivan samo jedan SIM.\n\nPrebacivanjem na mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> neće se otkazati usluga mobilnog operatera <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
-    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Aktivan može biti samo po jedan SIM.\n\nPrebacivanjem na mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> neće se otkazati usluga mobilnog operatera <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
-    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"U jednom trenutku može biti aktivan samo jedan SIM.\n\nPrebacivanjem se neće otkazati usluga mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"U datom trenutku može biti aktivan samo jedan SIM.\n\nPrebacivanjem na mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> neće se otkazati usluga mobilnog operatera <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"U datom trenutku može biti aktivan samo jedan preuzeti SIM.\n\nPrebacivanjem na mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> neće se otkazati usluga mobilnog operatera <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"U datom trenutku može biti aktivan samo jedan SIM.\n\nPrebacivanjem se neće otkazati usluga mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Prebaci na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Povezivanje s mrežom…"</string>
     <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Prebacivanje na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Nije moguće zamijeniti mobilne operatere"</string>
     <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Nije moguće zamijeniti mobilne operatere zbog greške."</string>
-    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Isključiti operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Isključiti mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
     <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Isključiti SIM?"</string>
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Isključivanje SIM-a<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
     <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Nije moguće onemogućiti mobilnog operatera"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Nešto nije uredu i nismo mogli onemogućiti vašeg operatera."</string>
     <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Koristiti 2 SIM-a?"</string>
-    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Na uređaju mogu istovremeno biti 2 aktivna SIM-a. Da nastavite koristiti po 1 SIM, dodirnite \"Ne, hvala\"."</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Na uređaju mogu istovremeno biti aktivna dva SIM-a. Da nastavite koristiti samo jedan SIM, dodirnite \"Ne, hvala\"."</string>
     <string name="sim_action_restart_title" msgid="7054617569121993825">"Ponovo pokrenuti uređaj?"</string>
     <string name="sim_action_restart_text" msgid="8019300474703571013">"Da započnete, ponovo pokrenite uređaj. Zatim možete dodati još jedan SIM."</string>
     <string name="sim_action_continue" msgid="1688813133152389943">"Nastavi"</string>
@@ -5022,6 +5073,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Izvadite SIM karticu i ponovo je umetnite. Ako se problem ne riješi, ponovo pokrenite uređaj."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Pokušajte ponovo uključiti SIM. Ako se problem ne riješi, ponovo pokrenite uređaj."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktiviranje mreže"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Promjena operatera"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Operater <xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktivan"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Dodirnite da ažurirate postavke SIM-a"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Prebacili ste se na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5184,8 +5236,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Isključeno"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-ovi"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Prikaži mreže za način rada u avionu"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Pronađite i povežite se s mrežama u načinu rada u avionu."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Pronađite WiFi mreže i povežite se s njima"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, sigurno za rad u avionu"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Pozivi i SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Pozivanje putem WiFi-ja"</string>
@@ -5199,22 +5250,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nedostupno"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Trenutno nije dostupno"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nema SIM-a"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Postavke"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Postavke mreže"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Povežite se s javnim mrežama"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"mrežna veza, internet, bežični, podaci, wifi, wi-fi, wi fi, celularni, mobilni, mobilni operater, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Prikaži mreže načina rada u avionu"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Prikaz mreža za način rada u avionu"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Uključite mreže"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Isključite mreže"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Vratiti internetsku vezu na zadano?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Ovim će se prekinuti vaš telefonski poziv"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Ovim će se prekinuti vaš telefonski poziv"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Vraćanje internetske veze na zadano…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Popravi povezivost"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Dostupne su mreže za način rada u avionu"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Da promijenite mrežu, isključite ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Nije moguće promijeniti mreže kada ste povezani"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mreže za način rada u avionu"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Nije se moguće automatski povezati s internetom"</string>
@@ -5235,6 +5285,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Boja"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Ostalo"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Općenito"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Pogledajte sve aplikacije"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Pametno prosljeđivanje"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Pametno prosljeđivanje je omogućeno"</string>
@@ -5248,4 +5302,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Unesite broj telefona"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Broj telefona nedostaje."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Uredu"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Dozvoli 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Koristite 2G mobilne veze. 2G mobilna veza je uvijek uključena za hitne pozive."</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index dc3b37c..2b9712b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Amplia o redueix la mida del text de la pantalla."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Redueix"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Amplia"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Gira automàticament"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Text de mostra"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"El meravellós mag d\'Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> empremta digital configurada</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Desbloqueig amb empremta"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Configura l\'empremta digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Utilitzar l\'empremta digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Només cal que toquis el sensor d\'empremtes digitals per desbloquejar el telèfon, autoritzar compres o iniciar la sessió en aplicacions. Ves amb compte amb les empremtes digitals que afegeixes. Aquestes accions les pot fer qualsevol empremta afegida."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"És possible que l\'empremta digital sigui menys segura que un bon patró o PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Ets tu qui té el control"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Nota important"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Les dades gravades per l\'empremta digital s\'emmagatzemen de manera segura i no surten mai del telèfon. Pots suprimir-les en qualsevol moment a Configuració."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"És possible que l\'empremta digital sigui menys segura que un bon patró o PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"De tant en tant, el telèfon utilitzarà les imatges recents de l\'empremta digital per crear models millorats d\'empremtes digitals."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utilitza l\'empremta digital per desbloquejar el telèfon o aprovar compres.\n\nNota: no pots fer servir l\'empremta digital per desbloquejar aquest dispositiu. Per obtenir més informació, contacta amb l\'administrador de la teva organització."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utilitza l\'empremta digital per desbloquejar el telèfon o aprovar compres.\n\nNota: és possible que l\'empremta digital sigui menys segura que un bon patró o PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancel·la"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, gràcies"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Omet"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continua"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Accepta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Omet"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Següent"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Ometre l\'empremta digital?"</string>
@@ -430,17 +435,26 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Omet"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Cancel·la"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Toca el sensor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Mantén premuda la icona d\'empremta digital"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"És a la part posterior del telèfon. Utilitza el dit índex."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"És a la pantalla. Busca l\'empremta digital amb un cercle brillant."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"El sensor d\'empremtes digitals es troba a la pantalla. Mou el dit per la pantalla per trobar-lo."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Il·lustració amb la ubicació del sensor d\'empremtes dactilars i de dispositiu"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nom"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"D\'acord"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Suprimeix"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Toca el sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Col·loca el dit al sensor i aixeca\'l quan notis una vibració"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Aixeca el dit i toca de nou"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Continua aixecant el dit per afegir les diferents parts de l\'empremta digital"</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Empremta digital afegida"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"S\'ha afegit l\'empremta digital"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Quan vegis aquesta icona, fes servir l\'empremta digital per identificar-te o aprovar compres."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Fes-ho més tard"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="352947044008973812">"Sortir de la configuració de l\'empremta?"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Cerca"</string>
     <string name="display_settings" msgid="7197750639709493852">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Gira pantalla automàticament"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desactivat"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Activat"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Activat: basat en cares"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Activa la detecció facial"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colors"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natural"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Millorat"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activat / La pantalla no s\'apagarà si estàs mirant-la"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Desactivat"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Cal accés a la càmera"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Toca per gestionar els permisos dels serveis de personalització del dispositiu"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Evita que la pantalla s\'apagui si l\'estàs mirant"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"La funció Atenció a la pantalla fa servir la càmera frontal per detectar si algú està mirant la pantalla. Funciona al dispositiu i les imatges mai no s\'emmagatzemen ni s\'envien a Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Activa l\'atenció a la pantalla"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Quan la pantalla està fosca, s\'activa per a notificacions noves"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Mostra sempre hora i detalls"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Augmenta l\'ús de la bateria"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Posa el text en negreta"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Posa el text en negreta"</string>
     <string name="title_font_size" msgid="570613010306330622">"Mida de la lletra"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Amplia o redueix el text"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Config. de bloqueig de SIM"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Altres usuaris"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Emmagatzematge del dispositiu"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Emmagatzematge portàtil"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmes i recordatoris"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Permet configurar alarmes o recordatoris"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmes i recordatoris"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Permet que aquesta aplicació programi alarmes o altres esdeveniments basats en el temps. Això permetrà que l\'aplicació s\'activi i s\'executi fins i tot quan no utilitzes el dispositiu. Si revoques aquest permís, pot ser que l\'aplicació no funcioni correctament; concretament, no sonarà cap alarma que hagi programat l\'aplicació."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"programació, alarma, recordatori, esdeveniment"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> utilitzats de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"En ús de: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Serveis d\'ubicació"</string>
     <string name="location_title" msgid="5819154746934945021">"La meva ubicació"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Ubicació per al perfil de treball"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Accés d\'aplicacions a la ubicació"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"La ubicació està desactivada"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplicacions tenen accés a la ubicació</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> aplicacions té accés a la ubicació</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Accés a la ubicació recent"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Mostra els detalls"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Cap aplicació no ha sol·licitat la ubicació recentment"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Cap aplicació no ha accedit recentment a la teva ubicació"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Consum de bateria elevat"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Poc consum de bateria"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Cerca de Wi‑Fi i Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Cerca de xarxes Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permet que les aplicacions i els serveis cerquin xarxes Wi-Fi en qualsevol moment, fins i tot quan la Wi-Fi estigui desactivada. Aquesta opció es pot utilitzar, per exemple, per millorar les funcions i els serveis basats en la ubicació."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Cerca de dispositius Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permet que les aplicacions i els serveis cerquin dispositius propers en qualsevol moment, fins i tot quan el Bluetooth estigui desactivat. Aquesta opció es pot utilitzar, per exemple, per millorar les funcions i els serveis basats en la ubicació."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Serveis d\'ubicació"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serveis d\'ubicació per a la feina"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detecció de la zona horària de la ubicació"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detecció de la zona horària de la ubicació"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permet utilitzar la ubicació del dispositiu per detectar la zona horària actual. Altres opcions de configuració de la ubicació, com ara la cerca de xarxes Wi‑Fi, poden afectar la precisió de la detecció de la zona horària."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Activada"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desactivada"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"La detecció automàtica de la zona horària està desactivada"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"La zona horària automàtica està desactivada"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"La detecció de la zona horària de la ubicació està desactivada"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"No s\'admet la detecció de la zona horària de la ubicació"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"No es permeten canvis en la detecció de la zona horària de la ubicació"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Activa"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Esborra emmagatzematge"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Desinstal·la les actualitzacions"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Has triat executar aquesta aplicació de manera predeterminada per dur a terme algunes accions."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Algunes activitats que has seleccionat s\'obren en aquesta aplicació de manera predeterminada."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Has seleccionat que vols permetre que aquesta aplicació creï widgets i que accedeixi a les seves dades."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"No s\'ha definit cap valor predeterminat."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Esborra els valors predeterminats"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Esborra les preferències predeterminades"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"És possible que aquesta aplicació no hagi estat dissenyada per a la teva pantalla; pots controlar com s\'ajusta a la pantalla aquí."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Pregunta-ho en iniciar"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Escala l\'aplicació"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Pots personalitzar el dispositiu perquè s\'adapti a les teves necessitats. Aquestes funcions d\'accessibilitat es poden canviar més endavant des de Configuració."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Canvia la mida de la lletra"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lectors de pantalla"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Àudio i text en pantalla"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtítols"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Àudio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Pantalla"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text i pantalla"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Enfosqueix la pantalla"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermell-verd"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermell-verd"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blau-groc"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reducció de la brillantor"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Reducció de la brillantor"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Enfosqueix la pantalla per sota de la brillantor mínima del telèfon"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Enfosqueix la pantalla per sota de la brillantor mínima de la tauleta"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Enfosqueix la pantalla per llegir més còmodament.&lt;br/&gt;&lt;br/&gt; Això pot ser útil quan: &lt;ol&gt; &lt;li&gt; La brillantor mínima predeterminada del telèfon encara és massa clara.&lt;/li&gt; &lt;li&gt; Utilitzes el telèfon en situacions de poca llum, com ara a la nit o en una habitació fosca abans d\'anar a dormir.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"cara"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"empremta digital, afegir empremta digital"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"pantalla atenuada, pantalla tàctil, bateria, brillantor intel·ligent, brillantor dinàmica, brillantor automàtica"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"pantalla atenuada, repòs, bateria, temps d\'espera, atenció, pantalla, inactivitat"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"gir, canvi, rotació, retrat, paisatge, orientació, vertical, horitzontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"actualitzar, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"no molestis, programar, notificacions, bloqueig, silenci, vibrar, mentre dormo, mentre treballo, concentració, so, silenciar, dia, dia laborable, dia entre setmana, cap de setmana, nit entre setmana, esdeveniment"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"pantalla, temps de bloqueig, temps d\'espera, pantalla de bloqueig"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Sons de trucada"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Vibracions i altres sons"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificacions"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversa"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Enviades fa poc"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Mostra-les totes des de fa 7 dies"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Configuració avançada"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificacions de la feina"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificacions adaptatives"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioritat de notificacions adaptativa"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Es mostra a l\'àrea desplegable, la barra d\'estat i la pantalla de bloqueig"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Amaga les notificacions silencioses a la barra d\'estat"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Llum intermitent"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notificacions a la pantalla de bloqueig"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privadesa"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Omet la pantalla de bloqueig"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Després del desbloqueig facial, ves a l\'última pantalla utilitzada"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"pantalla de bloqueig, bloqueig, ometre, saltar"</string>
@@ -3638,7 +3662,7 @@
     <string name="allow_interruption" msgid="5237201780159482716">"Permet interrupcions"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"Permet que l\'aplicació emeti un so, vibri o mostri notificacions emergents a la pantalla"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"Prioritat"</string>
-    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Es mostra com a bombolla flotant a la part superior de la secció de converses i mostra la foto de perfil a la pantalla de bloqueig"</string>
+    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Es mostra com a bombolla flotant a la part superior de la secció de converses i la foto de perfil apareix a la pantalla de bloqueig"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"<xliff:g id="APP_NAME">%1$s</xliff:g> no admet la majoria de funcions de converses. No pots definir una conversa com a prioritària, i les converses no es mostraran com a bombolles flotants."</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"A l\'àrea desplegable, replega les notificacions en una sola línia"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"Sense so ni vibració"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notificació a la setmana</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Mai"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Accés a les notificacions"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Notificacions d\'aplicacions i dispositius"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Controla quines notificacions es mostren als teus dispositius i aplicacions"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"S\'ha bloquejat l\'accés a les notificacions del perfil de treball"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Les aplicacions no poden llegir notificacions"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Desactiva"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Cancel·la"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Tipus de notificacions permeses"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Notificacions en curs importants"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Notificacions de conversa"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Notificacions d\'alerta"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Notificacions silenciades"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"En temps real"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Comunicació en temps real d\'aplicacions en ús, de navegació, de trucades i més"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Converses"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS i altres comunicacions"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Predeterminat"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Notificacions que poden fer sonar o vibrar el dispositiu en funció de la configuració"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Silencioses"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Notificacions que mai no fan sonar ni vibrar el dispositiu"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Mostra totes les aplicacions"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Canvia la configuració de notificacions per a cada aplicació que pot enviar-ne"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Aplicacions que es mostren al dispositiu"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Serveis d\'ajuda per a RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Cap aplicació instal·lada no ha sol·licitat que s\'executi com un servei d\'ajuda per a RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vols permetre que <xliff:g id="SERVICE">%1$s</xliff:g> accedeixi al servei RV?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Obre de manera determinada"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Obertura d\'enllaços"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Obrir els enllaços admesos"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Els enllaços admesos s\'obren en aquesta aplicació"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Enllaços que s\'obren en aquesta aplicació"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Obre sense demanar-ho"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Enllaços admesos"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Altres valors predeterminats"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Altres preferències predeterminades"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Afegeix un enllaç"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Una aplicació pot verificar els enllaços perquè s\'obrin automàticament a l\'aplicació. "<annotation id="url">"Més informació"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> enllaços verificats</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> enllaç verificat</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Aquests enllaços estan verificats i s\'obren automàticament en aquesta aplicació.</item>
+      <item quantity="one">Aquest enllaç està verificat i s\'obre automàticament en aquesta aplicació.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"D\'acord"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"S\'estan cercant altres enllaços admesos…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Cancel·la"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> enllaços admesos</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> enllaç admès</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Afegeix"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"S\'obre a <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> utilitzats a <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"emmagatzematge intern"</string>
     <string name="storage_type_external" msgid="125078274000280821">"emmagatzematge extern"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"No està permès utilitzar la càmera"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"No està permès fer captures de pantalla"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"No es pot obrir aquesta aplicació"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Si tens cap dubte, contacta amb l\'administrador de TI"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Més detalls"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"L\'administrador pot supervisar i gestionar les aplicacions i les dades associades al teu perfil de treball, com ara la configuració, els permisos, l\'accés corporatiu, l\'activitat de xarxa i la informació d\'ubicació del dispositiu."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"L\'administrador pot supervisar i gestionar les aplicacions i les dades associades a aquest usuari, com ara la configuració, els permisos, l\'accés corporatiu, l\'activitat de xarxa i la informació d\'ubicació del dispositiu."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 restricció</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"El recompte de dades de l\'operador de telefonia mòbil pot ser diferent del calculat pel dispositiu"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"No inclou les dades que s\'utilitzen en xarxes d\'operadors"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"No inclou les dades que utilitzen les xarxes d\'operadors"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Dades utilitzades: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Defineix advertiment de dades"</string>
     <string name="data_warning" msgid="2925054658166062884">"Advertiment de dades"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(desinstal·lat per a <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(desactivat per a <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Servei Emplenament automàtic"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automàtic, emplenament, emplenament automàtic"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Contrasenyes"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automàtic, emplenament, emplenament automàtic, contrasenya"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Assegura\'t que confies en aquesta aplicació&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Emplenament automàtic de Google&gt;%1$s&lt;/xliff:g&gt; utilitza el contingut que es mostra a la pantalla per determinar què es pot emplenar automàticament."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Emplenament automàtic"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Nivell de registre"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Canvia el mode de funcionament de la xarxa"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipus de xarxa preferent"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operador de telefonia mòbil"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versió de la configuració"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versió de la configuració de l\'operador"</string>
     <string name="call_category" msgid="641461844504128789">"Trucades"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videotrucades amb l\'operador de telefonia mòbil"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Selecció del sistema"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Treu la SIM i torna-la a inserir. Si el problema continua, reinicia el dispositiu."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prova de tornar a activar la SIM. Si el problema continua, reinicia el dispositiu."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activació de la xarxa"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Canvi d\'operador"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> està actiu"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toca per actualitzar la configuració de la targeta SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"S\'ha canviat a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desactivat"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Targetes SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Mostra les xarxes en mode d\'avió"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Troba xarxes en mode d\'avió i connecta-t\'hi."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Cerca xarxes Wi‑Fi i connecta-t\'hi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"mode d\'avió, segur per al mode d\'avió"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Trucades i SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Trucades per Wi‑Fi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"no disponible"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"No disponible temporalment"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No hi ha cap SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferències"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferències de xarxa"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connecta\'t a xarxes públiques"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connexió a la xarxa, internet, sense fil, dades, wifi, wi‑fi, wi fi, mòbils, mòbil, operador de telefonia mòbil, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Mostra les xarxes del mode d\'avió"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"S\'estan mostrant les xarxes en mode d\'avió"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Activa les xarxes"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Desactiva les xarxes"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Vols restablir la connexió a Internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Aquesta acció finalitzarà la trucada"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Aquesta acció finalitzarà la trucada"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"S\'està restablint la connexió a Internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Corregeix la connectivitat"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Hi ha xarxes en mode d\'avió disponibles"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Per canviar de xarxa, desconnecta la connexió Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"No es pot canviar de xarxa quan el dispositiu està connectat"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Xarxes en mode d\'avió"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connectat"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"No es connectarà automàticament a Internet"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Color"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Altres"</string>
     <string name="category_name_general" msgid="7737273712848115886">"General"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Mostra totes les aplicacions"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Desviació intel·ligent"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"S\'ha activat la desviació intel·ligent"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Introdueix un número de telèfon"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Falta el número de telèfon."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"D\'acord"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Permet 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Utilitza connexions mòbils 2G. Per a les trucades d\'emergència, el 2G sempre està activat."</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3335457..61ad218 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -54,9 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Umožňuje zvětšit nebo zmenšit text na obrazovce."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Zmenšit"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Zvětšit"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Používání automatického otáčení"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Ukázkový text"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Čaroděj ze země Oz"</string>
@@ -413,15 +412,21 @@
       <item quantity="one">Nastavení <xliff:g id="COUNT_0">%1$d</xliff:g> otisku prstu</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Odemknutí otiskem prstu"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Nastavení otisku prstu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Použití otisku prstu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Odemykejte telefon, autorizujte nákupy a přihlašujte se do aplikací pouhým klepnutím na snímač otisků prstů. Dobře zvažte, čí otisky do zařízení přidáte. Uvedené akce bude možné provádět pomocí každého z přidaných otisků."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Otisk prstu může být méně bezpečný než silné gesto nebo PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Vše máte ve svých rukou"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Upozornění"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Data zaznamenaná otiskem prstu se ukládají zabezpečeným způsobem a nikdy telefon neopouštějí. Data můžete kdykoli smazat v Nastavení."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Otisk prstu může být méně bezpečný než silné gesto nebo PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Telefon bude vaše poslední obrázky s otisky prstů příležitostně používat k vytváření vylepšených modelů otisků prstů."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Odemykejte telefon a schvalujte nákupy otiskem prstu.\n\nPoznámka: Otisk prstu nelze použít k odemykání tohoto zařízení. Další informace vám poskytne administrátor vaší organizace."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Odemykejte telefon a schvalujte nákupy otiskem prstu.\n\nPoznámka: Otisk prstu může být méně bezpečný než silné gesto nebo PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Zrušit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, díky"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Přeskočit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Pokračovat"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Souhlasím"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Přeskočit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Další"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Přeskočit zadání otisku prstu?"</string>
@@ -438,16 +443,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Přeskočit"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Zrušit"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Dotkněte se senzoru"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Dotkněte se a podržte ikonu otisku prstu"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Je na zadní straně telefonu. Použijte ukazováček."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Je na obrazovce. Hledejte otisk prstu v zářícím kruhu."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Snímač otisků prstů je na obrazovce. Najdete ho přejetím prstu po obrazovce."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustrace se zařízením a polohou senzoru otisků prstů"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Jméno"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Smazat"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Dotkněte se senzoru"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Položte prst na senzor. Zvedněte ho, až zařízení zavibruje."</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Zvedněte prst a dotkněte se znovu"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Opakovaně prst zvedněte, aby se zaznamenaly různé části otisku"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Otisk byl přidán"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Když je zobrazena tato ikona, můžete se identifikovat nebo schválit nákup otiskem prstu"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Později"</string>
@@ -1216,14 +1230,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Vyhledávání"</string>
     <string name="display_settings" msgid="7197750639709493852">"Displej"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automatické otočení obrazovky"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Vyp"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Zap"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Zap – podle obličeje"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Aktivování rozpoznání obličeje"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Barvy"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Přirozené"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Zesílené"</string>
@@ -1268,7 +1278,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Zapnuto / obrazovka se nevypne, když se na ni budete dívat"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Vypnuto"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Je třeba udělit přístup k fotoaparátu"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Klepnutím můžete spravovat oprávnění služeb personalizace zařízení"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Zabrání ve vypnutí obrazovky, když se na ni budete dívat"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Vnímavá obrazovka pomocí přední kamery sleduje, zda se někdo dívá na obrazovku. Data se zpracovávají v zařízení a snímky nejsou odesílány do Googlu."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Zapnutí vnímavé obrazovky"</string>
@@ -1349,7 +1362,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Když je obrazovka tmavá, při novém oznámení se zapne"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Vždy zobrazovat čas a informace"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Zvýšené využití baterie"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Tučný text"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Tučný text"</string>
     <string name="title_font_size" msgid="570613010306330622">"Velikost písma"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Umožňuje zvětšit nebo zmenšit text"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Nastavení zámku SIM"</string>
@@ -1520,6 +1533,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Další uživatelé"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Úložiště zařízení"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Přenosné úložiště"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Budíky a připomenutí"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Povolit nastavení budíků nebo připomenutí"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Budíky a připomenutí"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Umožní této aplikaci plánovat budíky nebo další události založené na načasování. Aplikace se bude moci probudit a spustit, i když zařízení nebudete používat. Upozorňujeme, že zrušení tohoto oprávnění může mít za následek nesprávné fungování aplikace, konkrétně už nebudou fungovat budíky, které jsou v aplikaci naplánovány."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"plán, budík, připomenutí, událost"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Použito <xliff:g id="USED">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Použito z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1769,7 +1787,8 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Služby určování polohy"</string>
     <string name="location_title" msgid="5819154746934945021">"Moje poloha"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Umístění pracovního profilu"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Přístup aplikace k poloze"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Je vypnuté určování polohy."</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="few"> Přístup k poloze mají <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> z <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplikací</item>
@@ -1777,24 +1796,24 @@
       <item quantity="other"> Přístup k poloze má <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> z <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplikací</item>
       <item quantity="one"> Přístup k poloze má <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> z <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> aplikací</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Nedávný přístup k poloze"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Zobrazit podrobnosti"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"V poslední době žádné aplikace o polohu nepožádaly."</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Polohu v poslední době nepoužily žádné aplikace"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Vysoké využívání baterie"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Nízké využívání baterie"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Vyhledávání sítí Wi-Fi a Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Vyhledávání Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Povolit aplikacím a službám vyhledávat sítě Wi‑Fi, i když je připojení k sítím Wi‑Fi vypnuté. Tuto funkci lze využít například ke zlepšení funkcí a služeb založených na poloze."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Vyhledávání Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Povolit aplikacím a službám vyhledávat zařízení v okolí kdykoliv, i když je rozhraní Bluetooth vypnuté. Tuto funkci lze využít například ke zlepšení funkcí a služeb založených na poloze."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Služby určování polohy"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Služby určování polohy pro práci"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Zjišťování časového pásma"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Zjišťování časového pásma"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Umožňuje na základě polohy zařízení zjistit aktuální časové pásmo. Přesnost zjišťování časového pásma mohou ovlivnit další nastavení polohy, např. vyhledávání Wi-Fi."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Zapnuto"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Vypnuto"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatická detekce časového pásma je vypnutá"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatické časové pásmo je vypnuté"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Zjišťování časového pásma je deaktivováno"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Zjišťování časového pásma není podporováno"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Změny zjišťování časového pásma nejsou povoleny"</string>
@@ -1977,10 +1996,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Aktivovat"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Vymazat úložiště"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Odinstalovat aktualizace"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Aplikace byla nastavena, aby se pro některé akce spouštěla jako výchozí."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Některé z aktivit, které jste vybrali, se otevírají v této aplikaci dle výchozího nastavení."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Této aplikaci jste povolili vytváření widgetů a přístup k jejich datům."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Není nastavena jako výchozí pro žádné akce"</string>
-    <string name="clear_activities" msgid="341345438786077236">"Vymazat výchozí nastavení"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Vymazat výchozí předvolby"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Tato aplikace nejspíš není určena pro vaši obrazovku. Zde můžete nastavit, jak se aplikace obrazovce přizpůsobí."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Dotázat se při spuštění"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Upravit velikost aplikace"</string>
@@ -2192,7 +2211,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Toto zařízení můžete přizpůsobit svým potřebám. Funkce přístupnosti lze později změnit v Nastavení."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Změňte velikost písma"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Čtečky obrazovky"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvuk a text na obrazovce"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Titulky"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Zvuk"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Obecné"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Zobrazení"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text a zobrazení"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ztmavit obrazovku"</string>
@@ -2347,7 +2368,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Červená a zelená"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Červená a zelená"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Modrá a žlutá"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Snížit jas"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Snížit jas"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Ztmavit obrazovku více, než je minimální nastavení jasu na telefonu"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Ztmavit obrazovku více, než je minimální nastavení jasu na tabletu"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Ztmavte si obrazovku, aby se vám lépe četla.&lt;br/&gt;&lt;br/&gt; Může to být užitečné v těchto případech: &lt;ol&gt; &lt;li&gt; Minimální nastavení jasu na telefonu je stále příliš vysoké.&lt;/li&gt; &lt;li&gt; Používáte telefon v tmavém prostředí, například v noci nebo v tmavém pokoji před spaním.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3422,8 +3443,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"obličej"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"otisk prstu, přidat otisk prstu"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"ztlumení obrazovky, dotyková obrazovka, baterie, chytrý jas, dynamický jas, automatický jas"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"ztlumení obrazovky, spánek, baterie, časový limit, pozornost, vnímavá, displej, obrazovka, neaktivita"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"otočení, překlopení, rotace, na výšku, na šířku, orientace, vertikální, horizontální"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"upgradovat, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"nerušit, plán, oznámení, blokovat, ticho, vibrace, spánek, práce, soustředění, zvuk, ztlumení, den, pracovní den, víkend, noc, událost"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"obrazovka, čas uzamknutí, vypršení, zámek obrazovky, interval vypnutí"</string>
@@ -3592,9 +3615,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Vyzvánění"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Další zvuky a vibrace"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Oznámení"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Konverzace"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nedávno odeslané"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Zobrazit vše za posledních 7 dní"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Rozšířená nastavení"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Obecné"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Pracovní oznámení"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptivní oznámení"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptivní priorita oznámení"</string>
@@ -3656,7 +3680,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Zobrazí se na vysouvacím panelu, stavovém řádku a obrazovce uzamčení"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Skrýt tichá oznámení na stavovém řádku"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blikání kontrolky"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Oznámení na obrazovce uzamčení"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Soukromí"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Přeskočit obrazovku uzamčení"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Po odemknutí obličejem přejít přímo na poslední obrazovku"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Obrazovka uzamčení, přeskočení, obejití"</string>
@@ -3728,7 +3752,7 @@
     <string name="allow_interruption" msgid="5237201780159482716">"Povolit vyrušení"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"Umožněte aplikacím vydávat zvuky, vibrovat nebo zobrazovat oznámení na obrazovce"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"Priorita"</string>
-    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Zobrazuje se v horní části sekce konverzací a má podobu plovoucí bubliny, zobrazuje profilovou fotku na obrazovce uzamčení"</string>
+    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Zobrazuje se v horní části sekce konverzací, má podobu plovoucí bubliny, zobrazuje profilovou fotku na obrazovce uzamčení"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> většinu funkcí konverzace nepodporuje. Konverzace nelze nastavit jako prioritní a nebudou se zobrazovat jako plovoucí bubliny."</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"V rozbalovacím panelu sbalit oznámení na jeden řádek"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"Žádný zvuk ani vibrace"</string>
@@ -3751,7 +3775,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> oznámení za týden</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nikdy"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Přístup k oznámením"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Zařízení a oznámení aplikací"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Určuje, která oznámení se zobrazují ve vašich aplikacích a zařízeních"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Přístup k oznámením pracovního profilu je zablokován"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Aplikace nesmí číst oznámení"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3772,17 +3797,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Vypnout"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Zrušit"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Povolené typy oznámení"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Důležitá trvalá oznámení"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Oznámení o konverzacích"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Oznámení s upozorněním"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Tichá oznámení"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"V reálném čase"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Komunikace z aplikací probíhající v reálném čase při používání, navigaci a telefonních hovorech a dalších činnostech"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Konverzace"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS a ostatní komunikace"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Výchozí"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"V závislosti na nastavení mohou oznámení zvonit nebo vibrovat"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Tichý"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Oznámení, která nikdy nevydávají zvuk ani nevibrují"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Zobrazit všechny aplikace"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Změňte nastavení oznámení u aplikací, které mohou zasílat oznámení"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Aplikace zobrazené na zařízení"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Pomocné služby VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Žádné nainstalované aplikace nepožádaly o spuštění jako pomocná služba VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Povolit přístup k VR službě pro <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4082,9 +4107,36 @@
     <string name="launch_by_default" msgid="892824422067985734">"Otevírat ve výchozím nastavení"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Otevírání odkazů"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Otevírání podporovaných odkazů"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Ověřené odkazy, které se otevřou v této aplikaci"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Odkazy, které se mají otevřít v této aplikaci"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Otevírat bez dotazu"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Podporované odkazy"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Další výchozí hodnoty"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Ostatní výchozí předvolby"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Přidat odkaz"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Aplikace může ověřovat odkazy, aby se automaticky otevíraly v aplikaci. "<annotation id="url">"Další informace"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> ověřené odkazy</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> ověřeného odkazu</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ověřených odkazů</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ověřený odkaz</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="few">Odkazy jsou ověřené a automaticky se otevřou v této aplikaci.</item>
+      <item quantity="many">Odkazy jsou ověřené a automaticky se otevřou v této aplikaci.</item>
+      <item quantity="other">Odkazy jsou ověřené a automaticky se otevřou v této aplikaci.</item>
+      <item quantity="one">Odkaz je ověřený a automaticky se otevře v této aplikaci.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Hledání ostatních podporovaných odkazů…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Zrušit"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> podporované odkazy</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> podporovaného odkazu</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> podporovaných odkazů</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> podporovaný odkaz</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Přidat"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Otevře se v aplikaci <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> – využito <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"interní úložiště"</string>
     <string name="storage_type_external" msgid="125078274000280821">"externí úložiště"</string>
@@ -4399,7 +4451,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Použití fotoaparátu není povoleno"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Uložení snímku obrazovky není povoleno"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Tuto aplikaci nelze otevřít"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Máte-li nějaké otázky, obraťte se na svého administrátora IT"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Další podrobnosti"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Administrátor může sledovat a spravovat aplikace a data přidružená k vašemu pracovnímu profilu, včetně nastavení, oprávnění, firemního přístupu, aktivity v síti a informací o poloze zařízení."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Administrátor může sledovat a spravovat aplikace a data přidružená k tomuto uživateli, včetně nastavení, oprávnění, firemního přístupu, aktivity v síti a informací o poloze zařízení."</string>
@@ -4482,7 +4535,7 @@
       <item quantity="one">1 omezení</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operátor může data počítat jinak než zařízení"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Vyloučí data využitá sítěmi operátora"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Vyloučí data využitá sítěmi operátora"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Využito <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Nastavit upozornění na data"</string>
     <string name="data_warning" msgid="2925054658166062884">"Upozornění na data"</string>
@@ -4559,9 +4612,9 @@
     <string name="notification_log_details_importance" msgid="8516198274667183446">"důležitost"</string>
     <string name="notification_log_details_explanation" msgid="6966274549873070059">"vysvětlení"</string>
     <string name="notification_log_details_badge" msgid="648647240928645446">"může zobrazovat odznak"</string>
-    <string name="notification_log_details_content_intent" msgid="2768423554375629089">"objekt Intent"</string>
-    <string name="notification_log_details_delete_intent" msgid="8296434571041573503">"smazání objektu Intent"</string>
-    <string name="notification_log_details_full_screen_intent" msgid="4151243693072002296">"objekt Intent pro celou obrazovku"</string>
+    <string name="notification_log_details_content_intent" msgid="2768423554375629089">"intent"</string>
+    <string name="notification_log_details_delete_intent" msgid="8296434571041573503">"smazání intentu"</string>
+    <string name="notification_log_details_full_screen_intent" msgid="4151243693072002296">"intent pro celou obrazovku"</string>
     <string name="notification_log_details_actions" msgid="2269605330470905236">"akce"</string>
     <string name="notification_log_details_title" msgid="8365761340979164197">"nadpis"</string>
     <string name="notification_log_details_remoteinput" msgid="264204203044885921">"vzdálené vstupy"</string>
@@ -4845,7 +4898,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(pro uživatele <xliff:g id="USER">%s</xliff:g> odinstalováno)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(pro uživatele <xliff:g id="USER">%s</xliff:g> nedostupné)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Služba automatického vyplňování"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automatické vyplňování, vyplňování"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Hesla"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automaticky, vyplnit, vyplnit automaticky, heslo"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Zkontrolujte, zda se jedná o důvěryhodnou aplikaci&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Automatické doplňování Google&gt;%1$s&lt;/xliff:g&gt; určuje na základě obsahu obrazovky, co lze automaticky vyplnit."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Automatické vyplňování"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Úroveň protokolování"</string>
@@ -5009,7 +5063,7 @@
     <string name="carrier_settings_title" msgid="6959295328730560529">"Nastavení operátora"</string>
     <string name="cdma_lte_data_service" msgid="6937443423651347345">"Nastavit datovou službu"</string>
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilní data"</string>
-    <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Přistupovat k datům přes mobilní síť"</string>
+    <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Používat datové připojení přes mobilní síť"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon se v dosahu automaticky přepne na tohoto operátora"</string>
     <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Není k dispozici žádná SIM karta"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Předvolby hovorů"</string>
@@ -5034,8 +5088,8 @@
     <string name="mobile_network_list_add_more" msgid="4478586073355236604">"Přidat další"</string>
     <string name="mobile_network_active_sim" msgid="6397581267971410039">"Aktivní / SIM karta"</string>
     <string name="mobile_network_inactive_sim" msgid="5829757490580409899">"Neaktivní / SIM karta"</string>
-    <string name="mobile_network_active_esim" msgid="4673190244386572318">"Aktivní / stažená SIM karta"</string>
-    <string name="mobile_network_inactive_esim" msgid="2901035056727849007">"Neaktivní / stažená SIM karta"</string>
+    <string name="mobile_network_active_esim" msgid="4673190244386572318">"Aktivní stažená SIM karta"</string>
+    <string name="mobile_network_inactive_esim" msgid="2901035056727849007">"Neaktivní stažená SIM karta"</string>
     <string name="mobile_network_sim_name" msgid="3187192894150386537">"Název a barva SIM karty"</string>
     <string name="mobile_network_sim_name_label" msgid="1452440641628369625">"Název"</string>
     <string name="mobile_network_sim_color_label" msgid="5293944087609632340">"Barva (používají kompatibilní aplikace)"</string>
@@ -5054,7 +5108,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Změnit provozní režim sítě"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferovaný typ sítě"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operátor"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Verze nastavení"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Verze nastavení operátora"</string>
     <string name="call_category" msgid="641461844504128789">"Volání"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videohovory přes operátora"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Výběr systému"</string>
@@ -5103,6 +5157,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Vyjměte SIM kartu a znovu ji vložte. Pokud problém přetrvává, restartujte zařízení."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Zkuste SIM kartu znovu zapnout. Pokud problém přetrvává, restartujte zařízení."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivace sítě"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Přepnutí operátora"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Číslo <xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktivní"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Klepnutím aktualizujete nastavení SIM karty"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Přepnuto na operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5267,8 +5322,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Vypnuto"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM karty"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Zobrazit sítě dostupné v režimu Letadlo"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Najděte sítě dostupné v režimu Letadlo a připojte se k nim."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Vyhledání a připojení sítí Wi‑Fi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"letadlo, bezpečné v letadle"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Volání a SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Volání přes Wi‑Fi"</string>
@@ -5282,22 +5336,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"není k dispozici"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Dočasně nedostupné"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Žádná SIM karta"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Předvolby"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Možnosti sítě"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Připojovat k veřejným sítím"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"připojení k síti, internet, bezdrátové, data, wifi, wi-fi, wi fi, mobilní síť, mobilní operátor, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Zobrazit sítě v režimu Letadlo"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Zobrazují se sítě dostupné v režimu Letadlo"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Zapnout sítě"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Vypnout sítě"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Resetovat internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Telefonní hovor bude ukončen"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Telefonní hovor bude ukončen"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Resetování internetu…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Opravit připojení"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Sítě dostupné v režimu Letadlo"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Pokud chcete přepnout sítě, odpojte ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Při připojení nelze změnit síť"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Sítě v režimu Letadlo"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Připojeno"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet se nebude automaticky připojovat"</string>
@@ -5318,6 +5371,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Barva"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Jiné"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Obecné"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Zobrazit všechny aplikace"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Chytré přesměrování"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Chytré přesměrování je aktivováno"</string>
@@ -5331,4 +5388,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Zadejte telefonní číslo"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Chybí telefonní číslo."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Povolit 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Použít datové připojení 2G. Pro tísňová volání je 2G vždy zapnuto."</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 01c026e..576df81 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Gør teksten på skærmen mindre eller større."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Formindsk"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Forstør"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Brug automatisk rotation"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Eksempeltekst"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Den vidunderlige troldmand fra Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingeraftryk er oprettet</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Lås op med fingeraftryk"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Konfigurer dit fingeraftryk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Brug dit fingeraftryk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Du sætter blot fingeren på fingeraftrykslæseren for at låse telefonen op, godkende køb eller logge ind i apps. Vær forsigtig med, hvem du tilføjer fingeraftryk for. Alle, hvis fingeraftryk du tilføjer, kan foretage disse handlinger."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Dit fingeraftryk kan være mindre sikkert end et stærkt mønster eller en pinkode."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Du bestemmer"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Husk!"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"De data, der registreres ved afgivelse af fingeraftryk, gemmes sikkert på din telefon og forlader aldrig telefonen. Du kan til enhver tid slette dine data i indstillingerne."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Dit fingeraftryk kan være mindre sikkert end et stærkt mønster eller en pinkode."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Din telefon vil af og til bruge dine seneste fingeraftryksbilleder til at forbedre fingeraftryksmodeller."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Lås din telefon op eller godkend køb ved hjælp af dit fingeraftryk.\n\nBemærk! Du kan ikke bruge dit fingeraftryk til at låse op for denne enhed. Få flere oplysninger ved at kontakte administratoren for din organisation."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Lås din telefon op eller godkend køb ved hjælp af dit fingeraftryk.\n\nBemærk! Dit fingeraftryk kan være mindre sikkert end et stærkt mønster eller en pinkode."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Annuller"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nej tak"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Spring over"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Fortsæt"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Acceptér"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Spring over"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Næste"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Spring fingeraftryk over?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Spring over"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Annuller"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Tryk på sensoren"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Hold fingeraftryksikonet nede"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Den sidder på bagsiden af telefonen. Brug pegefingeren."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Det er på skærmen. Kig efter fingeraftrykket med en lysende cirkel."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Du finder fingeraftrykslæseren på din skærm. Træk din finger over skærmen for at finde den."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustration med enhed og placering af fingeraftrykslæser"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Navn"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Slet"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Tryk på sensoren"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Placer fingeren på sensoren, og løft, når du mærker en vibration"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Løft, og tryk igen"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Bliv ved med at løfte fingeren for at få hele fingeraftrykket med"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingeraftryk tilføjet"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Når du ser dette ikon, kan du bruge dit fingeraftryk til identifikation eller til at godkende køb"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Gør det senere"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Søg"</string>
     <string name="display_settings" msgid="7197750639709493852">"Skærm"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Roter skærm automatisk"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Fra"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Til"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Til – ansigtsbaseret"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Aktivér ansigtsgenkendelse"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Farver"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturlig"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Forstærket"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Til – Skærmen slukker ikke, når du kigger på den"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Fra"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Adgang til kameraet kræves"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Tryk for at administrere tilladelser for Personlig tilpasning på enheden"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Holder din skærm tændt, så længe du kigger på den"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Den opmærksomme skærm bruger frontkameraet til at tjekke, om der er nogen, der kigger på skærmen. Funktionen fungerer kun lokalt på enheden, og den gemmer ikke billeder eller sender billeder til Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Aktivér opmærksom skærm"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Når skærmen er mørk, aktiveres den ved modtagelse af nye notifikationer"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Vis altid tidspunkt og info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Øget batteriforbrug"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Brug fed tekst"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Fed tekst"</string>
     <string name="title_font_size" msgid="570613010306330622">"Skriftstørrelse"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Gør teksten større eller mindre"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Indstillinger for låst SIM-kort"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Andre brugere"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Lagerplads på enheden"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Ekstern lagerplads"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmer og påmindelser"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Tillad indstilling af alarmer og påmindelser"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmer og påmindelser"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Giv denne app tilladelse til at planlægge alarmer og andre timerrelaterede begivenheder. Dette giver tilladelse til, at appen aktiveres og køres, også selvom du ikke bruger enheden. Bemærk, at tilbagekaldelse af denne tilladelse kan medføre, at appen ikke fungerer korrekt, herunder at alarmer, som appen har planlagt, ikke længere virker."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"planlæg, alarm, påmindelse, begivenhed"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Der er anvendt <xliff:g id="USED">%1$s</xliff:g> ud af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Anvendt lagerplads ud af <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Placeringstjenester"</string>
     <string name="location_title" msgid="5819154746934945021">"Min placering"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Placering for arbejdsprofil"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Appadgang til placering"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Placering er slået fra"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ud af <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> app har adgang til din placering</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ud af <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps har adgang til din placering</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Adgang til seneste placering"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Se info"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Ingen apps har anmodet om placering for nylig"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ingen apps har haft adgang til placeringen for nylig"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Højt batteriforbrug"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Lavt batteriforbrug"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi-Fi- og Bluetooth-scanning"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi-scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Tillad, at apps og tjenester altid kan søge efter Wi-Fi-netværk, også selvom Wi-Fi er deaktiveret. Dette kan f.eks. bruges til at forbedre placeringsbaserede funktioner og tjenester."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Tillad, at apps og tjenester altid kan søge efter enheder i nærheden, også selvom Bluetooth er deaktiveret. Dette kan f.eks. bruges til at forbedre placeringsbaserede funktioner og tjenester."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Placeringstjenester"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Placeringstjenester til arbejdet"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Registrering af tidszone ved hjælp af placering"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Registrering af tidszone ved hjælp af placering"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Tillad, at enhedens placering bruges til at registrere den aktuelle tidszone. Andre placeringsindstillinger, f.eks. Wi-Fi-scanning, kan påvirke nøjagtigheden af tidszoneregistrering."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Aktiveret"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Deaktiveret"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatisk registrering af tidszone er deaktiveret"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatisk tidszone er deaktiveret"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Registrering af tidszone ved hjælp af placering er deaktiveret"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Registrering af tidszone ved hjælp af placering understøttes ikke"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Ændringer i forbindelse med registrering af tidszone ved hjælp af placering er ikke tilladt"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Aktivér"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Ryd lagerplads"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Afinstaller opdateringer"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Du har valgt at benytte denne app som standard for nogle handlinger."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Nogle af de aktiviteter, du har valgt, åbnes som standard i denne app."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Du har valgt at tillade, at denne app opretter widgets og får adgang til deres data."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Der er ikke angivet nogen standarder."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Ryd standarder"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Rydd standardpræferencer"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Denne app er muligvis ikke beregnet til din skærm. Her kan du administrere, hvordan den skal tilpasses til din skærm."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Spørg, når der startes"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Skaler app"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"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="4689275412658803919">"Skift skriftstørrelse"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Skærmlæsere"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Lyd og tekst på skærmen"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Undertekster"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Lyd"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Generelt"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Visning"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst og visning"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Gør skærmen mørkere"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rød-grøn"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rød-grøn"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blå-gul"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reducer lysstyrken"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Reducer lysstyrken"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Gør skærmen mørkere end den laveste indstilling for lysstyrke på din telefon"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Gør skærmen mørkere end den laveste indstilling for lysstyrke på din tablet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Gør din skærm mørkere, så du får en mere behagelig læseoplevelse.&lt;br/&gt;&lt;br/&gt; Dette kan være nyttigt, når: &lt;ol&gt; &lt;li&gt; Der er skruet helt ned for lysstyrken på din telefon, men det stadig ikke er mørkt nok&lt;/li&gt; &lt;li&gt; Du bruger din telefon i mørke omgivelser, f.eks. om aftenen eller i et mørkt rum før sengetid&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"ansigt"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"fingeraftryk, tilføj fingeraftryk"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"dæmp skærmlys, touchskærm, batteri, intelligent lysstyrke, dynamisk klarhed, automatisk lysstyrke"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"dæmp skærm, dvale, batteri, timeout, opmærksom skærm, visning, skærm, inaktivitet,"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"rotere, vende, rotation, stående, liggende, retning, lodret, vandret"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"opgradere, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"forstyr ikke, planlægge, notifikationer, blokere, lydløs, vibrere, sove, arbejde, fokusere, lyd, slå lyden fra, dag, hverdag, weekend, hverdagsaften, begivenhed"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"skærm, låsetid, timeout, låseskærm"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringetoner"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Andre lyde og vibrationer"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifikationer"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Samtale"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Sendt for nylig"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Se alle fra de seneste syv dage"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avanceret"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Generelt"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Arbejdsunderretninger"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Automatiske notifikationer"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Automatisk prioritetsniveau for notifikationer"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Vises i panelet, der trækkes ned, på statusbjælken og på låseskærmen."</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Skjul lydløse notifikationer på statusbjælken"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blinkende lys"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifikationer på låseskærm"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privatliv"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Spring låseskærmen over"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Gå til den seneste skærm efter oplåsning med ansigtslås"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Låseskærm, lås skærm, spring over, tilsidesæt"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notifikationer om ugen</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Aldrig"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Adgang til notifikationer"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Enheds- og appnotifikationer"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Styr, hvilke notifikationer der skal vises i dine apps og på dine enheder"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Adgangen til notifikationer fra arbejdsprofilen er blokeret"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Apps kan ikke læse notifikationer"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Slå fra"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Annuller"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Tilladte notifikationstyper"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Vigtige konstante notifikationer"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Samtalenotifikationer"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Notifikationer med vibration eller lyd"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Lydløse notifikationer"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Realtid"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Kommunikation i realtid fra åbne apps, navigation, telefonopkald og meget mere"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Samtaler"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"Sms-beskeder og andre typer af kommunikation"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Standard"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Notifikationer, der muligvis ringer eller vibrerer baseret på indstillingerne"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Lydløs"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Notifikationer, der aldrig ringer eller vibrerer"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Se alle apps"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Skift indstillinger for notifikationer for hver app, der kan sende notifikationer"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Apps, der vises på enheden"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-hjælpetjenester"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ingen installerede apps har anmodet om at blive kørt som VR-hjælpetjenester."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vil du tillade, at <xliff:g id="SERVICE">%1$s</xliff:g> får adgang til VR-tjenesten?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Åbn som standard"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Åbning af links"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Åbn understøttede links"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Understøttede links åbnes i denne app"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Links, der skal åbnes i denne app"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Åbn uden at spørge"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Understøttede links"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Andre standarder"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Andre standardpræferencer"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Tilføj link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"En app kan bekræfte links, så de automatisk åbnes i appen. "<annotation id="url">"Få flere oplysninger"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> bekræftet link</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> bekræftede links</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Dette link er bekræftet og åbnes automatisk i denne app.</item>
+      <item quantity="other">Disse links er bekræftede og åbnes automatisk i denne app.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Søger efter andre understøttede links…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Annuller"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> understøttet link</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> understøttede links</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Tilføj"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Åbnes i <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<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="979243131665635278">"intern lagerplads"</string>
     <string name="storage_type_external" msgid="125078274000280821">"ekstern lagerplads"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Adgang til kameraet er ikke tilladt"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Screenshots er ikke tilladt"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Denne app kan ikke åbnes"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Kontakt din it-administrator, hvis du har spørgsmål"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Mere info"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Din administrator kan overvåge og administrere apps og data, der er knyttet til din arbejdsprofil, herunder indstillinger, tilladelser, virksomhedsadgang, netværksaktivitet og enhedens placeringsoplysninger."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Din administrator kan overvåge og administrere apps og data, der er knyttet til denne bruger, herunder indstillinger, tilladelser, virksomhedsadgang, netværksaktivitet og enhedens placeringsoplysninger."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> begrænsninger</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Mobilselskabets dataopgørelse kan afvige fra enhedens opgørelse."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Omfatter ikke data, der anvendes af mobilnetværk"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Omfatter ikke data, der anvendes af mobilnetværk"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> brugt"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Konfigurer dataadvarsel"</string>
     <string name="data_warning" msgid="2925054658166062884">"Dataadvarsel"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(afinstalleret for brugeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(deaktiveret for brugeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"AutoFyld-tjeneste"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automatisk, udfyld, autofyld"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Adgangskoder"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automatisk, udfyld, autofyld, adgangskode"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Sørg for, at du har tillid til denne app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; anvender indholdet af din skærm til at fastslå, hvad der kan udfyldes automatisk."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Autofyld"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Logningsniveau"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Skift driftstilstand for netværket"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Foretrukken netværkstype"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Mobilselskab"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Version af Indstillinger"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Version af indstillinger for mobilselskab"</string>
     <string name="call_category" msgid="641461844504128789">"Opkald"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videoopkald via mobilselskab"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Systemvalg"</string>
@@ -4916,8 +4964,8 @@
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Vil du aktivere SIM-kortet?"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vil du skifte til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
     <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Vil du skifte til at bruge SIM-kort?"</string>
-    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Der kan kun være ét aktivt SIM-kort ad gangen.\n\nSelvom du skifter til <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, opsiges dit abonnement hos <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ikke."</string>
-    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Der kan kun være ét downloadet SIM-kort ad gangen.\n\nSelvom du skifter til <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, opsiges dit abonnement hos <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ikke."</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Der kan kun være ét aktivt SIM-kort ad gangen.\n\nSelvom du skifter til <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, opsiges din tjeneste hos <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ikke."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Der kan kun være ét downloadet SIM-kort ad gangen.\n\nSelvom du skifter til <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, opsiges din tjeneste hos <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ikke."</string>
     <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Der kan kun være ét aktivt SIM-kort ad gangen.\n\nSelvom du skifter SIM-kort, opsiges dit abonnement hos <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ikke."</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Skift til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Opretter forbindelse til netværket…"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Tag SIM-kortet ud, og sæt det i igen. Genstart enheden, hvis problemet fortsætter."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prøv at aktivere SIM-kortet igen. Genstart enheden, hvis problemet fortsætter."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Netværksaktivering"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Nyt mobilselskab"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> er aktiv"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tryk for at opdatere indstillingerne for SIM-kort"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Skiftet til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Fra"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kort"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Se netværk til flytilstand"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Find og opret forbindelse til netværk i flytilstand."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Find og opret forbindelse til Wi-Fi-netværk"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"fly, sikkert netværk i fly"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Opkald og sms-beskeder"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-opkald"</string>
@@ -5119,22 +5167,21 @@
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Midlertidigt utilgængelig"</string>
     <!-- no translation found for calls_sms_no_sim (2336377399761819718) -->
     <skip />
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Præferencer"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Netværkspræferencer"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Opret forbindelse til offentlige netværk"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netværksforbindelse, internet, trådløs, data, wifi, wi-fi, mobilnetværk, mobil, mobilselskab, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Se netværk til flytilstand"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Visning af tilgængelige netværk i flytilstand"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Aktivér netværk"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Deaktiver netværk"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Vil du nulstille dit internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Dette afslutter telefonopkaldet"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Dette afslutter telefonopkaldet"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Nulstiller dit internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Løs problem med forbindelsen"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Tilgængelige netværk i flytilstand"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Afbryd ethernetforbindelsen for at skifte netværk"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Du kan ikke skifte netværk, når du har oprettet forbindelse"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Netværk, der kan bruges i flytilstand"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Forbundet"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Der oprettes ikke automatisk internetforbindelse"</string>
@@ -5155,6 +5202,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Farve"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Andre"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Generelt"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Se alle apps"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Intelligent viderestilling"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Intelligent viderestilling er aktiveret"</string>
@@ -5168,4 +5219,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Angiv telefonnummer"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefonnummeret mangler."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Tillad 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Brug 2G-mobilforbindelse. 2G er altid aktiveret til nødopkald."</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d49aa0e..848a94f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Lege fest, wie groß Text angezeigt wird."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Verkleinern"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Vergrößern"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"„Automatisch drehen“ verwenden"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Beispieltext"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Der Zauberer von Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Fingerabdruck eingerichtet</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Mit Fingerabdruck entsperren"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Fingerabdruck einrichten"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Fingerabdruck verwenden"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Tippe einfach auf den Fingerabdrucksensor, um dein Smartphone zu entsperren, Käufe zu autorisieren oder dich in Apps anzumelden. Überlege genau, wessen Fingerabdrücke du hinzufügen möchtest, da diese Aktionen mit allen Fingerabdrücken ausgeführt werden können, die du deinem Smartphone hinzufügst."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Dein Fingerabdruck ist möglicherweise nicht so sicher wie ein komplexes Muster oder eine PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Du hast die Kontrolle"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Hinweis"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Die von der Funktion „Fingerabdruck“ erfassten Daten werden sicher und ausschließlich auf deinem Smartphone gespeichert. Du kannst deine Daten jederzeit in den Einstellungen löschen."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Dein Fingerabdruck ist möglicherweise nicht so sicher wie ein komplexes Muster oder eine PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Dein Smartphone verwendet gelegentlich deine letzten Fingerabdrücke, um bessere Fingerabdruckmodelle zu erstellen."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Du kannst deinen Fingerabdruck verwenden, um dein Smartphone zu entsperren oder Käufe zu autorisieren.\n\nHinweis: Dieses Gerät kann nicht mit deinem Fingerabdruck entsperrt werden. Weitere Informationen erhältst du vom Administrator deiner Organisation."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Du kannst deinen Fingerabdruck verwenden, um dein Smartphone zu entsperren oder Käufe zu autorisieren.\n\nHinweis: Dein Fingerabdruck ist möglicherweise nicht so sicher wie ein komplexes Muster oder eine PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Abbrechen"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nein danke"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Überspringen"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Weiter"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Zustimmen"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Überspringen"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Weiter"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Fingerabdruck überspringen?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Überspringen"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Abbrechen"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Sensor berühren"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Fingerabdrucksymbol gedrückt halten"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Er befindet sich auf der Rückseite des Smartphones. Am besten den Zeigefinger verwenden."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Er befindet sich auf dem Bildschirm. Suche den Fingerabdruck mit dem leuchtenden Kreis."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Der Fingerabdrucksensor befindet sich auf deinem Display. Bewege deinen Finger über das Display, um ihn zu finden."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Abbildung mit Gerät und Position des Fingerabdrucksensors"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Ok"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Löschen"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Sensor berühren"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Lege deinen Finger auf den Sensor und hebe ihn an, wenn du eine Vibration spürst."</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Anheben und erneut berühren"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Lege den Finger immer wieder in leicht geänderter Position auf, bis der Abdruck vollständig erfasst ist."</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingerabdruck hinzugefügt"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Wenn du dieses Symbol siehst, kannst du deinen Fingerabdruck verwenden, um dich zu identifizieren oder einen Kauf zu autorisieren."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Später"</string>
@@ -1177,14 +1191,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Suche"</string>
     <string name="display_settings" msgid="7197750639709493852">"Display"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Bildschirm automatisch drehen"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Aus"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"An"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"An – gesichtsbasiert"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Gesichtserkennung aktivieren"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Farben"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natürlich"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Verstärkt"</string>
@@ -1229,7 +1239,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"An / Der Bildschirm wird nicht ausgeschaltet, solange du auf ihn blickst"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Aus"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Zugriff auf Kamera erforderlich"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Tippen, um Berechtigungen für Dienste zur Gerätepersonalisierung zu verwalten"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Verhindert, dass der Bildschirm ausgeschaltet wird, wenn du auf ihn schaust"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Die Funktion \"Aufmerksamkeitserkennung\" verwendet die Frontkamera, um zu erkennen, ob jemand den Bildschirm ansieht. Es werden dabei keine Bilder gespeichert und auch nie an Google gesendet."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Aufmerksamkeitserkennung aktivieren"</string>
@@ -1310,7 +1323,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Wenn das Display inaktiv ist, wird es bei neuen Benachrichtigungen aktiviert"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Zeit und Informationen immer anzeigen"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Erhöhter Akkuverbrauch"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Text fett markieren"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Text in Fettdruck setzen"</string>
     <string name="title_font_size" msgid="570613010306330622">"Schriftgröße"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Text vergrößern oder verkleinern"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Einstellungen für SIM-Sperre"</string>
@@ -1479,6 +1492,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Andere Nutzer"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Gerätespeicher"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Mobiler Speicher"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Wecker und Erinnerungen"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Erlauben, dass Wecker und Erinnerungen eingerichtet werden"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Wecker und Erinnerungen"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Erlauben, dass diese App Wecker stellt oder andere zeitliche Ereignisse plant. So kann die App gestartet und ausgeführt werden, auch wenn du das Gerät nicht verwendest. Beachte, dass das Aufheben dieser Berechtigung zu einer Fehlfunktion der App führen kann. In der App gestellte Wecker werden beispielsweise nicht mehr läuten."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"einrichten, Wecker, Erinnerung, Ereignis"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> von <xliff:g id="TOTAL">%2$s</xliff:g> belegt"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"von <xliff:g id="TOTAL">%1$s</xliff:g> belegt"</string>
@@ -1728,30 +1746,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Standortdienste"</string>
     <string name="location_title" msgid="5819154746934945021">"Mein Standort"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Standort für Arbeitsprofil"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Standortzugriff von Apps"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Standortermittlung ist deaktiviert"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> von <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> Apps haben Zugriff auf den Standort</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> von <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> Apps hat Zugriff auf den Standort</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Letzte Standortzugriffe"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Details ansehen"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Keine App hat kürzlich den Standort abgefragt."</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Kürzlich hat keine App auf den Standort zugegriffen"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Hoher Akkuverbrauch"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Geringer Akkuverbrauch"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"WLAN- und Bluetooth-Suche"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"WLAN-Suche"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Apps und Dienste dürfen immer nach WLANs suchen, auch wenn die WLAN-Funktion deaktiviert ist. Dadurch können beispielsweise standortbasierte Funktionen und Dienste verbessert werden."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-Suche"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Apps und Dienste dürfen immer nach Geräten in der Nähe suchen, auch wenn Bluetooth deaktiviert ist. Dadurch können beispielsweise standortbasierte Funktionen und Dienste verbessert werden."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Standortdienste"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Standortdienste für die Arbeit"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Zeitzone anhand des Standorts bestimmen"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Zeitzone anhand des Standorts bestimmen"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Durch diese Funktion kann anhand des Standorts des Geräts die aktuelle Zeitzone bestimmt werden. Andere Standorteinstellungen wie die WLAN-Suche können die Genauigkeit der Zeitzonenerkennung beeinflussen."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"An"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Aus"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatische Zeitzonenerkennung ist deaktiviert"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatische Zeitzone ist deaktiviert"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Zeitzonenerkennung anhand des Standorts ist deaktiviert"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Zeitzonenerkennung anhand des Standorts wird nicht unterstützt"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Änderungen an den Einstellungen für die Zeitzonenerkennung sind nicht erlaubt"</string>
@@ -1930,10 +1949,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Aktivieren"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Speicherinhalt löschen"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Updates deinstallieren"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Du hast diese App für einige Aktionen als Standard festgelegt."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Einige von dir ausgewählte Aktivitäten werden standardmäßig in dieser App geöffnet."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Du hast dieser App das Erstellen von Widgets und den Zugriff auf deine Daten erlaubt."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Kein Standard"</string>
-    <string name="clear_activities" msgid="341345438786077236">"Aktionen auf Standard zurücksetzen"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Standardeinstellungen löschen"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Möglicherweise ist diese App nicht für deinen Bildschirm ausgelegt. Hier kannst du festlegen, wie sie an deinen Bildschirm angepasst wird."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Beim Start fragen"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"App skalieren"</string>
@@ -2145,7 +2164,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Du kannst dieses Gerät an deine Bedürfnisse anpassen. Die Bedienungshilfen kannst du später in den Einstellungen ändern."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Schriftgröße ändern"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screenreader"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audiodienste und Text auf dem Bildschirm"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Untertitel"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Allgemein"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Bildschirm"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text und Anzeige"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Bildschirm dunkler machen"</string>
@@ -2298,7 +2319,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rot-Grün-Sehschwäche"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rot-Grün-Sehschwäche"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blau-Gelb-Sehschwäche"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Helligkeit verringern"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Helligkeit verringern"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Das Display dunkler machen als die niedrigste Helligkeit deines Smartphones"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Das Display dunkler machen als die niedrigste Helligkeit deines Tablets"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Mache dein Display dunkler, um beim Lesen die Augen zu schonen.&lt;br/&gt;&lt;br/&gt; Dies kann sinnvoll sein, wenn: &lt;ol&gt; &lt;li&gt; die niedrigste Standardhelligkeit in deinem Smartphone immer noch zu hell ist&lt;/li&gt; &lt;li&gt; du dein Smartphone in dunklen Umgebungen nutzt, wie z. B. nachts oder in einem dunklen Raum vor dem Schlafengehen&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3335,8 +3356,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"Gesicht"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"Fingerabdruck, Fingerabdruck hinzufügen"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"display dimmen, touchscreen, akku, intelligente helligkeit, dynamische helligkeit, automatische helligkeit"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"display dimmen, ruhemodus, akku, zeitlimit, aufmerksamkeit, display, bildschirm, inaktivität, timeout, automatisch ausschalten"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"drehen, spiegeln, drehung, hochformat, querformat, ausrichtung, vertikal, horizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, zeitplan, benachrichtigungen, blockieren, lautlos, vibrieren, schlaf, arbeit, fokus, ton, stumm, tag, wochentag, wochenende, wochenende, ereignis, bns"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"display, sperrzeit, timeout, lockscreen, bildschirm, zeitlimit, automatisch ausschalten"</string>
@@ -3505,9 +3528,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Klingeltöne"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Andere Töne und Vibrationen"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Benachrichtigungen"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Unterhaltung"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Apps, die zuletzt Benachrichtigungen gesendet haben"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Alle der letzten 7 Tage ansehen"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Erweitert"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Allgemein"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Geschäftliche Benachrichtigungen"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptive Benachrichtigungen"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptive Priorität der Benachrichtigungen"</string>
@@ -3569,7 +3593,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Benachrichtigungen erscheinen in Benachrichtigungs-/Statusleiste und auf Sperrbildschirm"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Lautlose Benachrichtigungen in der Statusleiste ausblenden"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Benachrichtigungslicht blinkt"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Benachr. auf Sperrbildschirm"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Datenschutz"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Sperrbildschirm überspringen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Nach Face Unlock direkt zum zuletzt genutzten Bildschirm gehen"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Sperrbildschirm, überspringen, umgehen"</string>
@@ -3639,7 +3663,7 @@
     <string name="allow_interruption" msgid="5237201780159482716">"Unterbrechungen zulassen"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"Die App darf Töne sowie Vibrationen erzeugen und/oder Pop-up-Benachrichtigungen auf dem Bildschirm einblenden"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"Priorität"</string>
-    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Wird oben im Bereich \"Unterhaltungen\" als unverankerte Bubble mit einem Profilbild auf dem Sperrbildschirm angezeigt"</string>
+    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Wird oben im Bereich „Unterhaltungen“ als unverankerte Bubble angezeigt und erscheint mit einem Profilbild auf dem Sperrbildschirm"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"<xliff:g id="APP_NAME">%1$s</xliff:g> unterstützt die meisten Funktionen für Unterhaltungen nicht. Du kannst keine Unterhaltung als Priorität festlegen und Unterhaltungen erscheinen nicht als unverankerte Bubbles."</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"Benachrichtigungen in der Benachrichtigungsleiste werden auf eine Zeile minimiert"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"Kein Ton und keine Vibration"</string>
@@ -3658,7 +3682,8 @@
       <item quantity="one">Ungefähr <xliff:g id="NUMBER_0">%d</xliff:g> Benachrichtigung pro Woche</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nie"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Benachrichtigungszugriff"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Geräte- und App-Benachrichtigungen"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Steuern, welche Benachrichtigungen in Apps und auf Geräten angezeigt werden"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Zugriff auf Arbeitsprofil-Benachrichtigungen ist blockiert"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Apps können keine Benachrichtigungen lesen."</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3677,17 +3702,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Deaktivieren"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Abbrechen"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Zulässige Benachrichtigungstypen"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Wichtige fortlaufende Benachrichtigungen"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Unterhaltungsbenachrichtigungen"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Warnbenachrichtigungen"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Lautlose Benachrichtigungen"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Echtzeit"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Echtzeitmitteilungen von Apps, die in Verwendung sind, der Navigation, Telefonanrufen und mehr"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Unterhaltungen"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS und andere Mitteilungen"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Standard"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Benachrichtigungen, bei denen das Gerät je nach den Einstellungen klingelt oder vibriert"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Lautlos"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Benachrichtigungen, die nie Töne oder Vibrationen auslösen"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Alle Apps anzeigen"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Benachrichtigungseinstellungen für jede App ändern, die Benachrichtigungen senden kann"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Auf Gerät angezeigte Apps"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-Hilfsdienste"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Keine installierte App hat die Ausführung als VR-Hilfedienst angefordert."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR-Dienstzugriff für <xliff:g id="SERVICE">%1$s</xliff:g> erlauben?"</string>
@@ -3975,9 +4000,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Standardmäßig öffnen"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Links öffnen"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Unterstützte Links öffnen"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Unterstützte Links werden in dieser App geöffnet"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Links, die in dieser App geöffnet werden sollen"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Ohne Nachfrage öffnen"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Unterstützte Links"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Andere Standardeinstellungen"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Andere Standardeinstellungen"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Link hinzufügen"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Eine App kann Links bestätigen, damit sie automatisch darin geöffnet werden. "<annotation id="url">"Weitere Informationen"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> bestätigte Links</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> bestätigter Link</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Diese Links sind bestätigt und werden automatisch in dieser App geöffnet.</item>
+      <item quantity="one">Dieser Link ist bestätigt und wird automatisch in dieser App geöffnet.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Andere unterstützte Links werden gesucht…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Abbrechen"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> unterstützte Links</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> unterstützter Link</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Hinzufügen"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Wird in <xliff:g id="APP_LABEL">%s</xliff:g> geöffnet"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> <xliff:g id="STORAGE_TYPE">%2$s</xliff:g> belegt"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"interner Speicher"</string>
     <string name="storage_type_external" msgid="125078274000280821">"externer Speicher"</string>
@@ -4272,7 +4318,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Kameranutzung nicht zulässig"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Screenshots nicht zulässig"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"App kann nicht geöffnet werden"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Wende dich bei Fragen an deinen IT-Administrator"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Weitere Details"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Dein Administrator kann die mit deinem Arbeitsprofil verbundenen Apps und Daten überwachen und verwalten, einschließlich der Einstellungen, Berechtigungen, Zugriffe auf Unternehmensinhalte, Netzwerkaktivitäten und Standortdaten des Geräts."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Dein Administrator kann die mit diesem Nutzer verbundenen Apps und Daten überwachen und verwalten, einschließlich der Einstellungen, Berechtigungen, Zugriffe auf Unternehmensinhalte, Netzwerkaktivitäten und Standortdaten des Geräts."</string>
@@ -4349,7 +4396,7 @@
       <item quantity="one">1 Beschränkung</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Dein Mobilfunkanbieter berechnet die Datennutzung eventuell anders als das Gerät"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Beinhaltet keine Daten, die in Mobilfunkanbieter-Netzwerken verwendet werden"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Beinhaltet keine von Mobilfunkanbieter-Netzwerken verwendeten Daten"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Verbrauchte Daten: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Datenwarnung festlegen"</string>
     <string name="data_warning" msgid="2925054658166062884">"Warnlimit für mobile Daten"</string>
@@ -4686,7 +4733,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(für Nutzer <xliff:g id="USER">%s</xliff:g> deinstalliert)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(für Nutzer <xliff:g id="USER">%s</xliff:g> deaktiviert)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Dienst für automatisches Ausfüllen"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automatisch, ausfüllen, füllen, autofill"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Passwörter"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automatisch, füllen, ausfüllen, Passwort, auto, fill, autofill, password"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Nur für vertrauenswürdige Apps&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Automatisches Ausfüllen von Google&gt;%1$s&lt;/xliff:g&gt; greift auf die Displayanzeige zu, um zu bestimmen, welche Felder automatisch ausgefüllt werden können. Die Funktion sollte daher nur für vertrauenswürdige Apps zugelassen werden."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Automatisches Ausfüllen"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Protokollierungsebene"</string>
@@ -4884,7 +4932,7 @@
     <string name="mobile_network_disable_sim_explanation" msgid="2851862257846773796">"SIM-Karte entfernen, um sie zu deaktivieren"</string>
     <string name="mobile_network_tap_to_activate" msgid="4139979375717958102">"Zum Aktivieren von <xliff:g id="CARRIER">%1$s</xliff:g> tippen"</string>
     <string name="mobile_network_esim_swap_confirm_title" msgid="2762744961192218789">"Zu <xliff:g id="CARRIER">%1$s</xliff:g> wechseln?"</string>
-    <string name="mobile_network_esim_swap_confirm_body" msgid="8168680839542031781">"Es kann immer nur eine heruntergeladene SIM aktiv sein.\n\nDurch Umschalten zu <xliff:g id="CARRIER1">%1$s</xliff:g> wird dein <xliff:g id="CARRIER2">%2$s</xliff:g>-Dienst nicht beendet."</string>
+    <string name="mobile_network_esim_swap_confirm_body" msgid="8168680839542031781">"Es kann immer nur eine heruntergeladene SIM aktiv sein.\n\nWenn du zu <xliff:g id="CARRIER1">%1$s</xliff:g> wechselst, wird dein Mobilfunkvertrag bei <xliff:g id="CARRIER2">%2$s</xliff:g> dadurch nicht gekündigt."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="8695772737522378095">"Zu <xliff:g id="CARRIER">%1$s</xliff:g> wechseln"</string>
     <string name="mobile_network_erase_sim" msgid="4629071168032714930">"SIM löschen"</string>
     <string name="mobile_network_erase_sim_error_dialog_title" msgid="6680959559589234726">"SIM kann nicht gelöscht werden"</string>
@@ -4893,7 +4941,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Netzmodus ändern"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Bevorzugter Netztyp"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Mobilfunkanbieter"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Einstellungen-Version"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Version der Mobilfunkanbieter-Einstellungen"</string>
     <string name="call_category" msgid="641461844504128789">"Anruffunktionen"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videoanrufe über Mobilfunkanbieter"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Systemauswahl"</string>
@@ -4917,9 +4965,9 @@
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM aktivieren?"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Zu <xliff:g id="CARRIER_NAME">%1$s</xliff:g> wechseln?"</string>
     <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM-Karte wechseln?"</string>
-    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Es kann immer nur eine SIM-Karte aktiv sein.\n\nWenn du zu <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> wechselst, wird dein <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-Dienst nicht beendet."</string>
-    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Es kann immer nur eine heruntergeladene eSIM aktiv sein.\n\nWenn du zu <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> wechselst, wird dein <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-Dienst nicht beendet."</string>
-    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Es kann immer nur eine SIM-Karte aktiv sein.\n\nWenn du zwischen ihnen wechselst, wird dein <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-Dienst nicht beendet."</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Es kann immer nur eine SIM-Karte aktiv sein.\n\nWenn du zu <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> wechselst, wird dein Mobilfunkvertrag bei <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> dadurch nicht gekündigt."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Es kann immer nur eine heruntergeladene SIM aktiv sein.\n\nWenn du zu <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> wechselst, wird dein Mobilfunkvertrag bei <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> dadurch nicht gekündigt."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Es kann immer nur eine SIM-Karte aktiv sein.\n\nWenn du zwischen ihnen wechselst, wird dein Mobilfunkvertrag bei <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> dadurch nicht gekündigt."</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Zu <xliff:g id="CARRIER_NAME">%1$s</xliff:g> wechseln"</string>
     <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Verbindung zum Mobilfunknetz wird hergestellt…"</string>
     <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Wechsel zu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -4942,6 +4990,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Nimm die SIM heraus und lege sie dann wieder ein. Sollte das Problem weiterhin bestehen, starte das Gerät neu."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Versuche, die SIM noch einmal zu aktivieren. Sollte das Problem weiterhin bestehen, starte das Gerät neu."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Netzwerkaktivierung"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Wechsel des Mobilfunkanbieters"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ist aktiviert"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tippe, um die SIM-Einstellungen zu aktualisieren"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Zu <xliff:g id="CARRIER_NAME">%1$s</xliff:g> gewechselt"</string>
@@ -5102,8 +5151,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Aus"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-Karten"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Flugmodus-Netzwerke anzeigen"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Netzwerke im Flugmodus finden und Verbindung herstellen."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"WLAN suchen und eine Verbindung herstellen"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"Flug, Flugzeug, flugsicher"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Anrufe &amp; SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"WLAN-Anrufe"</string>
@@ -5117,22 +5165,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nicht verfügbar"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Momentan nicht verfügbar"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Keine SIM-Karte"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Einstellungen"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Netzwerkeinstellungen"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Mit öffentlichen Netzwerken verbinden"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netzwerkverbindung, internet, kabellos, drahtlos, daten, wlan, w-lan, mobilfunk, mobil, mobilfunkanbieter, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Flugmodus-Netzwerke anzeigen"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Flugmodus-Netzwerke werden angezeigt"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Netzwerke aktivieren"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Netzwerke deaktivieren"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Internetverbindung zurücksetzen?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Dadurch wird dein Telefongespräch beendet"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Dadurch wird dein Telefongespräch beendet"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Internetverbindung wird zurückgesetzt…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Konnektivitätsprobleme beheben"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Im Flugmodus verfügbare Netzwerke"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Trenne das Ethernetkabel, um das Netzwerk zu wechseln"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Netzwerkwechsel während einer Verbindung nicht möglich"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Flugmodus-Netzwerke"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Verbunden"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Keine automatische Verbindung mit dem Internet"</string>
@@ -5153,6 +5200,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Farbe"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Sonstige"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Allgemein"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Alle Apps anzeigen"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Intelligente Weiterleitung"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Intelligente Weiterleitung aktiviert"</string>
@@ -5166,4 +5217,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefonnummer eingeben"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefonnummer fehlt."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G zulassen"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G-Mobilfunkverbindungen verwenden. Für Notrufe ist 2G immer aktiviert."</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 57bf214..ac9a5e4 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Κάντε το κείμενο στην οθόνη μικρότερο ή μεγαλύτερο."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Να γίνουν μικρότερα"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Να γίνουν μεγαλύτερα"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Χρήση αυτόματης περιστροφής"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Δείγμα κειμένου"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Ο Θαυμάσιος Μάγος του Οζ"</string>
@@ -405,15 +404,21 @@
       <item quantity="one">Ορίστηκε <xliff:g id="COUNT_0">%1$d</xliff:g> δακτυλικό αποτύπωμα</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Ξεκλείδ. με δακτ. αποτύπωμα"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Ρύθμιση δακτυλικού αποτυπώματος"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Χρήση δακτυλικού αποτυπώματος"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Αγγίξτε απλώς τον αισθητήρα δακτυλικών αποτυπωμάτων για να ξεκλειδώσετε το τηλέφωνό σας, να εξουσιοδοτήσετε αγορές ή να συνδεθείτε σε εφαρμογές. Να είστε προσεκτικοί με τα δακτυλικά αποτυπώματα που προσθέτετε. Αυτές οι ενέργειες θα μπορούν να γίνουν ακόμη και με ένα μόνο δακτυλικό αποτύπωμα που προσθέτετε."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Το δακτυλικό σας αποτύπωμα μπορεί να είναι λιγότερο ασφαλές από ένα ισχυρό μοτίβο ή PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Έχετε τον έλεγχο"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Έχετε υπόψη τα εξής"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Τα δεδομένα που εγγράφονται από το Δακτυλικό αποτύπωμα αποθηκεύονται με ασφάλεια και δεν αποστέλλονται ποτέ εκτός του τηλεφώνου σας. Μπορείτε να διαγράψετε τα δεδομένα σας ανά πάσα στιγμή στις Ρυθμίσεις."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Το δακτυλικό σας αποτύπωμα μπορεί να είναι λιγότερο ασφαλές από ένα ισχυρό μοτίβο ή PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Το τηλέφωνό σας θα χρησιμοποιεί περιστασιακά τις πρόσφατες εικόνες δακτυλικών αποτυπωμάτων για να δημιουργήσει βελτιωμένα μοντέλα δακτυλικών αποτυπωμάτων."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Χρησιμοποιήστε το δακτυλικό σας αποτύπωμα, για να ξεκλειδώνετε το τηλέφωνό σας ή να εγκρίνετε αγορές.\n\nΣημείωση: Δεν μπορείτε να χρησιμοποιήσετε το δακτυλικό σας αποτύπωμα, για να ξεκλειδώσετε αυτήν τη συσκευή. Για περισσότερες πληροφορίες, επικοινωνήστε με τον διαχειριστή του οργανισμού σας."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Χρησιμοποιήστε το δακτυλικό σας αποτύπωμα για ξεκλείδωμα του τηλεφώνου ή για έγκριση αγορών.\n\nΣημείωση: Το δακτυλικό σας αποτύπωμα μπορεί να είναι λιγότερο ασφαλές από ένα ισχυρό μοτίβο ή PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Ακύρωση"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Όχι, ευχαριστώ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Παράβλεψη"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Συνέχεια"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Αποδοχή"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Παράβλεψη"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Επόμενο"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Παράβλεψη δακτ. αποτυπώματος;"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Παράβλεψη"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Ακύρωση"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Αγγίξτε τον αισθητήρα"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Αγγίξτε παρατεταμένα το εικονίδιο δακτυλικών αποτυπωμάτων"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Βρίσκεται στο πίσω μέρος του τηλεφώνου σας. Χρησιμοποιήστε τον δείκτη σας."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Εμφανίζεται στην οθόνη. Αναζητήστε το δακτυλικό αποτύπωμα με τον λαμπερό κύκλο."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Ο αισθητήρας δακτυλικών αποτυπωμάτων βρίσκεται στην οθόνη σας. Μετακινήστε το δάκτυλό σας κατά μήκος της οθόνης για να τον εντοπίσετε."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Εικόνα συσκευής και της τοποθεσίας του αισθητήρα δακτυλικού αποτυπώματος"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Όνομα"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ΟΚ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Διαγραφή"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Αγγίξτε τον αισθητήρα"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Τοποθετήστε το δάχτυλό σας στον αισθητήρα και ανασηκώστε το μόλις αισθανθείτε μια δόνηση"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Ανασηκώστε και αγγίξτε ξανά"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Συνεχίστε να ανασηκώνετε το δάχτυλό σας, για να προσθέσετε τα διάφορα τμήματα του δακτυλικού σας αποτυπώματος"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Προστέθηκε δακτυλ. αποτύπωμα"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Όταν βλέπετε αυτό το εικονίδιο, χρησιμοποιήστε το δακτυλικό σας αποτύπωμα για ταυτοποίηση ή για την έγκριση αγορών"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Αργότερα"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Αναζήτηση"</string>
     <string name="display_settings" msgid="7197750639709493852">"Προβολή"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Αυτόματη περιστροφή οθόνης"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Ανενεργό"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Ενεργό"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Ενεργό - Βάσει προσώπου"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Ενεργοπ. ανίχνευσης προσώπων"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Χρώματα"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Φυσικό"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Ενισχυμένο"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ενεργό/Η οθόνη δεν θα απενεργοποιείται εάν την κοιτάτε"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Ανενεργή"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Απαιτείται άδεια κάμερας"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Πατήστε για να διαχειριστείτε τα δικαιώματα για τις Υπηρεσίες εξατομίκευσης συσκευών"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Αποτρέπει την απενεργοποίηση της οθόνης σας εάν την κοιτάτε"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Η λειτουργία Παρακολούθηση οθόνης χρησιμοποιεί την μπροστινή κάμερα για να διαπιστώσει αν κάποιος χρήστης κοιτάζει την οθόνη. Λειτουργεί στη συσκευή και οι εικόνες δεν αποθηκεύονται ούτε αποστέλλονται στην Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Ενεργοποίηση παρακολούθησης οθόνης"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Όταν η οθόνη είναι σκοτεινή, ανάβει όταν λαμβάνετε νέες ειδοποιήσεις."</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Να εμφαν. πάντα ώρα και πληρ."</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Αυξημένη χρήση μπαταρίας"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Κείμενο με έντονη γραφή"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Κείμενο με έντονη γραφή"</string>
     <string name="title_font_size" msgid="570613010306330622">"Μέγεθος γραμματοσειράς"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Κάντε το κείμενο μεγαλύτερο ή μικρότερο"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Ρυθμίσεις κλειδ/τος SIM"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Άλλοι χρήστες"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Αποθηκευτικός χώρος συσκευής"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Φορητός αποθηκευτικός χώρος"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Ξυπνητήρια και ειδοποιήσεις"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Να επιτρέπεται ο ορισμός ξυπνητ. και υπενθυμίσεων"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Ξυπνητήρια και ειδοποιήσεις"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Να επιτρέπεται σε αυτήν την εφαρμογή να προγραμματίζει ξυπνητήρια ή άλλα συμβάντα που βασίζονται σε χρονομέτρηση. Αυτό θα επιτρέπει την αφύπνιση και εκτέλεση της εφαρμογής ακόμη και όταν δεν χρησιμοποιείτε τη συσκευή. Λάβετε υπόψη ότι η ανάκληση αυτής της άδειας μπορεί να οδηγήσει σε δυσλειτουργία της εφαρμογής. Συγκεκριμένα, δεν θα λειτουργούν πλέον τυχόν ξυπνητήρια που έχουν προγραμματιστεί από την εφαρμογή."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"χρονοδιάγραμμα, ξυπνητήρι, υπενθύμιση, συμβάν"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Σε χρήση <xliff:g id="USED">%1$s</xliff:g> από τα <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Σε χρήση από τα <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Υπηρεσίες τοποθεσίας"</string>
     <string name="location_title" msgid="5819154746934945021">"Η τοποθεσία μου"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Τοποθεσία για προφίλ εργασίας"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Πρόσβαση εφαρμογής στην τοποθ."</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Η τοποθεσία είναι ανενεργή"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> από <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> εφαρμογές έχουν πρόσβαση στην τοποθεσία σας</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> από <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> εφαρμογές έχουν πρόσβαση στην τοποθεσία σας</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Πρόσφατη πρόσβαση τοποθεσίας"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Προβολή λεπτομερειών"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Καμία εφαρμογή δεν ζήτησε πρόσφατα την τοποθεσία σας."</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Δεν υπάρχουν εφαρμογές που να απέκτησαν πρόσφατα πρόσβαση στην τοποθεσία σας"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Υψηλή χρήση μπαταρίας"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Χαμηλή χρήση μπαταρίας"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Σάρωση Wi‑Fi και Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Σάρωση Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Επιτρέψτε στις εφαρμογές και στις υπηρεσίες να εκτελούν σάρωση για δίκτυα Wi‑Fi ανά πάσα στιγμή, ακόμα και όταν το Wi‑Fi είναι απενεργοποιημένο. Η σάρωση μπορεί να χρησιμοποιηθεί, για παράδειγμα, για τη βελτίωση λειτουργιών και υπηρεσιών που εκτελούνται βάσει τοποθεσίας."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Σάρωση Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Επιτρέψτε στις εφαρμογές και στις υπηρεσίες να εκτελούν σάρωση για κοντινές συσκευές ανά πάσα στιγμή, ακόμα και όταν το Bluetooth είναι απενεργοποιημένο. Η σάρωση μπορεί να χρησιμοποιηθεί, για παράδειγμα, για τη βελτίωση λειτουργιών και υπηρεσιών που εκτελούνται βάσει τοποθεσίας."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Υπηρεσίες τοποθεσίας"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Οι υπηρεσίες τοποθεσίας δεν λειτουργούν"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Εντοπισμός ζώνης ώρας τοποθεσίας"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Εντοπισμός ζώνης ώρας τοποθεσίας"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Επιτρέπει τη χρήση της τοποθεσίας συσκευής για τον εντοπισμό της τρέχουσας ζώνης ώρας. Άλλες ρυθμίσεις τοποθεσίας όπως η σάρωση Wi‑Fi μπορούν να επηρεάσουν την ακρίβεια του εντοπισμού ζώνης ώρας."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Ενεργοποιημένος"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Απενεργοποιημένος"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Ο αυτόματος εντοπισμός ζώνης ώρας είναι απενεργοποιημένος"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Η αυτόματη ζώνη ώρας είναι απενεργοποιημένη"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Ο εντοπισμός ζώνης ώρας τοποθεσίας είναι απενεργοποιημένος"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Ο εντοπισμός ζώνης ώρας τοποθεσίας δεν υποστηρίζεται"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Δεν επιτρέπονται αλλαγές στον εντοπισμό ζώνης ώρας τοποθεσίας"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Ενεργοποίηση"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Διαγραφή αποθηκευτικού χώρου"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Απεγκατάσταση ενημερώσεων"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Έχετε επιλέξει να γίνεται εκκίνηση αυτής της εφαρμογής από προεπιλογή για ορισμένες ενέργειες."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Ορισμένες δραστηριότητες που έχετε επιλέξει ανοίγουν σε αυτήν την εφαρμογή από προεπιλογή."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Έχετε επιλέξει να επιτρέπεται σε αυτήν την εφαρμογή η δημιουργία γραφικών στοιχείων και η πρόσβαση στα δεδομένα τους."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Δεν έχουν οριστεί προεπιλογές."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Διαγραφή προεπιλογών"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Διαγραφή προεπιλεγμένων προτιμήσεων"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Αυτή η εφαρμογή ενδέχεται να μην έχει σχεδιαστεί για την οθόνη σας. Εδώ μπορείτε να ελέγξετε τον τρόπο προσαρμογής της στην οθόνη σας."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Να ερωτώμαι κατά την εκκίνηση"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Κλιμάκωση εφαρμογών"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Μπορείτε να προσαρμόσετε αυτήν τη συσκευή σύμφωνα με τις ανάγκες σας. Οι λειτουργίες προσβασιμότητας μπορούν να τροποποιηθούν αργότερα από τις ρυθμίσεις."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Αλλαγή μεγέθους γραμματοσειράς"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Αναγνώστες οθόνης"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Ήχος και κείμενο στην οθόνη"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Υπότιτλοι"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Ήχος"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Γενικά"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Οθόνη"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Κείμενο και προβολή"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Κάντε την οθόνη πιο σκοτεινή"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Κόκκινο-πράσινο"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Κόκκινο-πράσινο"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Μπλε-κίτρινο"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Μείωση φωτεινότητας"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Μείωση φωτεινότητας"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Κάντε την οθόνη πιο σκοτεινή από την ελάχιστη φωτεινότητα του τηλεφώνου σας"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Κάντε την οθόνη πιο σκοτεινή από την ελάχιστη φωτεινότητα του tablet σας"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Κάντε την οθόνη πιο σκοτεινή προκειμένου η ανάγνωση να είναι πιο άνετη.&lt;br/&gt;&lt;br/&gt; Αυτό μπορεί να βοηθήσει: &lt;ol&gt; &lt;li&gt; Όταν η προεπιλεγμένη ελάχιστη φωτεινότητα του τηλεφώνου σας δεν είναι αρκετά σκοτεινή&lt;/li&gt; &lt;li&gt; Όταν χρησιμοποιείτε το τηλέφωνό σας σε συνθήκες χαμηλού φωτισμού, όπως κατά τη διάρκεια της νύχτας ή σε ένα σκοτεινό δωμάτιο πριν κοιμηθείτε&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"πρόσωπο"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"δακτυλικό αποτύπωμα, προσθήκη δακτυλικού αποτυπώματος"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"μείωση φωτεινότητας οθόνης, οθόνη αφής, μπαταρία, έξυπνη φωτεινότητα, δυναμική φωτεινότητα, αυτόματη φωτεινότητα"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"μείωση φωτεινότητας οθόνης, αδράνεια, μπαταρία, λήξη ορίου χρόνου, προσοχή, προβολή, οθόνη, καμία ενέργεια"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"περιστρέφω, αναστροφή, περιστροφή, πορτραίτο, οριζόντια, προσανατολισμός, κάθετος, οριζόντιος"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"αναβάθμιση, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, πρόγραμμα, ειδοποιήσεις, αποκλεισμός, σίγαση, δόνηση, αδράνεια, εργασία, εστίαση, ήχος, σίγαση, ημέρα, καθημερινή, σαββατοκύριακο, νύχτα καθημερινής, συμβάν"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"οθόνη, χρόνος κλειδώματος, λήξη ορίου χρόνου, οθόνη κλειδώματος"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ήχοι κλήσης"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Άλλοι ήχοι και δονήσεις"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Ειδοποιήσεις"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Συνομιλία"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Στάλθηκαν πρόσφατα"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Εμφάνιση όλων από τις τελευταίες 7 ημέρες"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Σύνθετες ρυθμίσεις"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Γενικά"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Ειδοποιήσεις εργασίας"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Προσαρμοστικές ειδοποιήσεις"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Προτεραιότητα προσαρμοστικής ειδοποίησης"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Εμφανίζονται στο αναπτυσσόμενο πλαίσιο σκίασης, τη γραμμή κατάστασης και την οθόνη κλειδώματος"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Απόκρυψη αθόρυβων ειδοποιήσεων στη γραμμή κατάστασης"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Φως που αναβοσβήνει"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Ειδοποιήσεις στη οθόνη κλειδ."</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Απόρρητο"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Παράβλεψη οθόνης κλειδώματος"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Μετά το Face Unlock, απευθείας μετάβαση στην τελευταία οθόνη"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Οθόνη κλειδώματος, Κλειδωμένη οθόνη, Παράβλεψη, Παράκαμψη"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> ειδοποίηση ανά εβδομάδα</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Ποτέ"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Πρόσβαση ειδοπ/σεων"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Ειδοποιήσεις συσκευής και εφαρμογών"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Ελέγξτε ποιες ειδοποιήσεις εμφανίζονται στις εφαρμογές και στις συσκευές σας"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Η πρόσβαση στις ειδοποιήσεις προφίλ εργασίας έχει αποκλειστεί"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Οι εφαρμογές δεν μπορούν να διαβάσουν ειδοποιήσεις"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Απενεργοποίηση"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Ακύρωση"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Επιτρεπόμενοι τύποι ειδοποιήσεων"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Σημαντικές ειδοποιήσεις σε εξέλιξη"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Ειδοποιήσεις συζήτησης"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Προειδοποιήσεις"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Ειδοποιήσεις σε σίγαση"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Σε πραγματικό χρόνο"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Επικοινωνία σε πραγματικό χρόνο από εφαρμογές που χρησιμοποιούνται, πλοήγηση, τηλεφωνικές κλήσεις κ.ά."</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Συζητήσεις"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS και άλλες επικοινωνίες"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Προεπιλογή"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Ειδοποιήσεις που ενδέχεται να κάνουν τη συσκευή να κουδουνίζει ή να δονείται βάσει των ρυθμίσεων"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Σίγαση"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Ειδοποιήσεις που δεν κάνουν ποτέ τη συσκευή να παράγει ήχους ή να δονείται"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Εμφάνιση όλων των εφαρμογών"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Αλλαγή ρυθμίσεων ειδοποιήσεων για κάθε εφαρμογή που μπορεί να στείλει ειδοποιήσεις"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Εφαρμογές που εμφανίζονται στη συσκευή"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Βοηθητικές υπηρεσίες Εικονικής Πραγματικότητας"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Δεν έχει ζητηθεί η εκτέλεση εγκατεστημένων εφαρμογών ως βοηθητικών υπηρεσιών Εικονικής Πραγματικότητας."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Να επιτρέπεται στην υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g> να έχει πρόσβαση στην υπηρεσία Εικονικής Πραγματικότητας;"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Άνοιγμα από προεπιλογή"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Σύνδεσμοι ανοίγματος"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Άνοιγμα υποστηριζόμενων συνδέσμων"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Οι υποστηριζόμενοι σύνδεσμοι ανοίγουν σε αυτήν την εφαρμογή"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Σύνδεσμοι για άνοιγμα σε αυτήν την εφαρμογή"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Άνοιγμα χωρίς ερώτηση"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Υποστηριζόμενοι σύνδεσμοι"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Άλλες προεπιλογές"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Άλλες προεπιλεγμένες προτιμήσεις"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Προσθήκη συνδέσμου"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Μια εφαρμογή μπορεί να επαληθεύει συνδέσμους για αυτόματο άνοιγμα στην εφαρμογή. "<annotation id="url">"Μάθετε περισσότερα"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> επαληθευμένοι σύνδεσμοι</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> επαληθευμένος σύνδεσμος</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Αυτοί οι σύνδεσμοι έχουν επαληθευτεί και ανοίγουν αυτόματα σε αυτήν την εφαρμογή.</item>
+      <item quantity="one">Αυτός ο σύνδεσμος έχει επαληθευτεί και ανοίγει αυτόματα σε αυτήν την εφαρμογή.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ΟΚ"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Έλεγχος για άλλους υποστηριζόμενους συνδέσμους…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Ακύρωση"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> υποστηριζόμενοι σύνδεσμοι</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> υποστηριζόμενος σύνδεσμος</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Προσθήκη"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Ανοίγει στην εφαρμογή <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> σε χρήση σε <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"εσωτερικός αποθηκ. χώρος"</string>
     <string name="storage_type_external" msgid="125078274000280821">"εξωτερικός αποθηκ. χώρος"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Δεν επιτρέπεται η χρήση της κάμερας"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Δεν επιτρέπεται η λήψη στιγμιότυπων οθόνης"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Δεν είναι δυνατό το άνοιγμα αυτής της εφαρμογής"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Εάν έχετε απορίες, επικοινωνήστε με τον διαχειριστή IT"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Περισσότερες λεπτομέρειες"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Ο διαχειριστής σας μπορεί να παρακολουθεί και να διαχειρίζεται τις εφαρμογές και τα δεδομένα που σχετίζονται με το προφίλ εργασίας σας, συμπεριλαμβανομένων των ρυθμίσεων, των δικαιωμάτων, της εταιρικής πρόσβασης, της δραστηριότητας δικτύου και των πληροφοριών τοποθεσίας της συσκευής."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Ο διαχειριστής σας μπορεί να παρακολουθεί και να διαχειρίζεται τις εφαρμογές και τα δεδομένα που σχετίζονται με αυτόν το χρήστη, συμπεριλαμβανομένων των ρυθμίσεων, των δικαιωμάτων, της εταιρικής πρόσβασης, της δραστηριότητας δικτύου και των πληροφοριών τοποθεσίας της συσκευής."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 περιορισμός</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Ο υπολογισμός των δεδομένων από την εταιρεία κινητής τηλεφωνίας μπορεί να διαφέρει από τον υπολογισμό της συσκευής"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Εξαιρούνται δεδομένα που χρησιμοποιούνται από δίκτυα εταιρειών κινητής τηλεφωνίας."</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Εξαιρούνται δεδομένα που χρησιμοποιούνται από δίκτυα εταιρειών κινητής τηλεφωνίας."</string>
     <string name="data_used_template" msgid="8229342096562327646">"Χρησιμοποιήθηκαν <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Ορισμός προειδοπ. δεδομένων"</string>
     <string name="data_warning" msgid="2925054658166062884">"Προειδοποίηση δεδομένων"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(απεγκαταστάθηκε για <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(απενεργοποιήθηκε για <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Υπηρεσία αυτόμ. συμπλήρωσης"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"αυτόματη, συμπλήρωση, αυτόματη συμπλήρωση"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Κωδικοί πρόσβασης"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"αυτόματη, συμπλήρωση, αυτόματη συμπλήρωση, κωδικός πρόσβασης"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Βεβαιωθείτε ότι εμπιστεύεστε αυτήν την εφαρμογή&lt;/b&gt;&lt;br/&gt; &lt;br/&gt; &lt;xliff:g Το id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; χρησιμοποιεί το περιεχόμενο της οθόνης σας για να διαπιστώσει τι μπορεί να συμπληρωθεί αυτόματα."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Αυτόματη συμπλήρωση"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Επίπεδο καταγραφής"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Αλλαγή κατάστασης λειτουργίας δικτύου"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Προτιμώμενος τύπος δικτύου"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Εταιρεία κινητής τηλεφωνίας"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Έκδοση ρυθμίσεων"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Έκδοση ρυθμίσεων εταιρείας κινητής τηλεφωνίας"</string>
     <string name="call_category" msgid="641461844504128789">"Κλήση"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Βιντεοκλήση μέσω εταιρείας κινητής τηλεφωνίας"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Επιλογή συστήματος"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Αφαιρέστε τη SIM και τοποθετήστε τη ξανά. Εάν το πρόβλημα δεν επιλυθεί, επανεκκινήστε τη συσκευή σας."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Δοκιμάστε να ενεργοποιήσετε ξανά τη SIM. Εάν το πρόβλημα δεν επιλυθεί, επανεκκινήστε τη συσκευή σας."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ενεργοποίηση δικτύου"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Εναλλαγή εταιρείας κινητής τηλεφωνίας"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Η εταιρεία κινητής τηλεφωνίας <xliff:g id="CARRIER_NAME">%1$s</xliff:g> είναι ενεργή"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Πατήστε για ενημέρωση των ρυθμίσεων SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Έγινε εναλλαγή σε <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Ανενεργή"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Διαδίκτυο"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Κάρτες SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Εμφάνιση δικτύων λειτουργίας πτήσης"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Βρείτε και συνδεθείτε σε δίκτυα κατά τη λειτουργία πτήσης."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Εύρεση και σύνδεση σε δίκτυα Wi‑Fi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"πτήση, ασφαλή για την πτήση"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Κλήσεις και SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Κλήση Wi-Fi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"μη διαθέσιμη"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Προσωρινά μη διαθέσιμη"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Δεν υπάρχει SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Προτιμήσεις"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Προτιμήσεις δικτύου"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Σύνδεση σε δημόσια δίκτυα"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"σύνδεση δικτύου, διαδίκτυο, ασύρματο, δεδομένα, wifi, wi-fi, wi fi, δίκτυο κινητής τηλεφωνίας, κινητό, εταιρεία κινητής τηλεφωνίας, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Προβολή δικτύων λειτουργίας πτήσης"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Προβολή δικτύων λειτουργίας πτήσης"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Ενεργοποίηση δικτύων"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Απενεργοποίηση δικτύων"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Επαναφορά της σύνδεσής σας στο διαδίκτυο;"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Με αυτήν την ενέργεια θα τερματιστεί η τηλεφωνική σας κλήση"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Με αυτήν την ενέργεια θα τερματιστεί η τηλεφωνική σας κλήση"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Γίνεται επαναφορά της σύνδεσής σας στο διαδίκτυο…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Διόρθωση συνδεσιμότητας"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Διαθέσιμα δίκτυα λειτουργίας πτήσης"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Για εναλλαγή δικτύων, αποσυνδέστε το ethernet."</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Δεν είναι δυνατή η εναλλαγή δικτύων όταν είστε συνδεδεμένοι"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Δίκτυα λειτουργίας πτήσης"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Συνδέθηκε"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Δεν θα γίνει αυτόματη σύνδεση στο διαδίκτυο"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Χρώμα"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Άλλα"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Γενικά"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Εμφάνιση όλων των εφαρμογών"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Έξυπνη προώθηση"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Η Έξυπνη προώθηση έχει ενεργοποιηθεί"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Εισαγωγή αριθμού τηλεφώνου"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Ο αριθμός τηλεφώνου απουσιάζει."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ΟΚ"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Να επιτρέπεται το 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Χρήση συνδέσεων κινητής τηλεφωνίας 2G. Για κλήσεις έκτακτης ανάγκης, το 2G είναι πάντα ενεργοποιημένο."</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 7c1f647..818d57a 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Make smaller"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Make larger"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Use auto-rotate"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Face-based auto-rotate uses the front camera to see if and how someone is looking at the screen. It allows for reading while lying down and images are never stored or sent to Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Learn more&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Sample text"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"The Wonderful Wizard of Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Chapter 11: The Wonderful Emerald City of Oz"</string>
@@ -403,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint set up</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Unlock with fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Set up your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Use your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Your fingerprint may be less secure than a strong pattern or PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"You\'re in control"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Bear in mind"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"The data recorded by fingerprint is stored securely and never leaves your phone. You can delete your data at any time in Settings."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Your fingerprint may be less secure than a strong pattern or PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Your phone will occasionally use your recent fingerprint images to create improved fingerprint models."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: You can’t use your fingerprint to unlock this device. For more information, contact your organisation’s admin."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, thanks"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Skip"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continue"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Agree"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Skip"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Next"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Skip fingerprint?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Skip"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Touch the sensor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Touch &amp; hold the fingerprint icon"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"It\'s on the back of your phone. Use your index finger."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"It’s on the screen. Look for the fingerprint with a glowing circle."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"The fingerprint sensor is on your screen. Move your finger across the screen to find it."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustration with device and fingerprint sensor location"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Delete"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Touch the sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Put your finger on the sensor and lift after you feel a vibration"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Lift, then touch again"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Keep lifting your finger to add the different parts of your fingerprint"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingerprint added"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"When you see this icon, use your fingerprint for identification or to approve purchases"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Do it later"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Screen won’t turn off if you’re looking at it"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Off"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Camera access needed"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Tap to manage permissions for Device Personalisation Services"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Prevents your screen from turning off if you’re looking at it"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Screen attention uses the front camera to see if someone is looking at the screen. It works on-device, and images are never stored or sent to Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Turn on screen attention"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"When screen is dark, it turns on for new notifications"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Always show time and info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Increased battery usage"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Bold text"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Bold text"</string>
     <string name="title_font_size" msgid="570613010306330622">"Font size"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM card lock settings"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Other users"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Device storage"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Portable storage"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Allow alarms or reminders to be set"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Allow this app to schedule alarms or other timing-based events. This will allow the app to wake up and run even when you are not using the device. Note that revoking this permission may cause the app to malfunction; specifically, any alarms that the app has scheduled will no longer work."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"schedule, alarm, reminder, event"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> used of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Location services"</string>
     <string name="location_title" msgid="5819154746934945021">"My Location"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Location for work profile"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"App access to location"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Location is off"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> of <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps have access to location</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> of <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> apps has access to location</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Recent location access"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"View details"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"No apps have requested location recently"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"No apps recently accessed location"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"High battery use"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Low battery use"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi and Bluetooth scanning"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Location Services"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Location time zone detection"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Location time zone detection"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Allows the device’s location to be used to detect the current time zone. Other location settings such as Wi‑Fi scanning can affect the accuracy of time zone detection."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"On"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Off"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatic time zone detection is disabled"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatic time zone is off"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Location time zone detection is disabled"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Location time zone detection is not supported"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Location time zone detection changes are not allowed"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Enable"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Clear storage"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Uninstall updates"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"You\'ve chosen to launch this app by default for some actions."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Some activities that you’ve selected open in this app by default."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"You\'ve chosen to allow this app to create widgets and access their data."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"No defaults set."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Clear defaults"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Clear default preferences"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"This app may not be designed for your screen. You can control how it adjusts to your screen here."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Ask when launched"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Scale app"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screen readers"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio and on-screen text"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Captions"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text and display"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Turn screen darker"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduce Brightness"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Reduce brightness"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Make screen darker than your phone’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Make screen darker than your tablet’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Make your screen darker so that it’s more comfortable to read.&lt;br/&gt;&lt;br/&gt; This can be helpful when: &lt;ol&gt; &lt;li&gt; Your phone’s default minimum brightness is still too bright&lt;/li&gt; &lt;li&gt; You’re using your phone in dark situations, like at night or in a dark room before bed&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"face"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"fingerprint, add fingerprint"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"dim screen, touchscreen, battery, smart brightness, dynamic brightness, Auto brightness"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"dim screen, sleep, battery, timeout, attention, display, screen, inactivity"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"rotate, flip, rotation, portrait, landscape, orientation, vertical, horizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, schedule, notifications, block, silence, vibrate, sleep, work, focus, sound, mute, day, weekday, weekend, weeknight, event"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"screen, lock time, timeout, lockscreen"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringtones"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Other sounds and vibrations"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifications"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversation"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Recently sent"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"See all from last 7 days"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Advanced"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Work notifications"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptive notifications"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptive notification priority"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Display in pull-down shade, status bar &amp; on lock screen"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Hide silent notifications in status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blink light"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifications on lock screen"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacy"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Skip lock screen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"After face unlock, go directly to last used screen"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Skip, Bypass"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notification per week</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Never"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Notification access"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Device &amp; app notifications"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Control which notifications show on your apps and devices"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Access to work profile notifications is blocked"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Apps cannot read notifications"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Turn off"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"cancel"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Allowed notification types"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Important ongoing notifications"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Conversation notifications"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Alerting notifications"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Silent notifications"</string>
-    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Apps that are not bridged to this listener"</string>
-    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"All apps are bridged"</string>
-    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
-      <item quantity="other">%d apps are not bridged</item>
-      <item quantity="one">%d app is not bridged</item>
-    </plurals>
-    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Bridged apps"</string>
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Real-time"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Real-time communication from apps in use, navigation, phone calls and more"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Conversations"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS and other communications"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Default"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Notifications that may ring or vibrate based on settings"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Silent"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Notifications that never make sound or vibrations"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"See all apps"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Change notification settings for each app that can send notifications"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Apps shown on device"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR helper services"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"No installed apps have requested to be run as VR helper services."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Allow VR service access for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Open by default"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Opening links"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Open supported links"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Supported links open in this app"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Links to open in this app"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Open without asking"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Supported links"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Other defaults"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Other default preferences"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Add link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"An app can verify links to automatically open in the app. "<annotation id="url">"Learn more"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> verified links</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> verified link</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">These links are verified and automatically open in this app.</item>
+      <item quantity="one">This link is verified and automatically opens in this app.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Checking for other supported links…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Cancel"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> supported links</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> supported link</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Add"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Opens in <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> used in <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"internal storage"</string>
     <string name="storage_type_external" msgid="125078274000280821">"external storage"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Camera not allowed"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Screenshot not allowed"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Can’t open this app"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"If you have any questions, contact your IT admin"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"More details"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Your admin can monitor and manage apps and data associated with your work profile, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Your admin can monitor and manage apps and data associated with this user, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="one">1 restriction</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operator data accounting may differ from device accounting"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excludes data that is used by operator networks"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Excludes data used by operator networks"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Set data warning"</string>
     <string name="data_warning" msgid="2925054658166062884">"Data warning"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(uninstalled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Auto-fill service"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"auto, fill, auto-fill"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Passwords"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"auto, fill, autofill, password"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Make sure that you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Auto-fill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be auto-filled."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Auto-fill"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Logging level"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Change the network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferred network type"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Settings version"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operator settings version"</string>
     <string name="call_category" msgid="641461844504128789">"Calling"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operator video calling"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"System select"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Network activation"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operator switching"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is active"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tap to update SIM settings"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Switched to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Show aeroplane mode networks"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Find and connect to networks in aeroplane mode."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Find and connect to Wi‑Fi networks"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"unavailable"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporarily unavailable"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Network preferences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"View aeroplane mode networks"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Viewing aeroplane mode networks"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Turn on networks"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Turn off networks"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Reset your Internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"This will end your phone call"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"This will end your phone call"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Resetting your Internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Fix connectivity"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Aeroplane mode networks available"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"To switch networks, disconnect Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Cannot switch networks while connected"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Aeroplane mode networks"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet won\'t auto‑connect"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Colour"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Others"</string>
     <string name="category_name_general" msgid="7737273712848115886">"General"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"See all apps"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart forwarding"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart forwarding enabled"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Enter phone number"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Phone number is missing."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Allow 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Use 2G mobile connections. For emergency calls, 2G is always turned on."</string>
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index df6900e..5aa3aa5 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Make smaller"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Make larger"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Use auto-rotate"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Face-based auto-rotate uses the front camera to see if and how someone is looking at the screen. It allows for reading while lying down and images are never stored or sent to Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Learn more&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Sample text"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"The Wonderful Wizard of Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Chapter 11: The Wonderful Emerald City of Oz"</string>
@@ -403,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint set up</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Unlock with fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Set up your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Use your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Your fingerprint may be less secure than a strong pattern or PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"You\'re in control"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Bear in mind"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"The data recorded by fingerprint is stored securely and never leaves your phone. You can delete your data at any time in Settings."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Your fingerprint may be less secure than a strong pattern or PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Your phone will occasionally use your recent fingerprint images to create improved fingerprint models."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: You can’t use your fingerprint to unlock this device. For more information, contact your organisation’s admin."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, thanks"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Skip"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continue"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Agree"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Skip"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Next"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Skip fingerprint?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Skip"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Touch the sensor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Touch &amp; hold the fingerprint icon"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"It\'s on the back of your phone. Use your index finger."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"It’s on the screen. Look for the fingerprint with a glowing circle."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"The fingerprint sensor is on your screen. Move your finger across the screen to find it."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustration with device and fingerprint sensor location"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Delete"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Touch the sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Put your finger on the sensor and lift after you feel a vibration"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Lift, then touch again"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Keep lifting your finger to add the different parts of your fingerprint"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingerprint added"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"When you see this icon, use your fingerprint for identification or to approve purchases"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Do it later"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Screen won’t turn off if you’re looking at it"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Off"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Camera access needed"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Tap to manage permissions for Device Personalisation Services"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Prevents your screen from turning off if you’re looking at it"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Screen attention uses the front camera to see if someone is looking at the screen. It works on-device, and images are never stored or sent to Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Turn on screen attention"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"When screen is dark, it turns on for new notifications"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Always show time and info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Increased battery usage"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Bold text"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Bold text"</string>
     <string name="title_font_size" msgid="570613010306330622">"Font size"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM card lock settings"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Other users"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Device storage"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Portable storage"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Allow alarms or reminders to be set"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Allow this app to schedule alarms or other timing-based events. This will allow the app to wake up and run even when you are not using the device. Note that revoking this permission may cause the app to malfunction; specifically, any alarms that the app has scheduled will no longer work."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"schedule, alarm, reminder, event"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> used of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Location services"</string>
     <string name="location_title" msgid="5819154746934945021">"My Location"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Location for work profile"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"App access to location"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Location is off"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> of <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps have access to location</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> of <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> apps has access to location</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Recent location access"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"View details"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"No apps have requested location recently"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"No apps recently accessed location"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"High battery use"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Low battery use"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi and Bluetooth scanning"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Location Services"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Location time zone detection"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Location time zone detection"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Allows the device’s location to be used to detect the current time zone. Other location settings such as Wi‑Fi scanning can affect the accuracy of time zone detection."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"On"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Off"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatic time zone detection is disabled"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatic time zone is off"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Location time zone detection is disabled"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Location time zone detection is not supported"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Location time zone detection changes are not allowed"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Enable"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Clear storage"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Uninstall updates"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"You\'ve chosen to launch this app by default for some actions."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Some activities that you’ve selected open in this app by default."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"You\'ve chosen to allow this app to create widgets and access their data."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"No defaults set."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Clear defaults"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Clear default preferences"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"This app may not be designed for your screen. You can control how it adjusts to your screen here."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Ask when launched"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Scale app"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screen readers"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio and on-screen text"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Captions"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text and display"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Turn screen darker"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduce Brightness"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Reduce brightness"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Make screen darker than your phone’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Make screen darker than your tablet’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Make your screen darker so that it’s more comfortable to read.&lt;br/&gt;&lt;br/&gt; This can be helpful when: &lt;ol&gt; &lt;li&gt; Your phone’s default minimum brightness is still too bright&lt;/li&gt; &lt;li&gt; You’re using your phone in dark situations, like at night or in a dark room before bed&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"face"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"fingerprint, add fingerprint"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"dim screen, touchscreen, battery, smart brightness, dynamic brightness, Auto brightness"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"dim screen, sleep, battery, timeout, attention, display, screen, inactivity"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"rotate, flip, rotation, portrait, landscape, orientation, vertical, horizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, schedule, notifications, block, silence, vibrate, sleep, work, focus, sound, mute, day, weekday, weekend, weeknight, event"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"screen, lock time, timeout, lockscreen"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringtones"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Other sounds and vibrations"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifications"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversation"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Recently sent"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"See all from last 7 days"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Advanced"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Work notifications"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptive notifications"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptive notification priority"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Display in pull-down shade, status bar &amp; on lock screen"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Hide silent notifications in status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blink light"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifications on lock screen"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacy"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Skip lock screen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"After face unlock, go directly to last used screen"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Skip, Bypass"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notification per week</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Never"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Notification access"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Device &amp; app notifications"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Control which notifications show on your apps and devices"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Access to work profile notifications is blocked"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Apps cannot read notifications"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Turn off"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"cancel"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Allowed notification types"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Important ongoing notifications"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Conversation notifications"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Alerting notifications"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Silent notifications"</string>
-    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Apps that are not bridged to this listener"</string>
-    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"All apps are bridged"</string>
-    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
-      <item quantity="other">%d apps are not bridged</item>
-      <item quantity="one">%d app is not bridged</item>
-    </plurals>
-    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Bridged apps"</string>
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Real-time"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Real-time communication from apps in use, navigation, phone calls and more"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Conversations"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS and other communications"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Default"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Notifications that may ring or vibrate based on settings"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Silent"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Notifications that never make sound or vibrations"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"See all apps"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Change notification settings for each app that can send notifications"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Apps shown on device"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR helper services"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"No installed apps have requested to be run as VR helper services."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Allow VR service access for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Open by default"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Opening links"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Open supported links"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Supported links open in this app"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Links to open in this app"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Open without asking"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Supported links"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Other defaults"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Other default preferences"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Add link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"An app can verify links to automatically open in the app. "<annotation id="url">"Learn more"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> verified links</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> verified link</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">These links are verified and automatically open in this app.</item>
+      <item quantity="one">This link is verified and automatically opens in this app.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Checking for other supported links…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Cancel"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> supported links</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> supported link</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Add"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Opens in <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> used in <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"internal storage"</string>
     <string name="storage_type_external" msgid="125078274000280821">"external storage"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Camera not allowed"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Screenshot not allowed"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Can’t open this app"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"If you have any questions, contact your IT admin"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"More details"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Your admin can monitor and manage apps and data associated with your work profile, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Your admin can monitor and manage apps and data associated with this user, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="one">1 restriction</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Carrier data accounting may differ from device accounting"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excludes data that is used by operator networks"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Excludes data used by operator networks"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Set data warning"</string>
     <string name="data_warning" msgid="2925054658166062884">"Data warning"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(uninstalled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Auto-fill service"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"auto, fill, auto-fill"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Passwords"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"auto, fill, autofill, password"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Make sure that you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Auto-fill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be auto-filled."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Auto-fill"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Logging level"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Change the network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferred network type"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Carrier"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Settings version"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operator settings version"</string>
     <string name="call_category" msgid="641461844504128789">"Calling"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operator video calling"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"System select"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Network activation"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operator switching"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is active"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tap to update SIM settings"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Switched to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Show aeroplane mode networks"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Find and connect to networks in aeroplane mode."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Find and connect to Wi‑Fi networks"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"unavailable"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporarily unavailable"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Network preferences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"View aeroplane mode networks"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Viewing aeroplane mode networks"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Turn on networks"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Turn off networks"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Reset your Internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"This will end your phone call"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"This will end your phone call"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Resetting your Internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Fix connectivity"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Aeroplane mode networks available"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"To switch networks, disconnect Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Cannot switch networks while connected"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Aeroplane mode networks"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet won\'t auto‑connect"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Colour"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Others"</string>
     <string name="category_name_general" msgid="7737273712848115886">"General"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"See all apps"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart forwarding"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart forwarding enabled"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Enter phone number"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Phone number is missing."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Allow 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Use 2G mobile connections. For emergency calls, 2G is always turned on."</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 59c5b47..356c174 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Make smaller"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Make larger"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Use auto-rotate"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Face-based auto-rotate uses the front camera to see if and how someone is looking at the screen. It allows for reading while lying down and images are never stored or sent to Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Learn more&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Sample text"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"The Wonderful Wizard of Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Chapter 11: The Wonderful Emerald City of Oz"</string>
@@ -403,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint set up</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Unlock with fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Set up your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Use your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Your fingerprint may be less secure than a strong pattern or PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"You\'re in control"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Bear in mind"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"The data recorded by fingerprint is stored securely and never leaves your phone. You can delete your data at any time in Settings."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Your fingerprint may be less secure than a strong pattern or PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Your phone will occasionally use your recent fingerprint images to create improved fingerprint models."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: You can’t use your fingerprint to unlock this device. For more information, contact your organisation’s admin."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, thanks"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Skip"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continue"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Agree"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Skip"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Next"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Skip fingerprint?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Skip"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Touch the sensor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Touch &amp; hold the fingerprint icon"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"It’s on the back of your phone. Use your index finger."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"It’s on the screen. Look for the fingerprint with a glowing circle."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"The fingerprint sensor is on your screen. Move your finger across the screen to find it."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustration with device and fingerprint sensor location"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Delete"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Touch the sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Put your finger on the sensor and lift after you feel a vibration"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Lift, then touch again"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Keep lifting your finger to add the different parts of your fingerprint"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingerprint added"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"When you see this icon, use your fingerprint for identification or to approve purchases"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Do it later"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Screen won’t turn off if you’re looking at it"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Off"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Camera access needed"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Tap to manage permissions for Device Personalisation Services"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Prevents your screen from turning off if you’re looking at it"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Screen attention uses the front camera to see if someone is looking at the screen. It works on-device, and images are never stored or sent to Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Turn on screen attention"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"When screen is dark, it turns on for new notifications"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Always show time and info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Increased battery usage"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Bold text"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Bold text"</string>
     <string name="title_font_size" msgid="570613010306330622">"Font size"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM card lock settings"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Other users"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Device storage"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Portable storage"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Allow alarms or reminders to be set"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Allow this app to schedule alarms or other timing-based events. This will allow the app to wake up and run even when you are not using the device. Note that revoking this permission may cause the app to malfunction; specifically, any alarms that the app has scheduled will no longer work."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"schedule, alarm, reminder, event"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> used of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Location services"</string>
     <string name="location_title" msgid="5819154746934945021">"My Location"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Location for work profile"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"App access to location"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Location is off"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> of <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps have access to location</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> of <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> apps has access to location</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Recent location access"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"View details"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"No apps have requested location recently"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"No apps recently accessed location"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"High battery use"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Low battery use"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi and Bluetooth scanning"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Location Services"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Location time zone detection"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Location time zone detection"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Allows the device’s location to be used to detect the current time zone. Other location settings such as Wi‑Fi scanning can affect the accuracy of time zone detection."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"On"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Off"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatic time zone detection is disabled"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatic time zone is off"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Location time zone detection is disabled"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Location time zone detection is not supported"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Location time zone detection changes are not allowed"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Enable"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Clear storage"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Uninstall updates"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"You\'ve chosen to launch this app by default for some actions."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Some activities that you’ve selected open in this app by default."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"You\'ve chosen to allow this app to create widgets and access their data."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"No defaults set."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Clear defaults"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Clear default preferences"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"This app may not be designed for your screen. You can control how it adjusts to your screen here."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Ask when launched"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Scale app"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screen readers"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio and on-screen text"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Captions"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text and display"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Turn screen darker"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduce Brightness"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Reduce brightness"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Make screen darker than your phone’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Make screen darker than your tablet’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Make your screen darker so that it’s more comfortable to read.&lt;br/&gt;&lt;br/&gt; This can be helpful when: &lt;ol&gt; &lt;li&gt; Your phone’s default minimum brightness is still too bright&lt;/li&gt; &lt;li&gt; You’re using your phone in dark situations, like at night or in a dark room before bed&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"face"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"fingerprint, add fingerprint"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"dim screen, touchscreen, battery, smart brightness, dynamic brightness, Auto brightness"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"dim screen, sleep, battery, timeout, attention, display, screen, inactivity"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"rotate, flip, rotation, portrait, landscape, orientation, vertical, horizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, schedule, notifications, block, silence, vibrate, sleep, work, focus, sound, mute, day, weekday, weekend, weeknight, event"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"screen, lock time, timeout, lockscreen"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringtones"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Other sounds and vibrations"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifications"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversation"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Recently sent"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"See all from last 7 days"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Advanced"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Work notifications"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptive notifications"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptive notification priority"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Display in pull-down shade, status bar &amp; on lock screen"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Hide silent notifications in status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blink light"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifications on lock screen"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacy"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Skip lock screen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"After face unlock, go directly to last used screen"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Skip, Bypass"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notification per week</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Never"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Notification access"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Device &amp; app notifications"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Control which notifications show on your apps and devices"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Access to work profile notifications is blocked"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Apps cannot read notifications"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Turn off"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"cancel"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Allowed notification types"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Important ongoing notifications"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Conversation notifications"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Alerting notifications"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Silent notifications"</string>
-    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Apps that are not bridged to this listener"</string>
-    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"All apps are bridged"</string>
-    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
-      <item quantity="other">%d apps are not bridged</item>
-      <item quantity="one">%d app is not bridged</item>
-    </plurals>
-    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Bridged apps"</string>
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Real-time"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Real-time communication from apps in use, navigation, phone calls and more"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Conversations"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS and other communications"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Default"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Notifications that may ring or vibrate based on settings"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Silent"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Notifications that never make sound or vibrations"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"See all apps"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Change notification settings for each app that can send notifications"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Apps shown on device"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR helper services"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"No installed apps have requested to be run as VR helper services."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Allow VR service access for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Open by default"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Opening links"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Open supported links"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Supported links open in this app"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Links to open in this app"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Open without asking"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Supported links"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Other defaults"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Other default preferences"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Add link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"An app can verify links to automatically open in the app. "<annotation id="url">"Learn more"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> verified links</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> verified link</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">These links are verified and automatically open in this app.</item>
+      <item quantity="one">This link is verified and automatically opens in this app.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Checking for other supported links…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Cancel"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> supported links</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> supported link</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Add"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Opens in <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> used in <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"internal storage"</string>
     <string name="storage_type_external" msgid="125078274000280821">"external storage"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Camera not allowed"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Screenshot not allowed"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Can’t open this app"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"If you have any questions, contact your IT admin"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"More details"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Your admin can monitor and manage apps and data associated with your work profile, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Your admin can monitor and manage apps and data associated with this user, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="one">1 restriction</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operator data accounting may differ from device accounting"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excludes data that is used by operator networks"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Excludes data used by operator networks"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Set data warning"</string>
     <string name="data_warning" msgid="2925054658166062884">"Data warning"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(uninstalled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Auto-fill service"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"auto, fill, auto-fill"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Passwords"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"auto, fill, autofill, password"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Make sure that you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Auto-fill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be auto-filled."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Auto-fill"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Logging level"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Change the network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferred network type"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Settings version"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operator settings version"</string>
     <string name="call_category" msgid="641461844504128789">"Calling"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operator video calling"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"System select"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Network activation"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operator switching"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is active"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tap to update SIM settings"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Switched to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Show aeroplane mode networks"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Find and connect to networks in aeroplane mode."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Find and connect to Wi‑Fi networks"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"unavailable"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporarily unavailable"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Network preferences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"View aeroplane mode networks"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Viewing aeroplane mode networks"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Turn on networks"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Turn off networks"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Reset your Internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"This will end your phone call"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"This will end your phone call"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Resetting your Internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Fix connectivity"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Aeroplane mode networks available"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"To switch networks, disconnect Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Cannot switch networks while connected"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Aeroplane mode networks"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet won\'t auto‑connect"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Colour"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Others"</string>
     <string name="category_name_general" msgid="7737273712848115886">"General"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"See all apps"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart forwarding"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart forwarding enabled"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Enter phone number"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Phone number is missing."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Allow 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Use 2G mobile connections. For emergency calls, 2G is always turned on."</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 378a4cb..9de46bb 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Make smaller"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Make larger"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Use auto-rotate"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Face-based auto-rotate uses the front camera to see if and how someone is looking at the screen. It allows for reading while lying down and images are never stored or sent to Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Learn more&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Sample text"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"The Wonderful Wizard of Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Chapter 11: The Wonderful Emerald City of Oz"</string>
@@ -403,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingerprint set up</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Unlock with fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Set up your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Use your fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Just touch the fingerprint sensor to unlock your phone, authorise purchases or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Your fingerprint may be less secure than a strong pattern or PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"You\'re in control"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Bear in mind"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"The data recorded by fingerprint is stored securely and never leaves your phone. You can delete your data at any time in Settings."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Your fingerprint may be less secure than a strong pattern or PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Your phone will occasionally use your recent fingerprint images to create improved fingerprint models."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: You can’t use your fingerprint to unlock this device. For more information, contact your organisation’s admin."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, thanks"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Skip"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continue"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Agree"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Skip"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Next"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Skip fingerprint?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Skip"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Cancel"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Touch the sensor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Touch &amp; hold the fingerprint icon"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"It’s on the back of your phone. Use your index finger."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"It’s on the screen. Look for the fingerprint with a glowing circle."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"The fingerprint sensor is on your screen. Move your finger across the screen to find it."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustration with device and fingerprint sensor location"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Name"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Delete"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Touch the sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Put your finger on the sensor and lift after you feel a vibration"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Lift, then touch again"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Keep lifting your finger to add the different parts of your fingerprint"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingerprint added"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"When you see this icon, use your fingerprint for identification or to approve purchases"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Do it later"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Screen won’t turn off if you’re looking at it"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Off"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Camera access needed"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Tap to manage permissions for Device Personalisation Services"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Prevents your screen from turning off if you’re looking at it"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Screen attention uses the front camera to see if someone is looking at the screen. It works on device and images are never stored or sent to Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Turn on screen attention"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"When screen is dark, it turns on for new notifications"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Always show time and info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Increased battery usage"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Bold text"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Bold text"</string>
     <string name="title_font_size" msgid="570613010306330622">"Font size"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM card lock settings"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Other users"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Device storage"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Portable storage"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Allow alarms or reminders to be set"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarms and reminders"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Allow this app to schedule alarms or other timing-based events. This will allow the app to wake up and run even when you are not using the device. Note that revoking this permission may cause the app to malfunction; specifically, any alarms that the app has scheduled will no longer work."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"schedule, alarm, reminder, event"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> used of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Used of <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Location services"</string>
     <string name="location_title" msgid="5819154746934945021">"My Location"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Location for work profile"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"App access to location"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Location is off"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> of <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps have access to location</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> of <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> apps has access to location</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Recent location access"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"View details"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"No apps have requested location recently"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"No apps recently accessed location"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"High battery use"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Low battery use"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi and Bluetooth scanning"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Location Services"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Location time zone detection"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Location time zone detection"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Allows the device’s location to be used to detect the current time zone. Other location settings such as Wi‑Fi scanning can affect the accuracy of time zone detection."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"On"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Off"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatic time zone detection is disabled"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatic time zone is off"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Location time zone detection is disabled"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Location time zone detection is not supported"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Location time zone detection changes are not allowed"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Enable"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Clear storage"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Uninstall updates"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"You\'ve chosen to launch this app by default for some actions."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Some activities that you’ve selected open in this app by default."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"You\'ve chosen to allow this app to create widgets and access their data."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"No defaults set."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Clear defaults"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Clear default preferences"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"This app may not be designed for your screen. You can control how it adjusts to your screen here."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Ask when launched"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Scale app"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Change font size"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screen readers"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio and on-screen text"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Captions"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text and display"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Turn screen darker"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduce Brightness"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Reduce brightness"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Make screen darker than your phone’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Make screen darker than your tablet’s minimum brightness"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Make your screen darker so that it’s more comfortable to read.&lt;br/&gt;&lt;br/&gt; This can be helpful when: &lt;ol&gt; &lt;li&gt; Your phone’s default minimum brightness is still too bright&lt;/li&gt; &lt;li&gt; You’re using your phone in dark situations, like at night or in a dark room before bed&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"face"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"fingerprint, add fingerprint"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"dim screen, touchscreen, battery, smart brightness, dynamic brightness, Auto brightness"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"dim screen, sleep, battery, timeout, attention, display, screen, inactivity"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"rotate, flip, rotation, portrait, landscape, orientation, vertical, horizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, schedule, notifications, block, silence, vibrate, sleep, work, focus, sound, mute, day, weekday, weekend, weeknight, event"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"screen, lock time, timeout, lock screen"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringtones"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Other sounds and vibrations"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifications"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversation"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Recently sent"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"See all from last 7 days"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Advanced"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Work notifications"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptive notifications"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptive notification priority"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Display in pull-down shade, status bar &amp; on lock screen"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Hide silent notifications in status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blink light"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifications on lock screen"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacy"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Skip lock screen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"After face unlock, go directly to last used screen"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Skip, Bypass"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notification per week</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Never"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Notification access"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Device &amp; app notifications"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Control which notifications show on your apps and devices"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Access to work profile notifications is blocked"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Apps cannot read notifications"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Turn off"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"cancel"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Allowed notification types"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Important ongoing notifications"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Conversation notifications"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Alerting notifications"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Silent notifications"</string>
-    <string name="notif_listener_excluded_title" msgid="639103158747320529">"Apps that are not bridged to this listener"</string>
-    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"All apps are bridged"</string>
-    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
-      <item quantity="other">%d apps are not bridged</item>
-      <item quantity="one">%d app is not bridged</item>
-    </plurals>
-    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"Bridged apps"</string>
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Real-time"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Real-time communication from apps in use, navigation, phone calls and more"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Conversations"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS and other communications"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Default"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Notifications that may ring or vibrate based on settings"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Silent"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Notifications that never make sound or vibrations"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"See all apps"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Change notification settings for each app that can send notifications"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Apps shown on device"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR helper services"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"No installed apps have requested to be run as VR helper services."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Allow VR service access for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Open by default"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Opening links"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Open supported links"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Supported links open in this app"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Links to open in this app"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Open without asking"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Supported links"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Other defaults"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Other default preferences"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Add link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"An app can verify links to automatically open in the app. "<annotation id="url">"Learn more"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> verified links</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> verified link</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">These links are verified and automatically open in this app.</item>
+      <item quantity="one">This link is verified and automatically opens in this app.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Checking for other supported links…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Cancel"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> supported links</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> supported link</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Add"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Opens in <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> used in <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"internal storage"</string>
     <string name="storage_type_external" msgid="125078274000280821">"external storage"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Camera not allowed"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Screenshot not allowed"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Can’t open this app"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"If you have any questions, contact your IT admin"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"More details"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Your admin can monitor and manage apps and data associated with your work profile, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Your admin can monitor and manage apps and data associated with this user, including settings, permissions, corporate access, network activity and the device\'s location information."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="one">1 restriction</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operator data accounting may differ from device accounting"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excludes data that is used by operator networks"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Excludes data used by operator networks"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Set data warning"</string>
     <string name="data_warning" msgid="2925054658166062884">"Data warning"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(uninstalled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Auto-fill service"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"auto, fill, auto-fill"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Passwords"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"auto, fill, autofill, password"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Make sure that you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Auto-fill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be auto-filled."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Auto-fill"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Logging level"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Change the network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferred network type"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Settings version"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operator settings version"</string>
     <string name="call_category" msgid="641461844504128789">"Calling"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operator video calling"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"System select"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Network activation"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operator switching"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is active"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tap to update SIM settings"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Switched to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Show aeroplane mode networks"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Find and connect to networks in aeroplane mode."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Find and connect to Wi‑Fi networks"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"unavailable"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporarily unavailable"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Network preferences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"View aeroplane mode networks"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Viewing aeroplane mode networks"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Turn on networks"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Turn off networks"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Reset your Internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"This will end your phone call"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"This will end your phone call"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Resetting your Internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Fix connectivity"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Aeroplane mode networks available"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"To switch networks, disconnect Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Cannot switch networks while connected"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Aeroplane mode networks"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connected"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet won\'t auto‑connect"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Colour"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Others"</string>
     <string name="category_name_general" msgid="7737273712848115886">"General"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"See all apps"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart forwarding"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart forwarding enabled"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Enter phone number"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Phone number is missing."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Allow 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Use 2G mobile connections. For emergency calls, 2G is always turned on."</string>
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 8c12c8d..55acaf0 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -53,7 +53,7 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎Make smaller‎‏‎‎‏‎"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‎‎‏‏‏‎Make larger‎‏‎‎‏‎"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‏‎Use Auto-Rotate‎‏‎‎‏‎"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‎‎Face based Autorotate uses the front camera to see if and how someone is looking at the screen. It allows for reading while lying down and images are never stored or sent to Google.&lt;br&gt;&lt;br&gt; &lt;a href=‎‏‎‎‏‏‎<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>‎‏‎‎‏‏‏‎&gt;Learn more&lt;/a&gt;‎‏‎‎‏‎"</string>
+    <string name="smart_rotate_text_headline" msgid="4775952278533715352">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎Face Detection uses the front-facing camera to improve Auto-Rotate accuracy. Images are never stored or sent to Google.&lt;br&gt;&lt;br&gt; &lt;a href=‎‏‎‎‏‏‎<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>‎‏‎‎‏‏‏‎&gt;Learn more&lt;/a&gt;‎‏‎‎‏‎"</string>
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‎‎Sample text‎‏‎‎‏‎"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‎The Wonderful Wizard of Oz‎‏‎‎‏‎"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎Chapter 11: The Wonderful Emerald City of Oz‎‏‎‎‏‎"</string>
@@ -403,15 +403,21 @@
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ fingerprint set up‎‏‎‎‏‎</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎Unlock with fingerprint‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‏‏‎‎Set up your fingerprint‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‎Use your fingerprint‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‏‎Just touch the fingerprint sensor to unlock your phone, authorize purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.‎‏‎‎‏‎"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎Your fingerprint may be less secure than a strong pattern or PIN.‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎You’re in control‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‏‎‎Keep in mind‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎The data recorded by Fingerprint is stored securely and never leaves your phone. You can delete your data anytime in Settings.‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎Your fingerprint may be less secure than a strong pattern or PIN.‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎Your phone will occasionally use your recent fingerprint images to create improved fingerprint models.‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‎Use your fingerprint to unlock your phone or approve purchases.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Note: You can’t use your fingerprint to unlock this device. For more information, contact your organization’s admin.‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎Use your fingerprint to unlock your phone or approve purchases.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Note: Your fingerprint may be less secure than a strong pattern or PIN.‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎Cancel‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎No thanks‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎Skip‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‎‏‏‏‎‏‎‎‎‎‎Continue‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎Agree‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎Skip‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎Next‎‏‎‎‏‎"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎‎‎Skip fingerprint?‎‏‎‎‏‎"</string>
@@ -428,16 +434,21 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎Skip‎‏‎‎‏‎"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‎Cancel‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎Touch the sensor‎‏‎‎‏‎"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‏‏‏‏‎Touch &amp; hold the fingerprint icon‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‎It’s on the back of your phone. Use your index finger.‎‏‎‎‏‎"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎It’s on the screen. Look for the fingerprint with a glowing circle.‎‏‎‎‏‎"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‎‎The fingerprint sensor is on your screen. Move your finger across the screen to find it.‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎Illustration with device and fingerprint sensor location‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎Name‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‎OK‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‏‎Delete‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎Touch the sensor‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎‎Put your finger on the sensor and lift after you feel a vibration‎‏‎‎‏‎"</string>
+    <string name="security_settings_udfps_enroll_start_message" msgid="8857415507387969667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‎‎‎‎‏‏‎Each time you touch, keep your finger on the icon until you feel a vibration‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎Lift, then touch again‎‏‎‎‏‎"</string>
+    <string name="security_settings_udfps_enroll_title_one_more_time" msgid="424937043843482410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎One more time‎‏‎‎‏‎"</string>
+    <string name="security_settings_udfps_enroll_repeat_title_touch_icon" msgid="3927493571554716278">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‎Touch the fingerprint icon as it moves‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎Keep lifting your finger to add the different parts of your fingerprint‎‏‎‎‏‎"</string>
+    <string name="security_settings_udfps_enroll_repeat_message" msgid="5871443926818416176">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‎‎‎This helps capture your full fingerprint‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎Fingerprint added‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‏‎When you see this icon, use your fingerprint for identification or to approve purchases‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎Do it later‎‏‎‎‏‎"</string>
@@ -1222,7 +1233,8 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎On / Screen won’t turn off if you’re looking at it‎‏‎‎‏‎"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎Off‎‏‎‎‏‎"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎Camera access needed‎‏‎‎‏‎"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎Tap to manage permissions for Device Personalization Services‎‏‎‎‏‎"</string>
+    <string name="adaptive_sleep_summary_no_permission" msgid="5822591289468803691">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‏‎‏‏‎Camera access is required for screen attention. Tap to manage permissions for Device Personalization Services‎‏‎‎‏‎"</string>
+    <string name="adaptive_sleep_manage_permission_button" msgid="1404510197847664846">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎Manage permissions‎‏‎‎‏‎"</string>
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‎Prevents your screen from turning off if you’re looking at it‎‏‎‎‏‎"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎Screen attention uses the front camera to see if someone is looking at the screen. It works on device, and images are never stored or sent to Google.‎‏‎‎‏‎"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎Turn on screen attention‎‏‎‎‏‎"</string>
@@ -1303,7 +1315,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎When screen is dark, it turns on for new notifications‎‏‎‎‏‎"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎Always show time and info‎‏‎‎‏‎"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‎‎‎Increased battery usage‎‏‎‎‏‎"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎Bold Text‎‏‎‎‏‎"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎Bold text‎‏‎‎‏‎"</string>
     <string name="title_font_size" msgid="570613010306330622">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎Font size‎‏‎‎‏‎"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‏‎Make text larger or smaller‎‏‎‎‏‎"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‎SIM card lock settings‎‏‎‎‏‎"</string>
@@ -1472,6 +1484,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎Other users‎‏‎‎‏‎"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎Device storage‎‏‎‎‏‎"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‎Portable storage‎‏‎‎‏‎"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎Alarms and reminders‎‏‎‎‏‎"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‎‏‏‎Allow to set alarms or reminders‎‏‎‎‏‎"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‎‎‎Alarms and reminders‎‏‎‎‏‎"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎Allow this app to schedule alarms or other timing based events. This will allow the app to wake up and run even when you are not using the device. Note that revoking this permission may cause the app to malfunction, specifically any alarms that the app has scheduled will no longer work.‎‏‎‎‏‎"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎schedule, alarm, reminder, event‎‏‎‎‏‎"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="USED">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used of ‎‏‎‎‏‏‎<xliff:g id="TOTAL">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<small>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<small>"‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎<xliff:g id="UNIT">^2</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"</small>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"</small>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎Used of ‎‏‎‎‏‏‎<xliff:g id="TOTAL">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -1721,30 +1738,27 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎Location services‎‏‎‎‏‎"</string>
     <string name="location_title" msgid="5819154746934945021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‎My Location‎‏‎‎‏‎"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎‎Location for work profile‎‏‎‎‏‎"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‎‎App access to location‎‏‎‎‏‎"</string>
+    <string name="location_app_level_permissions" msgid="2564952469115758172">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎Manage location permissions‎‏‎‎‏‎"</string>
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎Location is off‎‏‎‎‏‎"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎ ‎‏‎‎‏‏‎<xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>‎‏‎‎‏‏‏‎ of ‎‏‎‎‏‏‎<xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g>‎‏‎‎‏‏‏‎ apps have access to location‎‏‎‎‏‎</item>
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎ ‎‏‎‎‏‏‎<xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g>‎‏‎‎‏‏‏‎ of ‎‏‎‎‏‏‎<xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g>‎‏‎‎‏‏‏‎ apps has access to location‎‏‎‎‏‎</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‎‏‎‏‎Recent location access‎‏‎‎‏‎"</string>
+    <string name="location_category_recent_location_access" msgid="5714810433940253725">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎Past 24 hour access‎‏‎‎‏‎"</string>
+    <string name="location_recent_location_access_see_all" msgid="4203102419355323325">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎See all‎‏‎‎‏‎"</string>
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‎‎View details‎‏‎‎‏‎"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎No apps have requested location recently‎‏‎‎‏‎"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎No apps recently accessed location‎‏‎‎‏‎"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎High battery use‎‏‎‎‏‎"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎Low battery use‎‏‎‎‏‎"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎Wi‑Fi and Bluetooth scanning‎‏‎‎‏‎"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‎‏‎‏‎‎Wi‑Fi scanning‎‏‎‎‏‎"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‎‎Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services.‎‏‎‎‏‎"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎Bluetooth scanning‎‏‎‎‏‎"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‎‏‎Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services.‎‏‎‎‏‎"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‎Location Services‎‏‎‎‏‎"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‎Location services for work‎‏‎‎‏‎"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‎‏‎Location time zone detection‎‏‎‎‏‎"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎Location time zone detection‎‏‎‎‏‎"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎Allows the device’s location to be used to detect the current time zone. Other location settings such as Wi‑Fi scanning can affect the accuracy of time zone detection.‎‏‎‎‏‎"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎On‎‏‎‎‏‎"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‎Off‎‏‎‎‏‎"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎Automatic time zone detection is disabled‎‏‎‎‏‎"</string>
+    <string name="location_time_zone_detection_toggle_title" msgid="6518338597250564260">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎Use location to set time zone‎‏‎‎‏‎"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‎‎‎‎Automatic time zone is off‎‏‎‎‏‎"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‎Location time zone detection is disabled‎‏‎‎‏‎"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‎‎‏‎‏‎Location time zone detection is not supported‎‏‎‎‏‎"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎Location time zone detection changes are not allowed‎‏‎‎‏‎"</string>
@@ -1923,10 +1937,10 @@
     <string name="enable_text" msgid="8570798764647110430">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎Enable‎‏‎‎‏‎"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎Clear storage‎‏‎‎‏‎"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎Uninstall updates‎‏‎‎‏‎"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‎‏‎‏‏‎‎You’ve chosen to launch this app by default for some actions.‎‏‎‎‏‎"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎Some activities you’ve selected open in this app by default.‎‏‎‎‏‎"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‎‎‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‎‎‎You’ve chosen to allow this app to create widgets and access their data.‎‏‎‎‏‎"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‎‎‏‎No defaults set.‎‏‎‎‏‎"</string>
-    <string name="clear_activities" msgid="341345438786077236">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‎‎Clear defaults‎‏‎‎‏‎"</string>
+    <string name="clear_activities" msgid="488089228657585700">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎Clear default preferences‎‏‎‎‏‎"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎This app may not be designed for your screen. You can control how it adjusts to your screen here.‎‏‎‎‏‎"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎Ask when launched‎‏‎‎‏‎"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎Scale app‎‏‎‎‏‎"</string>
@@ -2138,7 +2152,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎You can customize this device to fit your needs. These accessibility features can be changed later in Settings.‎‏‎‎‏‎"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‏‎Change font size‎‏‎‎‏‎"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎Screen readers‎‏‎‎‏‎"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‎Audio &amp; on-screen text‎‏‎‎‏‎"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎Captions‎‏‎‎‏‎"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‎‎‎‏‎‎Audio‎‏‎‎‏‎"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎General‎‏‎‎‏‎"</string>
     <string name="display_category_title" msgid="6638191682294461408">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‎‎‎‎‎Display‎‏‎‎‏‎"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‎Text and display‎‏‎‎‏‎"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎Turn screen darker‎‏‎‎‏‎"</string>
@@ -2291,7 +2307,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‎Red-green‎‏‎‎‏‎"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎Red-green‎‏‎‎‏‎"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‎Blue-yellow‎‏‎‎‏‎"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‏‎Reduce Brightness‎‏‎‎‏‎"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎Reduce brightness‎‏‎‎‏‎"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎Make screen darker than your phone’s minimum brightness‎‏‎‎‏‎"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎Make screen darker than your tablet’s minimum brightness‎‏‎‎‏‎"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎Make your screen darker so it’s more comfortable to read.&lt;br/&gt;&lt;br/&gt; This can be helpful when: &lt;ol&gt; &lt;li&gt; Your phone’s default minimum brightness is still too bright&lt;/li&gt; &lt;li&gt; You’re using your phone in dark situations, like at night or in a dark room before bed&lt;/li&gt; &lt;/ol&gt;‎‏‎‎‏‎"</string>
@@ -3328,8 +3344,8 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‎face‎‏‎‎‏‎"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‎fingerprint, add fingerprint‎‏‎‎‏‎"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎dim screen, touchscreen, battery, smart brightness, dynamic brightness, Auto brightness‎‏‎‎‏‎"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎dim screen, sleep, battery, timeout, attention, display, screen, inactivity‎‏‎‎‏‎"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎rotate, flip, rotation, portrait, landscape, orientation, vertical, horizontal‎‏‎‎‏‎"</string>
+    <string name="keywords_display_adaptive_sleep" msgid="4905300860114643966">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎smart, dim screen, sleep, battery, timeout, attention, display, screen, inactivity‎‏‎‎‏‎"</string>
+    <string name="keywords_auto_rotate" msgid="7288697525101837071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎camera, smart, auto rotate, auto-rotate, rotate, flip, rotation, portrait, landscape, orientation, vertical, horizontal‎‏‎‎‏‎"</string>
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‏‎upgrade, android‎‏‎‎‏‎"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‎dnd, schedule, notifications, block, silence, vibrate, sleep, work, focus, sound, mute, day, weekday, weekend, weeknight, event‎‏‎‎‏‎"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎screen, lock time, timeout, lockscreen‎‏‎‎‏‎"</string>
@@ -3498,9 +3514,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎Ringtones‎‏‎‎‏‎"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‎Other sounds and vibrations‎‏‎‎‏‎"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎Notifications‎‏‎‎‏‎"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎Conversation‎‏‎‎‏‎"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎Recently sent‎‏‎‎‏‎"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‎‏‏‎See all from last 7 days‎‏‎‎‏‎"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‎‎Advanced‎‏‎‎‏‎"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‎General‎‏‎‎‏‎"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎Work notifications‎‏‎‎‏‎"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎Adaptive notifications‎‏‎‎‏‎"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎Adaptive notification priority‎‏‎‎‏‎"</string>
@@ -3562,7 +3579,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎Display in pull-down shade, status bar &amp; on lock screen‎‏‎‎‏‎"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‎‎Hide silent notifications in status bar‎‏‎‎‏‎"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎Blink light‎‏‎‎‏‎"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎Notifications on lock screen‎‏‎‎‏‎"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎Privacy‎‏‎‎‏‎"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎Skip lock screen‎‏‎‎‏‎"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‎‎After face unlock, go directly to last used screen‎‏‎‎‏‎"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎Lock screen, Lockscreen, Skip, Bypass‎‏‎‎‏‎"</string>
@@ -3651,7 +3668,8 @@
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‎~‎‏‎‎‏‏‎<xliff:g id="NUMBER_0">%d</xliff:g>‎‏‎‎‏‏‏‎ notification per week‎‏‎‎‏‎</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‎Never‎‏‎‎‏‎"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‏‎Notification access‎‏‎‎‏‎"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‏‏‎‎Device &amp; app notifications‎‏‎‎‏‎"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎Control which notifications show on your apps and devices‎‏‎‎‏‎"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎Access to work profile notifications is blocked‎‏‎‎‏‎"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎Apps cannot read notifications‎‏‎‎‏‎"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3688,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎Turn off‎‏‎‎‏‎"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎Cancel‎‏‎‎‏‎"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‎Allowed notification types‎‏‎‎‏‎"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎Important ongoing notifications‎‏‎‎‏‎"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎Conversation notifications‎‏‎‎‏‎"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎Alerting notifications‎‏‎‎‏‎"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎Silent notifications‎‏‎‎‏‎"</string>
-    <string name="notif_listener_excluded_title" msgid="639103158747320529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‎‎‎‏‎Apps that are not bridged to this listener‎‏‎‎‏‎"</string>
-    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎All apps are bridged‎‏‎‎‏‎"</string>
-    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎%d apps are not bridged‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎%d app is not bridged‎‏‎‎‏‎</item>
-    </plurals>
-    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎Bridged apps‎‏‎‎‏‎"</string>
+    <string name="notif_type_ongoing" msgid="135675014223627555">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‎Real-time‎‏‎‎‏‎"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‏‎Real-time communication from apps in use, navigation, phone calls, and more‎‏‎‎‏‎"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎Conversations‎‏‎‎‏‎"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎SMS and other communications‎‏‎‎‏‎"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‎Default‎‏‎‎‏‎"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎‎‎‎Notifications that may ring or vibrate based on settings‎‏‎‎‏‎"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎Silent‎‏‎‎‏‎"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎Notifications that never make sound or vibrations‎‏‎‎‏‎"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‎‎See all apps‎‏‎‎‏‎"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‎‏‏‎Change notification settings for each app that can send notifications‎‏‎‎‏‎"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‎Apps shown on device‎‏‎‎‏‎"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎VR helper services‎‏‎‎‏‎"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎No installed apps have requested to be run as VR helper services.‎‏‎‎‏‎"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‎‎‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‎Allow VR service access for ‎‏‎‎‏‏‎<xliff:g id="SERVICE">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
@@ -3968,9 +3986,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‎Open by default‎‏‎‎‏‎"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‏‎‎‏‏‎‎Opening links‎‏‎‎‏‎"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎Open supported links‎‏‎‎‏‎"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‎Supported links open in this app‎‏‎‎‏‎"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎Links to open in this app‎‏‎‎‏‎"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎Open without asking‎‏‎‎‏‎"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‎‏‎Supported links‎‏‎‎‏‎"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎Other defaults‎‏‎‎‏‎"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‏‏‎‎‎‏‎‎Other default preferences‎‏‎‎‏‎"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎Add link‎‏‎‎‏‎"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‏‏‏‎‎An app can verify links to automatically open in the app. ‎‏‎‎‏‏‎"<annotation id="url">"‎‏‎‎‏‏‏‎Learn more‎‏‎‎‏‏‎"</annotation>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%d</xliff:g>‎‏‎‎‏‏‏‎ verified links‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%d</xliff:g>‎‏‎‎‏‏‏‎ verified link‎‏‎‎‏‎</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎These links are verified and automatically open in this app.‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎This link is verified and automatically opens in this app.‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎OK‎‏‎‎‏‎"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‏‎Checking for other supported links…‎‏‎‎‏‎"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎Cancel‎‏‎‎‏‎"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%d</xliff:g>‎‏‎‎‏‏‏‎ supported links‎‏‎‎‏‎</item>
+      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="COUNT_0">%d</xliff:g>‎‏‎‎‏‏‏‎ supported link‎‏‎‎‏‎</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎Add‎‏‎‎‏‎"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎Opens in ‎‏‎‎‏‏‎<xliff:g id="APP_LABEL">%s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="SIZE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used in ‎‏‎‎‏‏‎<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎internal storage‎‏‎‎‏‎"</string>
     <string name="storage_type_external" msgid="125078274000280821">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎external storage‎‏‎‎‏‎"</string>
@@ -4265,7 +4304,7 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‎‏‏‎‎Camera not allowed‎‏‎‎‏‎"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‎‏‎‎‎‎Screenshot not allowed‎‏‎‎‏‎"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎Can’t open this app‎‏‎‎‏‎"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎If you have questions, contact your IT admin‎‏‎‎‏‎"</string>
+    <string name="disabled_by_policy_title_financed_device" msgid="2328740314082888228">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‏‎‎‎Blocked by your credit provider‎‏‎‎‏‎"</string>
     <string name="admin_support_more_info" msgid="8407433155725898290">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎More details‎‏‎‎‏‎"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎Your admin can monitor and manage apps and data associated with your work profile, including settings, permissions, corporate access, network activity, and the device\'s location information.‎‏‎‎‏‎"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‎Your admin can monitor and manage apps and data associated with this user, including settings, permissions, corporate access, network activity, and the device\'s location information.‎‏‎‎‏‎"</string>
@@ -4342,7 +4381,7 @@
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎1 restriction‎‏‎‎‏‎</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎Carrier data accounting may differ from device accounting‎‏‎‎‏‎"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎Excludes data that is used by carrier networks‎‏‎‎‏‎"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‏‎Excludes data used by carrier networks‎‏‎‎‏‎"</string>
     <string name="data_used_template" msgid="8229342096562327646">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used‎‏‎‎‏‎"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎Set data warning‎‏‎‎‏‎"</string>
     <string name="data_warning" msgid="2925054658166062884">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎Data warning‎‏‎‎‏‎"</string>
@@ -4679,7 +4718,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‎‎(uninstalled for user ‎‏‎‎‏‏‎<xliff:g id="USER">%s</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎(disabled for user ‎‏‎‎‏‏‎<xliff:g id="USER">%s</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
     <string name="autofill_app" msgid="7595308061826307921">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎Autofill service‎‏‎‎‏‎"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎auto, fill, autofill‎‏‎‎‏‎"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎Passwords‎‏‎‎‏‎"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‎auto, fill, autofill, password‎‏‎‎‏‎"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎&lt;b&gt;Make sure you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be autofilled.‎‏‎‎‏‎"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎Autofill‎‏‎‎‏‎"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎Logging level‎‏‎‎‏‎"</string>
@@ -4886,7 +4926,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎Change the network operating mode‎‏‎‎‏‎"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎Preferred network type‎‏‎‎‏‎"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎Carrier‎‏‎‎‏‎"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‎Settings version‎‏‎‎‏‎"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‎Carrier settings version‎‏‎‎‏‎"</string>
     <string name="call_category" msgid="641461844504128789">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎Calling‎‏‎‎‏‎"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‎Carrier video calling‎‏‎‎‏‎"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‎System select‎‏‎‎‏‎"</string>
@@ -4935,6 +4975,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‎Remove the SIM and insert it again. If the problem continues, restart your device.‎‏‎‎‏‎"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎Try turning on the SIM again. If the problem continues, restart your device.‎‏‎‎‏‎"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎Network activation‎‏‎‎‏‎"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‎Carrier switching‎‏‎‎‏‎"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="CARRIER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is active‎‏‎‎‏‎"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‎Tap to update SIM settings‎‏‎‎‏‎"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎Switched to ‎‏‎‎‏‏‎<xliff:g id="CARRIER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -5095,8 +5136,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎Off‎‏‎‎‏‎"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‎‏‎‏‏‎Internet‎‏‎‎‏‎"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎SIMs‎‏‎‎‏‎"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‎Show airplane mode networks‎‏‎‎‏‎"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‎‏‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‏‎Find and connect to networks in airplane mode.‎‏‎‎‏‎"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‎‎‎Find and connect to Wi‑Fi networks‎‏‎‎‏‎"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎airplane, airplane-safe‎‏‎‎‏‎"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‏‎‎Calls &amp; SMS‎‏‎‎‏‎"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‎Wi‑Fi Calling‎‏‎‎‏‎"</string>
@@ -5110,22 +5150,19 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎unavailable‎‏‎‎‏‎"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎Temporarily unavailable‎‏‎‎‏‎"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎No SIM‎‏‎‎‏‎"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎Preferences‎‏‎‎‏‎"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎Network preferences‎‏‎‎‏‎"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎Connect to public networks‎‏‎‎‏‎"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte‎‏‎‎‏‎"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎View airplane mode networks‎‏‎‎‏‎"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎Viewing airplane mode networks‎‏‎‎‏‎"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎Turn on networks‎‏‎‎‏‎"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‎‎‎‎Turn off networks‎‏‎‎‏‎"</string>
+    <string name="turn_on_wifi" msgid="4868116014727533668">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎Turn on Wi‑Fi‎‏‎‎‏‎"</string>
     <string name="reset_your_internet_title" msgid="4856899004343241310">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎Reset your internet?‎‏‎‎‏‎"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‎‏‎This will end your phone call‎‏‎‎‏‎"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‏‎‎‎‏‎‏‎This will end your phone call‎‏‎‎‏‎"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎Resetting your internet…‎‏‎‎‏‎"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎Fix connectivity‎‏‎‎‏‎"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎Airplane mode networks available‎‏‎‎‏‎"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎To switch networks, disconnect ethernet‎‏‎‎‏‎"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎Cannot switch networks while connected‎‏‎‎‏‎"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎Airplane mode networks‎‏‎‎‏‎"</string>
+    <string name="wifi_is_turned_on_subtitle" msgid="4222869018808845600">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎Wi‑Fi is turned on‎‏‎‎‏‎"</string>
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="STATE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ / ‎‏‎‎‏‏‎<xliff:g id="NETWORKMODE">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎Connected‎‏‎‎‏‎"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎Internet won\'t auto‑connect‎‏‎‎‏‎"</string>
@@ -5146,6 +5183,8 @@
     <string name="category_name_color" msgid="937514550918977151">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎Color‎‏‎‎‏‎"</string>
     <string name="category_name_others" msgid="2366006298768550310">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎Others‎‏‎‎‏‎"</string>
     <string name="category_name_general" msgid="7737273712848115886">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎General‎‏‎‎‏‎"</string>
+    <string name="dark_theme_main_switch_title" msgid="4045147031947562280">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‎‎‏‎‏‎‎‎‎Use Dark theme‎‏‎‎‏‎"</string>
+    <string name="bluetooth_main_switch_title" msgid="8409835540311309632">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎Use Bluetooth‎‏‎‎‏‎"</string>
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎See all apps‎‏‎‎‏‎"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‏‏‎Smart Forwarding‎‏‎‎‏‎"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‎‎Smart Forwarding Enabled‎‏‎‎‏‎"</string>
@@ -5159,4 +5198,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‎Enter Phone number‎‏‎‎‏‎"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎Phone number is missing.‎‏‎‎‏‎"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎‎OK‎‏‎‎‏‎"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎Allow 2G‎‏‎‎‏‎"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎Use 2G cellular connections. For emergency calls, 2G is always turned on.‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 99e4669..af9cd1e 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -284,7 +284,7 @@
     <item msgid="8319500905789302082">"agregar buzón de voz"</item>
     <item msgid="1745447762712473288">"usar SIP"</item>
     <item msgid="2986821801246709737">"procesar llamada saliente"</item>
-    <item msgid="2702338156976571452">"huella digital"</item>
+    <item msgid="2702338156976571452">"huella dactilar"</item>
     <item msgid="7925495329948404955">"sensores corporales"</item>
     <item msgid="8163066895749904470">"leer emisiones móviles"</item>
     <item msgid="7621394050624063528">"ubicación ficticia"</item>
@@ -351,7 +351,7 @@
     <item msgid="1203157739257425062">"Agregar buzón de voz"</item>
     <item msgid="9143978647977300187">"Usar SIP"</item>
     <item msgid="3053060162752878562">"Procesar llamada saliente"</item>
-    <item msgid="4480721672278100858">"Huella digital"</item>
+    <item msgid="4480721672278100858">"Huella dactilar"</item>
     <item msgid="7883743426029759112">"Sensores corporales"</item>
     <item msgid="2546206711741159825">"Leer emisiones móviles"</item>
     <item msgid="2363460595607829243">"Ubicación ficticia"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 69e97d8..421d321 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Aumenta o reduce el tamaño del texto en pantalla."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Reducir el tamaño"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Aumentar el tamaño"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Usar giro automático"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Texto de muestra"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"El maravilloso mago de Oz"</string>
@@ -322,14 +321,14 @@
     <string name="disabled_by_administrator_summary" msgid="5424846182313851124">"No disponible"</string>
     <string name="security_status_title" msgid="6958004275337618656">"Estado de seguridad"</string>
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueo de pantalla, desbloqueo facial"</string>
-    <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueo de pantalla, huella digital"</string>
+    <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueo de pantalla, huella dactilar"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Bloqueo de pantalla"</string>
-    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Usa tu rostro y huella digital para desbloquear el teléfono"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Usa tu rostro y huella dactilar para desbloquear el teléfono"</string>
     <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"También puedes acceder a apps y confirmar pagos"</string>
     <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configura el desbloqueo con:"</string>
     <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desbloqueo facial"</string>
     <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Desbloquea el teléfono con facilidad"</string>
-    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Huella digital"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Huella dactilar"</string>
     <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Desbloquea el teléfono desde el bolsillo"</string>
     <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Omitir"</string>
     <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Siguiente"</string>
@@ -395,29 +394,35 @@
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"¿Quieres borrar los datos faciales?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Se borrarán los datos del rostro que usa el desbloqueo facial definitivamente y de manera segura. Tras la eliminación, deberás ingresar el PIN, el patrón o la contraseña para desbloquear el teléfono, acceder a las apps y confirmar pagos."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Usa tu rostro para desbloquear el teléfono"</string>
-    <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Huella digital"</string>
+    <string name="security_settings_fingerprint_preference_title" msgid="2484965173528415458">"Huella dactilar"</string>
     <string name="fingerprint_manage_category_title" msgid="1249349505688268850">"Adm. huellas digitales"</string>
-    <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Usar huella dig. para"</string>
-    <string name="fingerprint_add_title" msgid="1837610443487902050">"Agregar una huella digital"</string>
+    <string name="fingerprint_usage_category_title" msgid="8757959085075024856">"Usar huella dac. para"</string>
+    <string name="fingerprint_add_title" msgid="1837610443487902050">"Agregar una huella dactilar"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5451094461919440992">"bloqueo de pantalla"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="988602245530967106">
-      <item quantity="other">Se configuraron <xliff:g id="COUNT_1">%1$d</xliff:g> huellas digitales</item>
-      <item quantity="one">Se configuró <xliff:g id="COUNT_0">%1$d</xliff:g> huella digital</item>
+      <item quantity="other">Se configuraron <xliff:g id="COUNT_1">%1$d</xliff:g> huellas dactilares</item>
+      <item quantity="one">Se configuró <xliff:g id="COUNT_0">%1$d</xliff:g> huella dactilar</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Desbloquea con tu huella digital"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Usa tus huellas digitales"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Toca el sensor de huellas digitales para desbloquear el teléfono, autorizar compras o acceder a las apps. Ten cuidado con las huellas digitales que agregas, ya que podrán realizar cualquiera de esas acciones."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Es posible que la huella digital sea menos segura que un patrón o PIN eficaz."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Usa tu huella digital para desbloquear el teléfono o aprobar compras.\n\nNota: No puedes usar tu huella digital para desbloquear este dispositivo. Para obtener más información, comunícate con el administrador de la organización."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Usa tu huella digital para desbloquear el teléfono o aprobar compras.\n\nNota: Es posible que la huella digital no sea tan segura como un PIN o un patrón eficaz."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Configura tu huella dactilar"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Usa tus huellas dactilares"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Toca el sensor de huellas dactilares para desbloquear el teléfono, autorizar compras o acceder a las apps. Ten cuidado con las huellas dactilares que agregas, ya que podrán realizar cualquiera de esas acciones."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Tú tienes el control"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Para tener en cuenta"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Los datos que registra la huella dactilar se almacenan en un lugar seguro de tu teléfono. Puedes borrarlos cuando quieras en la Configuración."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Es posible que la huella dactilar sea menos segura que un buen patrón o PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"En algunas ocasiones, tu teléfono usará imágenes recientes de la huella dactilar para crear modelos de huellas dactilares mejorados."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Usa tu huella dactilar para desbloquear el teléfono o aprobar compras.\n\nNota: No puedes usar tu huella dactilar para desbloquear este dispositivo. Para obtener más información, comunícate con el administrador de la organización."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Usa tu huella dactilar para desbloquear el teléfono o aprobar compras.\n\nNota: Es posible que la huella dactilar no sea tan segura como un PIN o un patrón eficaz."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, gracias"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Omitir"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Acepto"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Omitir"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Siguiente"</string>
-    <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"¿Omitir huella digital?"</string>
-    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="2412645723804450304">"La configuración de la huella digital solo toma unos minutos. Si omites este paso, puedes agregarla más tarde en la configuración."</string>
+    <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"¿Omitir huella dactilar?"</string>
+    <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="2412645723804450304">"La configuración de la huella dactilar solo toma unos minutos. Si omites este paso, puedes agregarla más tarde en la configuración."</string>
     <string name="lock_screen_intro_skip_title" msgid="342553937472568925">"¿Omitir bloqueo de la pantalla?"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1570832293693405757">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas usen esta tablet si la pierdes, te la roban o se restablece."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4618501606519351904">"No se activarán las funciones de protección del dispositivo. No podrás evitar que otras personas lo usen si lo pierdes, te lo roban o se restablece."</string>
@@ -430,24 +435,33 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Omitir"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Toca el sensor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Mantén presionado el ícono de la huella dactilar"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Se encuentra en la parte posterior del teléfono. Usa el dedo índice."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Está en la pantalla. Busca la huella digital que tiene un círculo resplandeciente."</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustración del dispositivo y la ubicación del sensor de huellas digitales"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"El sensor de huellas dactilares está en la pantalla. Mueve el dedo por la pantalla para encontrarlo."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustración del dispositivo y la ubicación del sensor de huellas dactilares"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nombre"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Aceptar"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Borrar"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Toca el sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Coloca el dedo en el sensor y levántalo cuando sientas una vibración."</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Levanta el dedo y vuelve a tocar"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Sigue levantando el dedo para agregar diferentes partes de la huella digital."</string>
-    <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Se agregó la huella digital"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Cuando veas este ícono, usa tu huella digital para identificarte o aprobar compras."</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Sigue levantando el dedo para agregar diferentes partes de la huella dactilar."</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
+    <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Se agregó la huella dactilar"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Cuando veas este ícono, usa tu huella dactilar para identificarte o aprobar compras."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Más tarde"</string>
-    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="352947044008973812">"¿Omitir configuración de huella digital?"</string>
-    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="4876965433600560365">"Decidiste usar la huella digital como una de las formas para desbloquear el teléfono. Si omites este paso, tendrás que configurarla más tarde. La configuración tarda un minuto aproximadamente."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="6901147203720764421">"Protege la tablet con una opción de bloqueo de pantalla para que nadie pueda usarla si la pierdes o te la roban. También debes establecer una opción de bloqueo de pantalla para configurar la huella digital. Presiona Cancelar y, luego, establece un PIN, un patrón o una contraseña."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="1286244133923093528">"Protege el dispositivo con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. También debes establecer una opción de bloqueo de pantalla para configurar la huella digital. Presiona Cancelar y, luego, establece un PIN, un patrón o una contraseña."</string>
-    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="4810191157587317521">"Protege el teléfono con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. También debes establecer una opción de bloqueo de pantalla para configurar la huella digital. Presiona Cancelar y, luego, establece un PIN, un patrón o una contraseña."</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="352947044008973812">"¿Omitir configuración de huella dactilar?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="4876965433600560365">"Decidiste usar la huella dactilar como una de las formas para desbloquear el teléfono. Si omites este paso, tendrás que configurarla más tarde. La configuración tarda un minuto aproximadamente."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="tablet" msgid="6901147203720764421">"Protege la tablet con una opción de bloqueo de pantalla para que nadie pueda usarla si la pierdes o te la roban. También debes establecer una opción de bloqueo de pantalla para configurar la huella dactilar. Presiona Cancelar y, luego, establece un PIN, un patrón o una contraseña."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="device" msgid="1286244133923093528">"Protege el dispositivo con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. También debes establecer una opción de bloqueo de pantalla para configurar la huella dactilar. Presiona Cancelar y, luego, establece un PIN, un patrón o una contraseña."</string>
+    <string name="fingerprint_lock_screen_setup_skip_dialog_text" product="default" msgid="4810191157587317521">"Protege el teléfono con una opción de bloqueo de pantalla para que nadie pueda usarlo si lo pierdes o te lo roban. También debes establecer una opción de bloqueo de pantalla para configurar la huella dactilar. Presiona Cancelar y, luego, establece un PIN, un patrón o una contraseña."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Si proteges tu tablet con una opción de bloqueo de pantalla, nadie podrá usarla si la pierdes o te la roban. También debes establecer una opción para configurar el desbloqueo facial. Si necesitas ir hacia atrás, presiona Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Si proteges tu dispositivo con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También debes establecer una opción para configurar el desbloqueo facial. Si necesitas ir hacia atrás, presiona Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Si proteges tu teléfono con una opción de bloqueo de pantalla, y lo pierdes o te lo roban, nadie podrá usarlo. También debes establecer una opción para configurar el desbloqueo facial. Si necesitas ir hacia atrás, presiona Cancelar."</string>
@@ -462,19 +476,19 @@
     <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="5742429501012827526">"Ese no es el sensor"</string>
     <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="7172969336386036998">"Toca el sensor en la parte posterior del teléfono con el dedo índice."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="132085362209418770">"No se completó la inscripción"</string>
-    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="5479647886550695766">"Se alcanzó el límite de tiempo para la inscripción de huellas digitales. Vuelve a intentarlo."</string>
-    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="6068935528640241271">"El registro de huellas digitales no funcionó. Vuelve a intentarlo o usa otro dedo."</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="5479647886550695766">"Se alcanzó el límite de tiempo para la inscripción de huellas dactilares. Vuelve a intentarlo."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="6068935528640241271">"El registro de huellas dactilares no funcionó. Vuelve a intentarlo o usa otro dedo."</string>
     <string name="fingerprint_enroll_button_add" msgid="6652490687672815760">"Agregar otra huella digital"</string>
     <string name="fingerprint_enroll_button_next" msgid="1034110123277869532">"Siguiente"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"Además de desbloquear el teléfono, también puedes utilizar tu huella digital para autorizar compras y el acceso a aplicaciones. "<annotation id="url">"Más información"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="4260983700868889294">" Esta opción de bloqueo de pantalla está inhabilitada. Para obtener más información, comunícate con el administrador de tu organización. "<annotation id="admin_details">"Más información"</annotation>\n\n"Aún puedes usar tu huella digital para autorizar compras y el acceso a apps."<annotation id="url">"Más información"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="7875826823637114097">"Además de desbloquear el teléfono, también puedes utilizar tu huella dactilar para autorizar compras y el acceso a aplicaciones. "<annotation id="url">"Más información"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="4260983700868889294">" Esta opción de bloqueo de pantalla está inhabilitada. Para obtener más información, comunícate con el administrador de tu organización. "<annotation id="admin_details">"Más información"</annotation>\n\n"Aún puedes usar tu huella dactilar para autorizar compras y el acceso a apps."<annotation id="url">"Más información"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="2590665137265458789">"Levanta el dedo y vuelve a tocar el sensor"</string>
     <string name="fingerprint_add_max" msgid="8639321019299347447">"Puedes agregar hasta <xliff:g id="COUNT">%d</xliff:g> huellas digitales"</string>
     <string name="fingerprint_intro_error_max" msgid="4431784409732135610">"Agregaste la cantidad máxima permitida de huellas digitales"</string>
     <string name="fingerprint_intro_error_unknown" msgid="877005321503793963">"No se pueden agregar más huellas digitales"</string>
     <string name="fingerprint_last_delete_title" msgid="4081475675646514726">"¿Quitar las huellas digitales?"</string>
     <string name="fingerprint_delete_title" msgid="1469865327307917858">"Quitar \"<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\""</string>
-    <string name="fingerprint_delete_message" msgid="1454995433333496541">"¿Quieres borrar esta huella digital?"</string>
+    <string name="fingerprint_delete_message" msgid="1454995433333496541">"¿Quieres borrar esta huella dactilar?"</string>
     <string name="fingerprint_last_delete_message" msgid="93311579320049852">"No podrás usar tus huellas digitales para desbloquear el teléfono, autorizar compras ni acceder a las apps"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="3460246522493987163">"No podrás usar tus huellas digitales para desbloquear tu perfil de trabajo, autorizar compras ni acceder a apps de trabajo"</string>
     <string name="fingerprint_last_delete_confirm" msgid="3294910995598819259">"Sí, deseo quitarlas"</string>
@@ -513,7 +527,7 @@
     <string name="suggested_lock_settings_summary" product="tablet" msgid="3213718550422761562">"Agrega un bloqueo de pantalla para proteger la tablet"</string>
     <string name="suggested_lock_settings_summary" product="device" msgid="8479766049078378225">"Agrega bloqueo de pantalla para proteger el dispositivo"</string>
     <string name="suggested_lock_settings_summary" product="default" msgid="2443273582716671033">"Agrega un bloqueo de pantalla para proteger el teléfono"</string>
-    <string name="suggested_fingerprint_lock_settings_title" msgid="3140266181874137984">"Agrega una huella digital como desbloqueo"</string>
+    <string name="suggested_fingerprint_lock_settings_title" msgid="3140266181874137984">"Agrega una huella dactilar como desbloqueo"</string>
     <string name="suggested_fingerprint_lock_settings_summary" product="tablet" msgid="1040265358906410746"></string>
     <string name="suggested_fingerprint_lock_settings_summary" product="device" msgid="1040265358906410746"></string>
     <string name="suggested_fingerprint_lock_settings_summary" product="default" msgid="1040265358906410746"></string>
@@ -548,11 +562,11 @@
     <string name="unlock_set_unlock_password_summary" msgid="7647435233968707432">"Nivel de seguridad alto"</string>
     <string name="unlock_set_do_later_title" msgid="6565575303676064364">"Ahora no"</string>
     <string name="current_screen_lock" msgid="1367883977261098017">"Bloqueo de pantalla actual"</string>
-    <string name="fingerprint_unlock_set_unlock_pattern" msgid="4492334416059646032">"Huella digital y patrón"</string>
-    <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Huella digital y PIN"</string>
-    <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Huella digital y contraseña"</string>
-    <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continuar sin huella digitale"</string>
-    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Puedes desbloquear el teléfono con tu huella digital. Para mayor seguridad, esta opción requiere un método secundario de bloqueo de pantalla."</string>
+    <string name="fingerprint_unlock_set_unlock_pattern" msgid="4492334416059646032">"Huella dactilar y patrón"</string>
+    <string name="fingerprint_unlock_set_unlock_pin" msgid="4724451168139460493">"Huella dactilar y PIN"</string>
+    <string name="fingerprint_unlock_set_unlock_password" msgid="5614333047430835971">"Huella dactilar y contraseña"</string>
+    <string name="fingerprint_unlock_skip_fingerprint" msgid="7631242444064287891">"Continuar sin huella dactilar"</string>
+    <string name="fingerprint_unlock_title" msgid="4978686534505944042">"Puedes desbloquear el teléfono con tu huella dactilar. Para mayor seguridad, esta opción requiere un método secundario de bloqueo de pantalla."</string>
     <string name="face_unlock_set_unlock_pattern" msgid="5991691559532427891">"Desbloqueo facial y patrón"</string>
     <string name="face_unlock_set_unlock_pin" msgid="8990569318587034610">"Desbloqueo facial y PIN"</string>
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Desbloqueo facial y contraseña"</string>
@@ -569,7 +583,7 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="1926480143883094896">"Patrón"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="9028659554829888373">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="8810609692771987513">"Contraseña"</string>
-    <string name="unlock_setup_wizard_fingerprint_details" msgid="5974580769186206478">"Después de configurar el bloqueo de pantalla, también puedes establecer la huella digital en Configuración &gt; Seguridad."</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="5974580769186206478">"Después de configurar el bloqueo de pantalla, también puedes establecer la huella dactilar en Configuración &gt; Seguridad."</string>
     <string name="unlock_disable_lock_title" msgid="2564279819907932759">"Desactivar el bloqueo de pantalla"</string>
     <string name="unlock_disable_frp_warning_title" msgid="1520689401825045809">"¿Deseas quitar la protección del dispositivo?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="1005284289723910461">"¿Quieres quitar la protección del perfil?"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Buscar"</string>
     <string name="display_settings" msgid="7197750639709493852">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Girar automáticamente la pantalla"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desactivada"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Activada"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Activa - En función del rostro"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Habilitar detección de rostro"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturales"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Mejorados"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activado: No se apagará la pantalla si estás mirándola"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Desactivado"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Se requiere acceso a la cámara"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Presiona para administrar los permisos de los Servicios de personalización del dispositivo"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Impide que se apague la pantalla si estás mirándola"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"La función de atención a la pantalla usa la cámara frontal para detectar si hay alguien mirando la pantalla. Funciona en el dispositivo, y las imágenes no se almacenan ni se envían a Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Activar la atención a la pantalla"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"La pantalla se enciende para indicar nuevas notificaciones cuando está apagada"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Mostrar información y hora"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"El uso de la batería será mayor"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Texto en negrita"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Texto en negrita"</string>
     <string name="title_font_size" msgid="570613010306330622">"Tamaño de fuente"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Aumenta o reduce el tamaño del texto en pantalla"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Bloqueo de la tarjeta SIM"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Otros usuarios"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Almacenamiento del dispositivo"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Almacenamiento portátil"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmas y recordatorios"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Permitir programar alarmas o recordatorios"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmas y recordatorios"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Permite que esta app programe alarmas y otros eventos de tiempo. Esto permitirá que la app se active y se ejecute incluso cuando no uses el dispositivo. Ten en cuenta que revocar este permiso podría hacer que la app no funcione correctamente, y es posible que las alarmas que haya programado la app dejen de funcionar."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"programar, alarma, recordatorio, evento"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> en uso de <xliff:g id="TOTAL">%2$s</xliff:g> disponibles"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"En uso de <xliff:g id="TOTAL">%1$s</xliff:g> disponibles"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Servicios de ubicación"</string>
     <string name="location_title" msgid="5819154746934945021">"Mi ubicación"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Ubicación de perfil de trabajo"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Acceso de apps a la ubicación"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"La ubicación está desactivada"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> Apps con acceso a la ubicación: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
       <item quantity="one"> Apps con acceso a la ubicación: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g></item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Acceso reciente a la ubicación"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Ver detalles"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Ninguna aplicación solicitó la ubicación recientemente."</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ninguna app accedió recientemente a tu ubicación"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Uso de batería alto"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Uso de batería bajo"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Búsqueda por Wi‑Fi y Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Búsqueda de Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permite que las apps y los servicios busquen redes Wi-Fi en cualquier momento, aunque la conexión Wi-Fi esté desactivada. Esta función puede usarse, por ejemplo, para mejorar las funciones y los servicios basados en la ubicación."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Búsqueda de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que las apps y los servicios busquen dispositivos cercanos en cualquier momento, aunque la conexión Bluetooth esté desactivada. Esta función puede usarse, por ejemplo, para mejorar las funciones y los servicios basados en la ubicación."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Servicios de ubicación"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servicios de ubicación para el trabajo"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detección de la zona horaria de la ubicación"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detección de la zona horaria de la ubicación"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permite que la ubicación del dispositivo se utilice para detectar la zona horaria actual. Otras configuraciones de la ubicación, como la búsqueda de Wi-Fi, pueden afectar la exactitud de la detección de la zona horaria."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Activada"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desactivada"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Se inhabilitó la detección automática de la zona horaria"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"La zona horaria automática está desactivada"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Se inhabilitó la detección de la zona horaria de la ubicación"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"La detección de la zona horaria de la ubicación no es compatible"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"No se permiten los cambios de detección de la zona horaria de la ubicación"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Habilitar"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Liberar espacio de almacenamiento"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Desinstalar las actualizaciones"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Has elegido lanzar esta aplicación de manera predeterminada para algunas acciones."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Algunas de las actividades que seleccionaste se abren en esta app de forma predeterminada."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Decidiste permitir que esta aplicación pueda crear widgets y acceder a sus datos."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"No se establecieron configuraciones predeterminadas"</string>
-    <string name="clear_activities" msgid="341345438786077236">"Borrar valores predeterminados"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Borrar las preferencias predeterminadas"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Es posible que esta aplicación no se haya diseñado para tu pantalla. Aquí puedes controlar cómo se ajusta a la pantalla."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Preguntar cuando se lanza"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Aplicación en escala"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Puedes personalizar este dispositivo para que se adapte a tus necesidades. Cambia estas funciones de accesibilidad más tarde en Configuración."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Cambiar tamaño de fuente"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lectores de pantalla"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio y texto en pantalla"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtítulos"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Pantalla"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texto y pantalla"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Oscurecer la pantalla"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rojo-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rojo-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarillo"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reducir el brillo"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Reducir el brillo"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Oscurecer la pantalla por debajo del brillo mínimo del teléfono"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Oscurecer la pantalla por debajo del brillo mínimo de la tablet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Oscurece la pantalla para que sea más cómodo leer.&lt;br/&gt;&lt;br/&gt; Esto puede ser útil en los siguientes casos: &lt;ol&gt; &lt;li&gt; Cuando incluso el brillo mínimo predeterminado del teléfono es demasiado alto&lt;/li&gt; &lt;li&gt; Cuando usas el teléfono en la oscuridad, por ejemplo, de noche o en una sala oscura antes de dormir&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3332,10 +3353,12 @@
     <string name="keywords_ambient_display_screen" msgid="661492302323274647">"Pantalla Ambiente, pantalla bloqueada"</string>
     <string name="keywords_lock_screen_notif" msgid="6363144436467429932">"notificación en pantalla bloqueada, notificaciones"</string>
     <string name="keywords_face_settings" msgid="1360447094486865058">"rostro"</string>
-    <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"huella digital, agregar huella digital"</string>
+    <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"huella dactilar, agregar huella dactilar"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"atenuar pantalla, pantalla táctil, batería, brillo inteligente, brillo dinámico, brillo automático"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"atenuar pantalla, suspender, batería, tiempo de espera de la pantalla, atención a la pantalla, pantalla, inactividad"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"rotar, girar, rotación, retrato, paisaje, orientación, vertical, horizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"actualizar, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"no interrumpir, programar, notificaciones, bloquear, silenciar, vibrar, suspender, trabajar, enfocar, sonido, silencio, día, día de la semana, fin de semana, noche de la semana, evento"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"pantalla, tiempo de bloqueo, tiempo de espera de la pantalla, bloqueo de pantalla"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Tonos"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Otros sonidos y vibraciones"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificaciones"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversación"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Enviadas recientemente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ver todas las de los últimos 7 días"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avanzada"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificaciones de trabajo"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificaciones adaptables"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioridad de notificación adaptable"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Mostrar en banner desplegable, barra de estado y pantalla bloqueada"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ocultar las notificaciones silenciosas en la barra de estado"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Luz intermitente"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notificaciones en pantalla de bloqueo"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacidad"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Omitir pantalla de bloqueo"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Después del desbloqueo facial, ir a la última pantalla usada"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Pantalla bloqueada, bloqueo de pantalla, omitir, omisión"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">Aproximadamente <xliff:g id="NUMBER_0">%d</xliff:g> notificación por semana</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nunca"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Acceso a notificaciones"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Notificaciones de la app y del dispositivo"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Controla qué notificaciones se muestran en tus apps o dispositivos"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"El acceso a las notificaciones del perfil de trabajo está bloqueado"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Las aplicaciones no pueden leer las notificaciones."</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Desactivar"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Cancelar"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Tipos de notificaciones permitidas"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Notificaciones constantes importantes"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Notificaciones de conversaciones"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Notificaciones de alerta"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Notificaciones silenciosas"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Tiempo real"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Comunicación en tiempo real de las apps en uso, navegación, llamadas telefónicas y más"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Conversaciones"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS y otras comunicaciones"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Predeterminada"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Notificaciones que pueden sonar o vibrar según la configuración"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Silencio"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Notificaciones que nunca suenan ni vibran"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Ver todas las apps"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Cambia la configuración de cada una de las apps que pueden enviar notificaciones"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Apps que se muestran en el dispositivo"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Servicio de ayuda de RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ninguna app instalada solicitó que se la ejecutara como servicio de ayuda de RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"¿Quieres permitir que el servicio de RV acceda a <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3948,9 +3973,9 @@
     <string name="encryption_interstitial_message_pin" msgid="1413575143234269985">"Puedes solicitar el PIN del dispositivo antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el PIN para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern" msgid="726550613252236854">"Puedes solicitar el patrón del dispositivo antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el patrón para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_password" msgid="6051054565294909975">"Puedes solicitar la contraseña del dispositivo antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar contraseña para iniciar el dispositivo?"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="7152770518093102916">"Además de usar tu huella digital para desbloquear el dispositivo, puedes solicitar el PIN antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes, ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el PIN para iniciar el dispositivo?"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="6257856552043740490">"Además de usar tu huella digital para desbloquear el dispositivo, puedes solicitar el patrón antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el patrón para iniciar el dispositivo?"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="7710804822643612867">"Además de usar tu huella digital para desbloquear el dispositivo, puedes solicitar una contraseña antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar la contraseña para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="7152770518093102916">"Además de usar tu huella dactilar para desbloquear el dispositivo, puedes solicitar el PIN antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes, ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el PIN para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="6257856552043740490">"Además de usar tu huella dactilar para desbloquear el dispositivo, puedes solicitar el patrón antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el patrón para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="7710804822643612867">"Además de usar tu huella dactilar para desbloquear el dispositivo, puedes solicitar una contraseña antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar la contraseña para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Además de usar el reconocimiento facial para desbloquear el dispositivo, puedes solicitar un PIN antes de iniciarlo para mayor protección. Mientras se enciende el dispositivo, no puede recibir llamadas, mensajes, ni notificaciones, incluidas las alarmas.\n\nEsta opción protege los datos en dispositivos perdidos o robados. ¿Quieres solicitar un PIN para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Además de usar el reconocimiento facial para desbloquear el dispositivo, puedes solicitar un patrón antes de iniciarlo para mayor protección. Mientras se enciende el dispositivo, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción protege los datos en dispositivos perdidos o robados. ¿Quieres solicitar un patrón para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Además de usar el reconocimiento facial para desbloquear el dispositivo, puedes solicitar una contraseña antes de iniciarlo para mayor protección. Mientras se enciende el dispositivo, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción protege los datos en dispositivos perdidos o robados. ¿Quieres solicitar una contraseña para iniciar el dispositivo?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Abrir de forma predet."</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Abrir vínculos"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Abrir vínculos admitidos"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Los vínculos admitidos se abren en esta app"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Vínculos que se pueden abrir en esta app"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Abrir sin preguntar"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Vínculos admitidos"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Otras configuraciones predeterminadas"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Otras preferencias predeterminadas"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Agregar vínculo"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Una app puede verificar vínculos para que se abran de forma automática. "<annotation id="url">"Más información"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> vínculos verificados</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> vínculo verificado</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Estos vínculos están verificados y se abren de forma automática en esta app.</item>
+      <item quantity="one">Este vínculo está verificado y se abre de forma automática en esta app.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Aceptar"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Comprobando otros vínculos admitidos…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Cancelar"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> vínculos admitidos</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> vínculo admitido</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Agregar"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Se abre en <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> en uso en <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"almacenamiento interno"</string>
     <string name="storage_type_external" msgid="125078274000280821">"almacenamiento externo"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"No está permitido usar la cámara"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"No está permitido tomar capturas de pantalla"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"No se puede abrir esta app"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Si tienes alguna pregunta, comunícate con tu administrador de TI"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Más detalles"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"El administrador puede controlar y administrar las apps y los datos asociados con tu perfil de trabajo, incluida la configuración, los permisos, el acceso corporativo, la actividad de la red y la información de la ubicación del dispositivo."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"El administrador puede controlar y administrar las apps y los datos asociados con este usuario, incluida la configuración, los permisos, el acceso corporativo, la actividad de la red y la información de la ubicación del dispositivo."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 restricción</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"El cálculo de datos del proveedor puede diferir del que hace el dispositivo."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excluye los datos que usan las redes del proveedor"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Excluye los datos que usan las redes de los proveedores"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Datos usados: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Configurar advertencia"</string>
     <string name="data_warning" msgid="2925054658166062884">"Advertencia de datos"</string>
@@ -4396,7 +4443,7 @@
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="311325321794497404">"Solicitar patrón para iniciar tu dispositivo. Mientras esté apagado, no podrá recibir llamadas, mensajes, notificaciones ni alarmas."</string>
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="1881271630312222251">"Solicitar PIN para iniciar el dispositivo. Mientras está apagado, no podrá recibir llamadas, mensajes, notificaciones ni alarmas."</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="8651761245246411947">"Solicitar contraseña para iniciar tu dispositivo. Mientras esté apagado, no podrá recibir llamadas, mensajes, notificaciones ni alarmas."</string>
-    <string name="suggestion_additional_fingerprints" msgid="4726777300101156208">"Agregar otra huella digital"</string>
+    <string name="suggestion_additional_fingerprints" msgid="4726777300101156208">"Agregar otra huella dactilar"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="2825364645039666674">"Desbloquea con otro dedo"</string>
     <string name="battery_saver_on_summary" msgid="4605146593966255848">"Activado"</string>
     <string name="battery_saver_off_scheduled_summary" msgid="2193875981740829819">"Se activará cuando quede <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>"</string>
@@ -4569,10 +4616,10 @@
     <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>; presiona para cambiar"</string>
     <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Si ingresas un número que no es de emergencia:\n • Tu dispositivo debe estar desbloqueado para usar SOS de emergencia.\n • Es posible que no se responda tu llamada."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Deslizar tu huella para ver notificaciones"</string>
-    <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Deslizar huella digital"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales ubicado en la parte posterior del teléfono."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="8642092907817554454">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales ubicado en la parte posterior de la tablet."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="3888927017311372398">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales ubicado en la parte posterior del dispositivo."</string>
+    <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Deslizar huella dactilar"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas dactilares ubicado en la parte posterior del teléfono."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="8642092907817554454">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas dactilares ubicado en la parte posterior de la tablet."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="3888927017311372398">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas dactilares ubicado en la parte posterior del dispositivo."</string>
     <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="2956636269742745449">"Consulta tus notificaciones rápidamente"</string>
     <string name="gesture_setting_on" msgid="3223448394997988591">"Activado"</string>
     <string name="gesture_setting_off" msgid="3444029475726294919">"Desactivado"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(se desinstaló para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(se inhabilitó para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Servicio autocompletar"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"auto, completar, autocompletar"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Contraseñas"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automático, completar, autocompletar, contraseña"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Asegúrate de que esta app sea confiable.&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; usa el contenido de tu pantalla para determinar qué se puede autocompletar."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Autocompletar"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Nivel de registro"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Cambiar el modo operativo de la red"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipo de red preferido"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Proveedor"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versión de la configuración"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versión de la configuración del proveedor"</string>
     <string name="call_category" msgid="641461844504128789">"Llamadas"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videollamada con el proveedor"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sistema seleccionado"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Quita la SIM y vuelve a insertarla. Si el problema persiste, reinicia el dispositivo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Vuelve a activar la SIM. Si el problema persiste, reinicia el dispositivo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activación de red"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Cambio de proveedor"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> está activo"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Presiona para actualizar la configuración de la tarjeta SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Se cambió a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desactivado"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Ver redes para el modo de avión"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Encuentra redes para el modo de avión y conéctate a ellas."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Encuentra redes Wi-Fi y conéctate a ellas"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avión, segura para aviones"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Llamadas y SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Llamada por Wi‑Fi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"no disponible"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"No disponible por el momento"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"No hay ninguna tarjeta SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencias"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferencias de red"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectarse a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexión de red, internet, inalámbrico, datos, wifi, wi-fi, wi fi, datos móviles, móvil, proveedor de telefonía, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ver redes para modo de avión"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Viendo redes en modo de avión"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Activar redes"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Desactivar redes"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"¿Deseas restablecer la conexión a Internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Esta acción finalizará la llamada telefónica"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Esta acción finalizará la llamada telefónica"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Restableciendo conexión a Internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Corregir conectividad"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Hay redes disponibles para el modo de avión"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para cambiar de red, desconéctate de Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"No puedes cambiar de red si te conectaste a Ethernet"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes del modo de avión"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conexión establecida"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"No se conectará automáticamente a Internet"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Color"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Otras opciones"</string>
     <string name="category_name_general" msgid="7737273712848115886">"General"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Ver todas las apps"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Desvío inteligente"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Se habilitó el Desvío inteligente"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Ingresa el número de teléfono"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Falta el número de teléfono."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Aceptar"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Permitir 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Usa conexión móvil 2G. La conexión 2G está siempre activada para llamadas de emergencia."</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4e8e9f7..f07dd12 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Aumenta o disminuye el tamaño del texto de la pantalla."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Reducir el tamaño"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Aumentar el tamaño"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Usar giro automático"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Texto de ejemplo"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"El maravilloso mago de Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> huella digital configurada</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Desbloqueo con huella digital"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Configura tu huella digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Usar tu huella digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Solo tienes que tocar el sensor de huellas digitales para desbloquear el teléfono, autorizar compras o iniciar sesión en aplicaciones. Ten cuidado con qué huellas digitales añades, porque se podrán realizar esas acciones con cualquiera de ellas."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Es posible que tu huella digital sea menos segura que un buen patrón o PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Tú decides"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Importante"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Los datos que registra la huella digital se almacenan de forma segura y nunca salen del teléfono. Puedes eliminarlos cuando quieras en Ajustes."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Es posible que tu huella digital sea menos segura que un buen patrón o PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Tu teléfono usará de vez en cuando imágenes recientes de tu huella digital para crear mejores modelos de huella digital."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utiliza tu huella digital para desbloquear el teléfono o aprobar compras.\n\nNota: No puedes utilizar tu huella digital para desbloquear este dispositivo. Si quieres consultar más información, ponte en contacto con el administrador de tu organización."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utiliza tu huella digital para desbloquear el teléfono o aprobar compras.\n\nNota: Es posible que tu huella digital sea menos segura que un buen patrón o PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, gracias"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Saltar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Acepto"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Saltar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Siguiente"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"¿Saltar la configuración de huella digital?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Saltar"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Toca el sensor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Mantén pulsado el icono de la huella digital"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Está en la parte trasera del teléfono. Utiliza el dedo índice."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Está en la pantalla. Busca una huella digital con un halo brillante."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"El sensor de huellas digitales está en la pantalla. Mueve el dedo por ella para encontrarlo."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustración con la ubicación del sensor de huellas digitales y dispositivo"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nombre"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Aceptar"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Eliminar"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Toca el sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Pon el dedo en el sensor y levántalo cuando notes una vibración"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Levanta el dedo y toca de nuevo"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Sigue levantando el dedo para añadir diferentes partes de tu huella digital"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Huella digital añadida"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Cuando veas este icono, utiliza tu huella digital para identificarte o aprobar compras"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Hacerlo más adelante"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Búsqueda"</string>
     <string name="display_settings" msgid="7197750639709493852">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Girar pantalla automáticamente"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desactivar"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Activar"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Activado: basado en caras"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Habilitar detección de caras"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturales"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Mejorados"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activado / La pantalla no se apagará si estás mirándola"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Desactivado"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Se necesita acceso a la cámara"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Toca para gestionar los permisos de Servicios de personalización del dispositivo"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Evita que la pantalla se apague si estás mirándola"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"La función Pantalla atenta usa la cámara frontal para detectar si hay alguien mirando la pantalla. Funciona solo en el dispositivo y las imágenes no se almacenan ni se envían a Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Activa Pantalla atenta"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Cuando la pantalla está apagada, se activa si hay notificaciones nuevas"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Mostrar información y hora"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Aumenta el uso de la batería"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Texto en negrita"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Texto en negrita"</string>
     <string name="title_font_size" msgid="570613010306330622">"Tamaño de la fuente"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Aumenta o disminuye el tamaño del texto"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Ajustes bloqueo de SIM"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Otros usuarios"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Almacenamiento del dispositivo"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Almacenamiento portátil"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmas y recordatorios"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Permitir crear alarmas o recordatorios"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmas y recordatorios"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Permite que esta aplicación programe alarmas u otros eventos basados en el tiempo. De este modo, podrá activarse y ejecutarse aunque no estés usando el dispositivo. Si revocas este permiso, es posible que la aplicación no funcione correctamente; en particular, no sonará ninguna alarma que la aplicación haya programado."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"programar, alarma, recordatorio, evento"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Usado: <xliff:g id="USED">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"En uso de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Servicios de ubicación"</string>
     <string name="location_title" msgid="5819154746934945021">"Mi ubicación"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Ubicación para el perfil de trabajo"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Acceso de aplicaciones a la ubicación"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"La ubicación está desactivada"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other">Aplicaciones con acceso a la ubicación: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
       <item quantity="one"> Aplicaciones con acceso a la ubicación: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g></item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Acceso reciente a la ubicación"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Ver detalles"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Ninguna aplicación ha solicitado la ubicación recientemente"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ninguna aplicación ha accedido recientemente a la ubicación"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Uso de batería elevado"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Poco uso de batería"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Búsqueda de Wi‑Fi y Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Búsqueda de redes Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permite que las aplicaciones y los servicios busquen redes Wi‑Fi en cualquier momento aunque la conexión Wi‑Fi esté desactivada. Se utiliza, por ejemplo, para mejorar los servicios y funciones basados en la ubicación."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Búsqueda de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que las aplicaciones y los servicios busquen dispositivos cercanos en cualquier momento aunque la conexión Bluetooth esté desactivada. Se utiliza, por ejemplo, para mejorar los servicios y funciones basados en la ubicación."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Servicios de ubicación"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servicios de ubicación para el trabajo"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detección de la zona horaria por ubicación"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detección de la zona horaria por ubicación"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permite que se utilice la ubicación del dispositivo para detectar la zona horaria actual. Otros ajustes de ubicación (como la búsqueda de redes Wi‑Fi) pueden afectar a la precisión de la detección de la zona horaria."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Activada"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desactivada"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Se ha inhabilitado la detección automática de la zona horaria"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"La zona horaria automática está desactivada"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"La detección de la zona horaria por ubicación está inhabilitada"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"No se admite la detección de la zona horaria por ubicación"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"No se permiten cambios en la detección de la zona horaria por ubicación"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Habilitar"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Borrar almacenamiento"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Desinstalar actualizaciones"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Has elegido iniciar esta aplicación de forma predeterminada para algunas acciones."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Algunas de las actividades que has seleccionado se abren en esta aplicación de forma predeterminada."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Has permitido que esta aplicación pueda crear widgets y acceder a sus datos."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"No se han establecido valores por defecto"</string>
-    <string name="clear_activities" msgid="341345438786077236">"Borrar valores predeterminados"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Borrar preferencias predeterminadas"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Es posible que esta aplicación no se haya diseñado para tu pantalla. Aquí puedes controlar cómo se ajusta a la pantalla."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Preguntar al iniciar"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Aplicación de escala"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Personaliza este dispositivo para adaptarlo a tus necesidades. Puedes modificar las funciones de accesibilidad más tarde en Ajustes."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Cambiar el tamaño de la fuente"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lectores de pantalla"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio y texto en pantalla"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtítulos"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Pantalla"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texto y pantalla"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Oscurecer pantalla"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rojo-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rojo-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarillo"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reducir brillo"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Reducir brillo"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Haz que la pantalla sea más oscura que el brillo mínimo del teléfono"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Haz que la pantalla sea más oscura que el brillo mínimo del tablet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Oscurece la pantalla para que te sea más cómodo leer en ella.&lt;br/&gt;&lt;br/&gt; Esta opción puede resultar útil en estos casos: &lt;ol&gt; &lt;li&gt; Hay demasiado brillo aun con el ajuste del teléfono en el valor mínimo&lt;/li&gt; &lt;li&gt; Estás usando el teléfono en la oscuridad; por ejemplo, porque es de noche o porque estás en una habitación oscura antes de irte a la cama&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"cara"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"huella digital, añadir huella digital"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"atenuar pantalla, pantalla táctil, batería, brillo inteligente, brillo dinámico, brillo automático"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"atenuar pantalla, suspensión, batería, tiempo de espera, atención, pantalla, inactividad"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"rotar, girar, rotación, retrato, paisaje, orientación, vertical, horizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"actualizar, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"no molestar, programar, notificaciones, bloquear, silencio, vibrar, sueño, trabajo, concentración, sonido, silenciar, día, días laborables, fin de semana, noches de la semana, evento"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"pantalla, hora de bloqueo, tiempo de espera, suspender, pantalla de bloqueo"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Tonos de llamada"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Otros sonidos y vibraciones"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificaciones"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversación"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Enviadas recientemente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ver las de los últimos 7 días"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avanzado"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificaciones de trabajo"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificaciones adaptativas"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioridad de notificaciones adaptable"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Se muestra en el desplegable, la barra de estado y la pantalla de bloqueo"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"No mostrar notificaciones silenciosas en la barra de estado"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Luz parpadeante"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notificaciones en la pantalla de bloqueo"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacidad"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Saltar pantalla de bloqueo"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Después del desbloqueo facial, ir a la última pantalla usada"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Pantalla de bloqueo, pantalla bloqueo, saltar, evitar"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">Aproximadamente <xliff:g id="NUMBER_0">%d</xliff:g> notificación a la semana</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nunca"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Acceso a notificaciones"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Notificaciones del dispositivo y de aplicaciones"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Controla qué notificaciones se muestran en tus aplicaciones y dispositivos"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Se ha bloqueado el acceso a las notificaciones del perfil de trabajo"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Las aplicaciones no pueden leer notificaciones"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Desactivar"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Cancelar"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Tipos de notificaciones permitidas"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Notificaciones continuas importantes"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Notificaciones de conversaciones"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Notificaciones de alerta"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Notificaciones silenciosas"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"En tiempo real"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Comunicación en tiempo real de aplicaciones en uso, de navegación, de llamadas y más"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Conversaciones"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS y otras comunicaciones"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Predeterminado"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Notificaciones que pueden hacer que el dispositivo suene o vibre según los ajustes"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Silencio"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Notificaciones que nunca hacen que el dispositivo suene o vibre"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Ver todas las aplicaciones"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Cambia los ajustes de notificaciones de cada aplicación que puede enviar notificaciones"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Aplicaciones que se muestran en el dispositivo"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Servicios de ayuda de RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ninguna aplicación instalada ha solicitado ejecutarse como servicios de ayuda de RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"¿Permitir que el servicio de RV acceda a <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Abrir de forma predeterminada"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Abrir enlaces"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Abrir enlaces compatibles"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Los enlaces compatibles se abren en esta aplicación"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Enlaces que abrir en esta aplicación"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Se abren sin preguntar"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Enlaces compatibles"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Otros ajustes predeterminados"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Otras preferencias predeterminadas"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Añadir enlace"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Una aplicación puede verificar enlaces para abrirlos automáticamente. "<annotation id="url">"Más información"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> enlaces verificados</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> enlace verificado</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Estos enlaces están verificados y se abren automáticamente en esta aplicación.</item>
+      <item quantity="one">Este enlace está verificado y se abre automáticamente en esta aplicación.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Aceptar"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Buscando otros enlaces compatibles…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Cancelar"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> enlaces compatibles</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> enlace compatible</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Añadir"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Se abre en <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> usados en <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"almacenamiento interno"</string>
     <string name="storage_type_external" msgid="125078274000280821">"almacenamiento externo"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"No se permite usar la cámara"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"No se permiten capturar pantallas"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"No se puede abrir esta aplicación"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Si tienes alguna pregunta, ponte en contacto con tu administrador de TI"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Más información"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"El administrador puede supervisar y gestionar las aplicaciones y los datos asociados a tu perfil de trabajo, como los ajustes, los permisos, el acceso corporativo, la actividad de red y la información de ubicación del dispositivo."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"El administrador puede supervisar y gestionar las aplicaciones y los datos asociados a este usuario, como los ajustes, los permisos, el acceso corporativo, la actividad de red y la información de ubicación del dispositivo."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 restricción</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"El cálculo del uso de datos del operador puede ser diferente al calculado por el dispositivo."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"No se incluyen los datos utilizados en redes de operadores"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"No incluye datos usados en redes de operadores"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> usados"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Establecer advertencia de datos"</string>
     <string name="data_warning" msgid="2925054658166062884">"Advertencia de datos"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(opción desinstalada para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(opción inhabilitada para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Autocompletar"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automático, completar, autocompletar"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Contraseñas"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automático, completar, autocompletar, contraseña"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Asegúrate de que confías en esta aplicación&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Autocompletar de Google&gt;%1$s&lt;/xliff:g&gt; utiliza el contenido que se muestra en la pantalla para determinar el texto que se puede autocompletar."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Autocompletar"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Nivel de registro"</string>
@@ -4873,7 +4921,7 @@
     <string name="mobile_network_active_sim" msgid="6397581267971410039">"Activo / SIM"</string>
     <string name="mobile_network_inactive_sim" msgid="5829757490580409899">"Inactivo / SIM"</string>
     <string name="mobile_network_active_esim" msgid="4673190244386572318">"Activa / SIM descargada"</string>
-    <string name="mobile_network_inactive_esim" msgid="2901035056727849007">"Inactivo / SIM descargada"</string>
+    <string name="mobile_network_inactive_esim" msgid="2901035056727849007">"Inactiva / SIM descargada"</string>
     <string name="mobile_network_sim_name" msgid="3187192894150386537">"Nombre y color de la SIM"</string>
     <string name="mobile_network_sim_name_label" msgid="1452440641628369625">"Nombre"</string>
     <string name="mobile_network_sim_color_label" msgid="5293944087609632340">"Color (en aplicaciones compatibles)"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Cambiar el modo operativo de la red"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipo de red preferido"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operador"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versión de Ajustes"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versión de ajustes del operador"</string>
     <string name="call_category" msgid="641461844504128789">"Llamadas"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videollamadas a través del operador"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Selección del sistema"</string>
@@ -4915,10 +4963,10 @@
     <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"¿Activar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"¿Activar tarjeta SIM?"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"¿Cambiar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
-    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"¿Pasar a usar tarjeta SIM?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"¿Usar la tarjeta SIM?"</string>
     <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Solo puede haber una tarjeta SIM activa a la vez.\n\nSi cambias a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, no se cancelará tu servicio de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
     <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Solo puede haber una tarjeta SIM descargada activa a la vez.\n\nSi cambias a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, no se cancelará tu servicio de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
-    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Solo puede haber una tarjeta SIM activa a la vez.\n\nSi cambias, no se cancelará tu servicio de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Solo puede haber una tarjeta SIM activa a la vez.\n\nEl cambio no cancelará tu servicio de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Cambiar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Conectándose a la red…"</string>
     <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Cambiando a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Extrae la tarjeta SIM e insértala de nuevo. Si el problema continúa, reinicia el dispositivo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prueba a activar la tarjeta SIM de nuevo. Si el problema continúa, reinicia el dispositivo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activación de la red"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Cambiando de operador"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> está activo"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toca para actualizar los ajustes de la tarjeta SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Se ha pasado a usar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desactivado"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Mostrar redes disponibles en el modo avión"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Busca y conéctate a redes en el modo avión."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Busca y conéctate a redes Wi-Fi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"modo avión, seguro para modo avión"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Llamadas y SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Llamada por Wi-Fi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"no disponible"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"No disponible temporalmente"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Sin tarjeta SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencias"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferencias de red"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectarse a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexión de red, internet, inalámbrico, datos, wifi, wi-fi, wi fi, datos móviles, móvil, operador de telefonía, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ver redes disponibles en el modo avión"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Mostrando redes disponibles en el modo avión"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Activar redes"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Desactivar redes"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"¿Restablecer tu conexión a Internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Así finalizará la llamada"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Así finalizará la llamada"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Restableciendo tu conexión a Internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Arreglar conectividad"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Redes disponibles en el modo avión"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para cambiar de red, desconecta el cable Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"No se puede cambiar de red con el dispositivo conectado"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes para modo avión"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectada"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet no se conectará automáticamente"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Color"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Otros"</string>
     <string name="category_name_general" msgid="7737273712848115886">"General"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Ver todas las aplicaciones"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Desvío inteligente"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Desvío inteligente habilitado"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Introducir número de teléfono"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Falta el número de teléfono."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Aceptar"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Permitir el 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Usar conexiones móviles 2G. En las llamadas de emergencia, el 2G siempre está activado."</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 12b8cba..30d04a7 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Muutke ekraanil kuvatavat teksti suuremaks või väiksemaks."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Vähendamine"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Suurendamine"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Kasuta automaatset pööramist"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Näidistekst"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Võlur Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> sõrmejälg on seadistatud</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Sõrmejäljega avamine"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Sõrmejälje seadistamine"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Sõrmejälje kasutamine"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Telefoni avamiseks, ostude volitamiseks või rakendustesse sisse logimiseks peate vaid puudutama sõrmejäljeandurit. Olge sõrmejälgede lisamisel ettevaatlik. Neid toiminguid saab teha isegi ühe lisatud sõrmejäljega."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Teie sõrmejälg võib olla ebaturvalisem kui tugev muster või PIN-kood."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Teie juhite toimuvat"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Pidage meeles"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Sõrmejäljefunktsiooni salvestatud andmed talletatakse turvaliselt ja neid ei edastata telefonist väljapoole. Seadetes võite oma andmed alati kustutada."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Teie sõrmejälg võib olla ebaturvalisem kui tugev muster või PIN-kood."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Telefon kasutab aeg-ajalt teie sõrmejälje hiljutisi pilte, et luua paremaid sõrmejälje mudeleid."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Kasutage telefoni avamiseks või ostude kinnitamiseks oma sõrmejälge.\n\nMärkus: te ei saa kasutada oma sõrmejälge selle seadme avamiseks. Lisateabe saamiseks võtke ühendust oma organisatsiooni administraatoriga."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Kasutage telefoni avamiseks või ostude kinnitamiseks oma sõrmejälge.\n\nMärkus: teie sõrmejälg võib olla ebaturvalisem kui tugev muster või PIN-kood."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Tühista"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Tänan, ei"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Jäta vahele"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Jätka"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Nõustun"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Jäta vahele"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Järgmine"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Kas jätta sõrmejälg vahele?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Jäta vahele"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Tühista"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Puudutage andurit"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Puudutage sõrmejälje ikooni pikalt"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"See asub telefoni tagaküljel. Kasutage oma nimetissõrme."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"See on ekraanil kuvatud. Leidke helendava ringiga sõrmejälg."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Sõrmejäljeandur on ekraani sees. Anduri leidmiseks liigutage sõrme ekraani peal."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Seadme joonis ja sõrmejäljeanduri asukoht"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nimi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Kustuta"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Puudutage andurit"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Asetage oma sõrm andurile ja kui tunnete värinat, siis tõstke see üles."</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Tõstke, seejärel puudutage uuesti"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Tõstke sõrme, et lisada sõrmejälje eri osad."</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Sõrmejälg on lisatud"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Kui näete seda ikooni, kasutage tuvastamiseks või ostude kinnitamiseks oma sõrmejälge."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Teen seda hiljem"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Otsing"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ekraan"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Pööra ekraani automaatselt"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Väljas"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Sees"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Sees – näopõhine"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Luba näotuvastus"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Värvid"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Loomulikud"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Võimendatud"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Sees / ekraan jääb sisselülitatuks, kui seda vaatate"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Väljas"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Vajalik on kaamera juurdepääs"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Puudutage, et hallata seadme isikupärastamise teenuste lube"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Takistab ekraani väljalülitamist, kui seda vaatate"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Ekraanivaatamise tuvastuse funktsioon kontrollib esikaamera abil, kas keegi vaatab ekraani. See töötab ainult seadmes ja pilte ei salvestata kunagi ega saadeta Google\'ile."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Lülita ekraanivaatamise tuvastus sisse"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kui ekraan on välja lülitatud, lülitatakse see uute märguannete puhul sisse"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Alati aja ja teabe kuvamine"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Suurem akukasutus"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Paks tekst"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Paks tekst"</string>
     <string name="title_font_size" msgid="570613010306330622">"Fondi suurus"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Teksti suuremaks või väiksemaks muutmine"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM-kaardi luku seaded"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Teised kasutajad"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Seadme salvestusruum"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Kaasaskantav salvestusruum"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Äratused ja meeldetuletused"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Luba määrata äratusi või meeldetuletusi"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Äratused ja meeldetuletused"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Lubage sellel rakendusel ajastada äratusi või muid ajapõhiseid sündmusi. See võimaldab rakendusel ärgata ja käivituda ka siis, kui te seadet ei kasuta. Pange tähele, et selle loa tühistamine võib tekitada rakenduse väärtalitlust. Näiteks ei tööta enam rakenduses ajastatud äratused."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"ajakava, äratus, meeldetuletus, sündmus"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Kasutatud <xliff:g id="USED">%1$s</xliff:g> <xliff:g id="TOTAL">%2$s</xliff:g>-st"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Kasutatud <xliff:g id="TOTAL">%1$s</xliff:g>-st"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Asukohateenused"</string>
     <string name="location_title" msgid="5819154746934945021">"Minu asukoht"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Tööprofiili asukohaluba"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Rakenduse juurdepääs asukohale"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Asukoht on välja lülitatud"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> rakendusel <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g>-st on asukohale juurdepääs</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> rakendusel <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g>-st on asukohale juurdepääs</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Hiljutine juurdepääs asukohale"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Kuva üksikasjad"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Ükski rakendus pole hiljuti asukohateavet küsinud"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ükski rakendus ei ole hiljuti asukohale juurde pääsenud"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Suur akukasutus"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Madala tarbimisega akukasutus"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"WiFi ja Bluetoothi skannimine"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"WiFi-skannimine"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Lubage rakendustel ja teenustel alati otsida WiFi-võrke, isegi kui WiFi on väljas. Seda saab kasutada näiteks asukohapõhiste funktsioonide ja teenuste täiustamiseks."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetoothi skannimine"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Lubage rakendustel ja teenustel alati otsida läheduses olevaid seadmeid, isegi kui Bluetooth on väljas. Seda saab kasutada näiteks asukohapõhiste funktsioonide ja teenuste täiustamiseks."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Asukohateenused"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Asukohateenused töö jaoks"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Asukohapõhine ajavööndi tuvastamine"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Asukohapõhine ajavööndi tuvastamine"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Lubab kasutada seadme asukohta praeguse ajavööndi tuvastamiseks. Ajavööndi tuvastamise täpsust võivad mõjutada teised asukohaseaded, näiteks WiFi-skannimine."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Sees"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Väljas"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automaatne ajavööndi tuvastamine on keelatud"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automaatne ajavöönd on välja lülitatud"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Asukohapõhine ajavööndi tuvastamine on keelatud"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Asukohapõhine ajavööndi tuvastamine pole toetatud"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Asukohapõhise ajavööndi tuvastamise muudatused pole lubatud"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Luba"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Tühjenda salvestusruum"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Desinstalli värskendused"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Olete otsustanud selle rakenduse mõne toimingu puhul käivitada vaikimisi."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Mõni teie valitud tegevus avaneb selles rakenduses vaikimisi."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Olete lubanud sellel rakendusel vidinaid luua ja nende andmetele juurde pääseda."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Vaikeväärtused pole määratud."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Kustuta vaikeväärtused"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Tühista vaike-eelistused"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"See rakendus ei pruugi teie ekraanile sobida. Sobivust saate kontrollida siin."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Küsi käivitamisel"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Skaleeri rakendus"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Seadet saab kohandada vastavalt oma vajadustele. Neid juurdepääsetavuse funktsioone saab hiljem muuta menüüs Seaded."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Muutke fondi suurust"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekraanilugejad"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Heli ja ekraanil kuvatud tekst"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtiitrid"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Heli"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Üldine"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekraan"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst ja ekraanikuva"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekraanikuva muutmine tumedamaks"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Punane-roheline"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Punane-roheline"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Sinine-kollane"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Ereduse vähendamine"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Ereduse vähendamine"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Muutke ekraanikuva pimedamaks kui teie telefoni miinimumeredus"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Muutke ekraanikuva pimedamaks kui teie tahvelarvuti miinimumeredus"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Muutke ekraanikuva tumedamaks, et seda oleks mugavam lugeda.&lt;br/&gt;&lt;br/&gt; See võib olla kasulik järgmistel juhtudel. &lt;ol&gt; &lt;li&gt; Teie telefoni vaikemiinimumheledus on siiski liiga ere.&lt;/li&gt; &lt;li&gt; Kasutate oma telefoni pimedas, näiteks öösel või pimedas ruumis enne magamaminekut.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3176,7 +3197,7 @@
 </xliff:g>Selle teabe abil tuvastatakse, kas kontaktid saavad kasutada teatud funktsioone, nagu videokõned või mõned sõnumsidefunktsioonid."</string>
     <string name="preferred_network_type_title" msgid="812509938714590857">"Eelistatud võrgutüüp"</string>
     <string name="preferred_network_type_summary" msgid="8786291927331323061">"LTE (soovitatav)"</string>
-    <string name="mms_message_title" msgid="6624505196063391964">"Multimeediumsõnumid"</string>
+    <string name="mms_message_title" msgid="6624505196063391964">"MMS-sõnumid"</string>
     <string name="mms_message_summary" msgid="2855847140141698341">"Saatmine ja vastuvõtmine, kui mobiilne andmeside on väljas"</string>
     <string name="data_during_calls_title" msgid="3940276893360429144">"Kõnede ajal andmeside lubamine"</string>
     <string name="data_during_calls_summary" msgid="2289050189544214759">"Lubab kasutada seda SIM-i mobiilseks andmesideks ainult kõnede ajal"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"nägu"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"sõrmejälg, sõrmejälje lisamine"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"ekraani hämardamine, puuteekraan, aku, nutikas heledus, dünaamiline heledus, automaatne heledus"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"ekraani hämardamine, unerežiim, aku, ajalõpp, tuvastus, ekraan, ekraanikuva, tegevusetus"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"pöörama, vahetamine, pööramine, vertikaalpaigutus, horisontaalpaigutus, suund, vertikaalne, horisontaalne"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"versiooniuuendus, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, ajakava, märguanded, blokeerimine, vaikus, vibreerimine, unerežiim, töö, keskendumine, heli, vaigistamine, päev, tööpäev, nädalalõpp, öö nädala sees, sündmus"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"kuva, lukustusaeg, ajalõpp, lukustuskuva"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Helinad"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Muud helid ja värinad"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Märguanded"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Vestlus"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Hiljuti saadetud"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Kuva kõik viimase 7 päeva kohta"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Täpsemad"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Üldine"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Töö märguanded"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Kohanduvad märguanded"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Kohanduvate märguannete prioriteet"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Kuva allatõmmatavas menüüs, olekuribal ja lukustuskuval"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Peida vaiksed märguanded olekuribal"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Vilkuv tuli"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Märguanded lukustuskuval"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privaatsus"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Lukustuskuva vahelejätmine"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Pärast Face Unlocki kasutamist avaneb viimati vaadatud kuva"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lukustuskuva, lukustuskuva, vahelejätmine, mittekasutamine"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> märguanne nädalas</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Mitte kunagi"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Juurdepääs märguannetele"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Seadmete ja rakenduste märguanded"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Määrake, milliseid märguandeid teie rakendustes ja seadmetes kuvatakse"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Juurdepääs tööprofiili märguannetele on blokeeritud"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Rakendused ei suuda märguandeid lugeda"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Lülita välja"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Tühista"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Lubatud märguannete tüübid"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Olulised pooleliolevad märguanded"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Vestluste märguanded"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Hoiatusmärguanded"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Hääletud märguanded"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Reaalajas"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Reaalajas suhtlused kasutatavatest rakendustest, navigeerimine, telefonikõned ja muu"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Vestlused"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS-id ja muud suhtlused"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Vaikeseade"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Märguanded, mis võivad olenevalt seadetest heliseda või vibreerida"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Hääletu"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Märguanded, mis ei tee kunagi häält ega vibreeri"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Kuva kõik rakendused"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Muutke märguandeseadeid iga rakenduse jaoks, mis saab märguandeid saata"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Seadmes kuvatud rakendused"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-abilise teenused"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ükski installitud rakendus pole taotlenud VR-abilise teenusena käitamist."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Kas lubada VR-teenuse juurdepääs teenusele <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Ava vaikimisi"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Linkide avamine"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Toetatud linkide avamine"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Selles rakenduses avanevad toetatud lingid"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Rakenduses avatavad lingid"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Avamine ilma küsimata"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Toetatud lingid"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Muud vaikeseaded"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Muud vaike-eelistused"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Lingi lisamine"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Rakendus võib linke kinnitada, et neid automaatselt avada. "<annotation id="url">"Lisateave"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kinnitatud linki</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kinnitatud link</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Need lingid on kinnitatud ja avanevad rakenduses automaatselt.</item>
+      <item quantity="one">See link on kinnitatud ja avaneb rakenduses automaatselt.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Muude toetatud linkide otsimine …"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Loobu"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> toetatud linki</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> toetatud link</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Lisa"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Avaneb rakenduses <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> kasutusel (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"sisemine salvestusruum"</string>
     <string name="storage_type_external" msgid="125078274000280821">"väline salvestusruum"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Kaamera ei ole lubatud"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Ekraanipildi tegemine ei ole lubatud"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Seda rakendust ei saa avada"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Küsimuste korral võtke ühendust IT-administraatoriga"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Rohkem üksikasju"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Teie administraator saab jälgida ja hallata teie tööprofiiliga seotud rakendusi ning andmeid, sh seadeid, lube, ettevõtte juurdepääsu, võrgutegevusi ja seadme asukohateavet."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Teie administraator saab jälgida ja hallata selle kasutajaga seotud rakendusi ning andmeid, sh seadeid, lube, ettevõtte juurdepääsu, võrgutegevusi ja seadme asukohateavet."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 piirang</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operaatori andmemahuarvestus võib erineda seadme andmemahuarvestusest"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Välistab andmed, mida kasutatakse operaatorite võrkude kaudu"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Välistab operaatorite võrkude kasutatavad andmed"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> on kasutatud"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Andmekasutuse hoiatuse määramine"</string>
     <string name="data_warning" msgid="2925054658166062884">"Andmemahu hoiatus"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(desinstall. kasutaja <xliff:g id="USER">%s</xliff:g> jaoks)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(keelatud kasutaja <xliff:g id="USER">%s</xliff:g> jaoks)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Automaattäite teenus"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automaatne, täide, automaattäide"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Paroolid"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automaatne, täitmine, automaattäide, parool"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Veenduge, et rakendus oleks usaldusväärne&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google\'i automaatne täitmine&gt;%1$s&lt;/xliff:g&gt; kasutab automaatse täitmise sisestuse määramiseks ekraanil kuvatut."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Automaattäide"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Logimistase"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Võrgu töörežiimi muutmine"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Eelistatud võrgutüüp"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operaator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Seadete versioon"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operaatori seadete versioon"</string>
     <string name="call_category" msgid="641461844504128789">"Helistamine"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operaatori videokõne"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Süsteemi valimine"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Eemaldage SIM-kaart ja sisestage uuesti. Kui probleem jätkub, taaskäivitage seade."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Lülitage SIM-kaart uuesti sisse. Kui probleem jätkub, taaskäivitage seade."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Võrgu aktiveerimine"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operaatori vahetamine"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> on aktiivne"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Puudutage SIM-kaardi seadete värskendamiseks"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Lülituti operaatorile <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Väljas"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kaardid"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Kuva lennukirežiimis saadaolevad võrgud"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Otsige lennukirežiimis võrke ja looge nendega ühendus."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"WiFi-võrkude otsimine ja nendega ühenduse loomine"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lennuk, lennukikindel"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Kõned ja SMS-id"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"WiFi-kõned"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"pole saadaval"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Pole ajutiselt saadaval"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM-kaarti pole"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Eelistused"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Võrgueelistused"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Ühenda avalike võrkudega"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"võrguühendus, internet, juhtmeta, andmeside, wifi, wi-fi, wi fi, mobiilside, mobiilsideoperaator, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Kuva lennukirežiimi võrgud"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Kuvatud on lennukirežiimi võrgud"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Lülita võrgud sisse"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Lülita võrgud välja"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Kas lähtestada internetiühendus?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"See lõpetab teie telefonikõne"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"See lõpetab teie telefonikõne"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Internetiühenduse lähtestamine …"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Ühenduvuse parandamine"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Saadaolevad lennukirežiimi võrgud"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Võrkude vahetamiseks katkestage Etherneti-ühendus"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ühenduse korral ei saa võrku vahetada"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Lennukirežiimi võrgud"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ühendatud"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internetiühendust ei looda automaatselt"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Värv"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Muud"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Üldine"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Kuva kõik rakendused"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Nutikas suunamine"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Nutikas suunamine on lubatud"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Sisestage telefoninumber"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefoninumber puudub."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Luba 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Kasutage mobiilset 2G-andmesidet. Hädaabikõnede jaoks on 2G alati sisse lülitatud."</string>
 </resources>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index fdee660..3a4694b 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -101,7 +101,7 @@
     <!-- no translation found for wifi_tether_security:2 (6851763638266088835) -->
     <!-- no translation found for wifi_tether_security:3 (5512131148045414341) -->
   <string-array name="eap_ocsp_type">
-    <item msgid="7202884222741437608">"Ez balidatu"</item>
+    <item msgid="7202884222741437608">"Ez baliozkotu"</item>
     <item msgid="5703177653586269306">"Eskatu ziurtagirien egoera emateko"</item>
     <item msgid="326388247868439528">"Behartu ziurtagirien egoera ematera"</item>
     <item msgid="1090956283885790552">"Behartu fidagarritzat jotzen ez diren ziurtagiri guztien egoera ematera"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 0afc574..28ca739 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Handitu edo txikitu pantailako testua."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Txikitu"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Handitu"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Erabili Automatikoki biratu"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Testu-lagina"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Ozeko azti miragarria"</string>
@@ -376,7 +375,7 @@
     <string name="security_settings_face_enroll_should_re_enroll_title" msgid="9080635904939148410">"Hobetu aurpegiaren bidez desblokeatzeko eginbidea"</string>
     <string name="security_settings_face_enroll_should_re_enroll_subtitle" msgid="2318506792574194633">"Konfiguratu berriro aurpegiaren bidez desblokeatzeko eginbidea"</string>
     <string name="security_settings_face_enroll_must_re_enroll_title" msgid="8907917317111783249">"Konfiguratu berriro aurpegiaren bidez desblokeatzeko eginbidea"</string>
-    <string name="security_settings_face_enroll_must_re_enroll_subtitle" msgid="3584740139535177961">"Hobetu segurtasuna eta funtzionamendua"</string>
+    <string name="security_settings_face_enroll_must_re_enroll_subtitle" msgid="3584740139535177961">"Hobetu segurtasuna eta errendimendua"</string>
     <string name="security_settings_face_enroll_improve_face_alert_title" msgid="7124713074067550039">"Konfiguratu aurpegiaren bidez desblokeatzeko eginbidea"</string>
     <string name="security_settings_face_enroll_improve_face_alert_body" msgid="950213874209080175">"Ezabatu aurpegiaren datuak aurpegiaren bidez desblokeatzeko eginbidea berriro konfiguratzeko.\n\nEginbide horrek erabiltzen dituen aurpegiaren datuak modu seguruan eta betiko ezabatuko dira. Horren ondoren, PINa, eredua edo pasahitza beharko duzu telefonoa desblokeatzeko, aplikazioetan saioa hasteko eta ordainketak berresteko."</string>
     <string name="security_settings_face_settings_use_face_category" msgid="2374998717426341095">"Erabili hauetarako:"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> hatz-marka konfiguratuta</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Desblokeatu hatz-marka bidez"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Konfiguratu hatz-marka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Erabili hatz-marka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Sakatu hatz-marken sentsorea telefonoa desblokeatzeko, erosketak baimentzeko edo aplikazioetan saioa hasteko. Kontuz aukeratu noren hatz-markak gehitzen dituzun; izan ere, gehitzen dituzun hatz-markak arestian aipatutako guzti-guztiak egiteko gai izango dira."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Baliteke hatz-markak ez izatea eredu edo PIN kode konplexuak bezain seguruak."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Zure esku dago"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Gogoan izan"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Fingerprint-ek grabatutako datuak modu seguruan gordetzen dira telefonoan, ez dira ateratzen bertatik eta nahi duzunean ezaba ditzakezu ezarpenetan."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Baliteke hatz-markak ez izatea eredu edo PIN kode konplexuak bezain seguruak."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Noizean behin, hatz-markaren azken irudiak erabiliko ditu telefonoak, hartz-markaren eredu hobetuak sortzeko."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Erabili hatz-marka telefonoa desblokeatzeko eta erosketak onartzeko.\n\nOharra: ezin duzu erabili hatz-marka gailu hau desblokeatzeko. Informazio gehiago lortzeko, jarri zure erakundearen administratzailearekin harremanetan."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Erabili hatz-marka telefonoa desblokeatzeko eta erosketak onartzeko.\n\nOharra: baliteke hatz-markak ez izatea eredu edo PIN kode konplexuak bezain seguruak."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Utzi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ez, eskerrik asko"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Saltatu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Egin aurrera"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Onartu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Saltatu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Hurrengoa"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Hatz-markaren urratsa saltatu?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Saltatu"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Utzi"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Ukitu sentsorea"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Eduki sakatuta hatz-markaren ikonoa"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Telefonoaren atzealdean dago. Erabili hatz erakuslea."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Pantailan dago. Bilatu birbil distiratsu bat daukan hatz-marka."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Hatz-marken sentsorea pantailan dago. Hura bilatzeko, mugitu hatza pantailan."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Hatz-marken sentsorea gailuan non dagoen erakusten duen ilustrazioa"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Izena"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Ados"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Ezabatu"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Ukitu sentsorea"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Ezarri hatza sentsorean eta, dardara sentitzen duzunean, jaso ezazu"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Jaso hatza eta ukitu berriro"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Jarraitu hatza jasotzen, hatz-markaren zati guztiak gehitzeko"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Gehitu da hatz-marka"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Ikono hau ikusten duzunean, erabili hatz-marka zeure burua identifikatzeko edo erosketak onartzeko"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Geroago"</string>
@@ -951,7 +965,7 @@
     <string name="wifi_dpp_connecting" msgid="2312769193202897589">"Konektatzen…"</string>
     <string name="wifi_dpp_share_hotspot" msgid="6186452780604755316">"Partekatu wifi-gunea"</string>
     <string name="wifi_dpp_lockscreen_title" msgid="4231438175617953652">"Egiaztatu zeu zarela"</string>
-    <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wifi-sarearen pasahitza: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
+    <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wifi-sareko pasahitza: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Wifi-gunearen pasahitza: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Konexio automatikoa"</string>
     <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Baimendu sare honetara konektatzea barrutian dagoenean"</string>
@@ -965,7 +979,7 @@
     <string name="wifi_multiple_cert_added" msgid="2151019652853383776">"(Ziurtagiri batzuk gehitu dira)"</string>
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Erabili sistemaren ziurtagiriak"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ez zehaztu"</string>
-    <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ez balidatu"</string>
+    <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ez baliozkotu"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Sarearen izena luzeegia da."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domeinua zehaztu behar da."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Ziurtagiria behar da."</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Bilaketa"</string>
     <string name="display_settings" msgid="7197750639709493852">"Bistaratzea"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Biratu pantaila automatikoki"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desaktibatuta"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Aktibatuta"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Aktibatuta: aurpegian oinarrituta"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Gaitu Aurpegi-hautematea"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Koloreak"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturalak"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Nabarmenduak"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aktibatuta / Pantaila ez da itzaliko hari begira zauden bitartean"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Desaktibatuta"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Kamera erabiltzeko baimena behar da"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Sakatu Gailua pertsonalizatzeko zerbitzuen baimenak kudeatzeko"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Pantaila itzaltzea eragozten du hari begira zauden bitartean"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Pantaila kontzientea eginbideak aurreko kamera erabiltzen du inor pantailari begira dagoen jakiteko. Gailuan funtzionatzen du, eta irudiak ez dira inoiz gordetzen, ez eta Google-ra bidaltzen ere."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Aktibatu pantaila kontzientea"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Pantaila ilun dagoenean, piztu egiten da jakinarazpenak jasotzean"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Erakutsi ordua eta informazioa"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Bateria asko kontsumitzen du"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Testu lodia"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Testu lodia"</string>
     <string name="title_font_size" msgid="570613010306330622">"Letra-tamaina"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Handitu edo txikitu testua"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM txartelaren blokeo-ezarpenak"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Beste erabiltzaileak"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Gailuaren memoria"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Memoria-unitate eramangarriak"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmak eta abisuak"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Eman alarmak edo abisuak ezartzeko baimena"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmak eta abisuak"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Eman alarmak edo denboran oinarritutako beste gertaera batzuk programatzeko baimena aplikazioari. Horrek gailua aktibatu eta exekutatzeko aukera emango dio aplikazioari, baita gailua erabiltzen ari ez zarenean ere. Kontuan izan baimen hori baliogabetzen baduzu, aplikazioak gaizki funtzionatuko duela agian; zehazki, aplikazioak programatu dituen alarmek ez dute funtzionatuko."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"programazioa, alarma, abisua, gertaera"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Memoria osotik (<xliff:g id="TOTAL">%1$s</xliff:g>} erabilitakoa"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Kokapen-zerbitzuak"</string>
     <string name="location_title" msgid="5819154746934945021">"Nire kokapena"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Laneko profilaren kokapena"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Aplikazioaren kokapenerako sarbidea"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Kokapena desaktibatuta dago"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>/<xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplikaziok kokapena atzi dezakete</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g>/<xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> aplikaziok kokapena atzi dezake</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Kokapena atzitutako azkenak"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Ikusi xehetasunak"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Ez dago kokapena duela gutxi eskatu duen aplikaziorik"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ez dago kokapena berriki atzitu duen aplikaziorik"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Bateria-erabilera handia"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Bateria-erabilera txikia"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wifi-sareen bilaketa eta Bluetooth bidezko gailuen bilaketa"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wifi-sareen bilaketa"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Eman wifi-sareak edozein unetan bilatzeko baimena aplikazioei eta zerbitzuei, baita wifi-konexioa desaktibatuta dagoenean ere. Kokapenean oinarritutako eginbideak eta zerbitzuak hobetzeko erabil daiteke hori, besteak beste."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth bidezko gailuen bilaketa"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Eman inguruko gailuak edozein unetan bilatzeko baimena aplikazioei eta zerbitzuei, baita Bluetooth-a desaktibatuta dagoenean ere. Kokapenean oinarritutako eginbideak eta zerbitzuak hobetzeko erabil daiteke hori, besteak beste."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Kokapen-zerbitzuak"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Lanerako kokapen-zerbitzuak"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Kokapeneko ordu-zona hautemateko aukera"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Kokapeneko ordu-zona hautemateko aukera"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Eman gailuaren kokapena erabiltzeko baimena uneko ordu-zona hauteman ahal izateko. Beste kokapen-ezarpen batzuek (adibidez, wifi-sareen bilaketak) eragina izan dezakete ordu-zona hautemateko zehaztasunean."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Aktibatuta"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desaktibatuta"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Desgaituta dago ordu-zona automatikoki hautemateko aukera"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Ordu-zona automatikoa desaktibatuta dago"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Kokapeneko ordu-zona hautemateko aukera desgaituta dago"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Ez da onartzen kokapeneko ordu-zona hautemateko aukera erabiltzea"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Ez da onartzen aldaketarik egitea kokapeneko ordu-zona hautemateko aukeretan"</string>
@@ -1897,7 +1916,7 @@
     <string name="forgot_password_text" msgid="2583194470767613163">"PIN kodea, eredua edo pasahitza berrezartzen lagunduko dizu"</string>
     <string name="install_all_warning" product="tablet" msgid="7010749217925069520">"Tabletak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik tabletari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu zarela."</string>
     <string name="install_all_warning" product="default" msgid="652516435709047343">"Telefonoak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartzen duzu haiek erabiltzeagatik telefonoari gerta dakizkiokeen kalteen edo datu-galeren erantzulea zeu zarela."</string>
-    <string name="install_all_warning" product="device" msgid="2348262609815354500">"Gailuak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartuko duzu haiek erabiltzeagatik gailuari agian gertatuko zaizkion kalteen edo datu-galeren erantzulea zeu izango zarela."</string>
+    <string name="install_all_warning" product="device" msgid="2348262609815354500">"Gailuak eta datu pertsonalek aplikazio ezezagunen erasoak jaso ditzakete. Iturburu honetako aplikazioak instalatzen badituzu, onartu egingo duzu haiek erabiltzeagatik gailuari agian gertatuko zaizkion kalteen edo datu-galeren erantzulea zeu izango zarela."</string>
     <string name="advanced_settings" msgid="2368905204839169094">"Ezarpen aurreratuak"</string>
     <string name="advanced_settings_summary" msgid="1823765348195530035">"Gaitu ezarpenen aukera gehiago"</string>
     <string name="application_info_label" msgid="1015706497694165866">"Aplikazioen informazioa"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Gaitu"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Garbitu biltegia"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Desinstalatu eguneratzeak"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Ekintza batzuk egiterakoan aplikazioa modu lehenetsian abiaraztea aukeratu duzu."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Hautatutako jarduera batzuk modu lehenetsian irekitzen dira aplikazio honetan."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Aplikazioari widgetak sortzeko eta horien datuak atzitzeko baimena ematea aukeratu duzu."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Ez dago balio lehenetsirik."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Garbitu balio lehenetsiak"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Garbitu hobespen lehenetsiak"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Badirudi aplikazioa ez dela zure pantailarako diseinatu. Pantailara nola egokitzen den kontrola dezakezu hemen."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Galdetu abiarazterakoan"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Egokitu aplikazioaren tamaina"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Zure beharretara doi dezakezu gailua. Erabilerraztasun-eginbideak edonoiz alda ditzakezu Ezarpenak atalean."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Aldatu letra-tamaina"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Pantaila-irakurgailuak"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audioa eta pantailako testua"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Azpitituluak"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audioa"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Orokorrak"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Pantaila"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Testua eta pantaila"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ilundu pantaila"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Gorri-berdea"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Gorri-berdea"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Urdin-horia"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Murriztu distira"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Murriztu distira"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Ilundu pantaila telefonoaren gutxieneko distiratik harago"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Ilundu pantaila tabletaren gutxieneko distiratik harago"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Ilundu pantaila, irakurtzeko erosoagoa izan dadin.&lt;br/&gt;&lt;br/&gt; Kasu hauetan izan daiteke lagungarria: &lt;ol&gt; &lt;li&gt; Gutxieneko balio lehenetsia ezarrita ere telefonoaren distira argiegia denean.&lt;/li&gt; &lt;li&gt; Telefonoa ilunpean erabiltzen ari zarenean (adibidez, gauez edo oheratu aurretik logela ilun dagoenean).&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -2766,7 +2787,7 @@
     <string name="backup_section_title" msgid="6539706829848457794">"Babeskopiak eta leheneratzea"</string>
     <string name="personal_data_section_title" msgid="6368610168625722682">"Datu pertsonalak"</string>
     <string name="backup_data_title" msgid="507663517227498525">"Egin nire datuen babeskopia"</string>
-    <string name="backup_data_summary" msgid="8054551085241427531">"Egin datuen, wifi-sareen pasahitzen eta beste ezarpenen babeskopia Google-ren zerbitzarietan."</string>
+    <string name="backup_data_summary" msgid="8054551085241427531">"Egin datuen, wifi-sareetako pasahitzen eta beste ezarpenen babeskopia Google-ren zerbitzarietan."</string>
     <string name="backup_configure_account_title" msgid="8574055186903658842">"Babesk. gordetzeko kontua"</string>
     <string name="backup_data_management_title" msgid="6596830198441939702">"Kudeatu babeskopiak gordetzeko kontua"</string>
     <string name="include_app_data_title" msgid="2969603876620594523">"Sartu aplikazioetako datuak"</string>
@@ -2775,7 +2796,7 @@
     <string name="backup_inactive_title" msgid="6753265378043349277">"Babeskopia-zerbitzua ez dago aktibo"</string>
     <string name="backup_configure_account_default_summary" msgid="5323225330966306690">"Ez dago babeskopiak gordetzen dituen aplikaziorik"</string>
     <string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
-    <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Wifi-sareen pasahitzen, laster-marken, bestelako ezarpenen eta aplikazioetako datuen babeskopiak egiteari utzi eta Google-ren zerbitzarietako kopia guztiak ezabatu nahi dituzu?"</string>
+    <string name="backup_erase_dialog_message" msgid="2250872501409574331">"Wifi-sareetako pasahitzen, laster-marken, bestelako ezarpenen eta aplikazioetako datuen babeskopiak egiteari utzi eta Google-ren zerbitzarietako kopia guztiak ezabatu nahi dituzu?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Gailuko datuen (adibidez, Wi-Fi pasahitzak eta deien historia) eta aplikazioetako datuen (besteak beste, ezarpenak eta aplikazioek gordetako fitxategiak) babeskopiak egiteari utzi nahi diozu eta urruneko zerbitzarietako kopia guztiak ezabatu nahi dituzu?"</string>
     <string name="fullbackup_data_summary" msgid="971587401251601473">"Egin babeskopiak automatikoki urrunetik, bai gailuetako datuenak (esaterako, Wi-Fi sareetako pasahitzak eta deien historia), bai aplikazioetako datuenak (esaterako, ezarpenak eta aplikazioek gordetako fitxategiak).\n\nBabeskopiak automatikoki egiteko aukera aktibatzean, gailuko eta aplikazioetako datuak urrunetik gordetzen dira aldizka. Aplikazioetako datuak aplikazioek gordetako edozein datu izan daitezke (garatzaileen ezarpenen arabera), eta kontuzkoak izan litezkeen datuak ere sar daitezke (adibidez, kontaktuak, mezuak eta argazkiak)."</string>
     <string name="device_admin_settings_title" msgid="31392408594557070">"Gailua administratzeko aplikazioaren ezarpenak"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"aurpegia"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"hatz-marka, gehitu hatz-marka"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"pantaila ilundua, ukipen-pantaila, bateria, distira adimenduna, distira dinamikoa, distira automatikoa"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"ilundu pantaila, pantaila ilundu, ezarri inaktibo, inaktibo ezarri, bateria, denbora-muga, arreta, pantaila kontzientea, pantaila, bistaratzea, jarduera eza, inaktibo"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"biratu, irauli, errotazioa, bertikala, horizontala, orientazioa"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"bertsio-berritu, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"ez molestatu, ordutegia, programazioa, jakinarazpenak, blokeatu, isilik, dardara, inaktibo ezarri, lantokia, arreta, soinua, desaktibatu audioa, eguna, asteguna, asteburua, asteguneko gaua, gertaera"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"pantaila, blokeatzeko denbora, denbora-muga, pantaila blokeatua"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Tonuak"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Beste soinu eta dardara batzuk"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Jakinarazpenak"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Elkarrizketa"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Bidalitako azkenak"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ikusi azken zazpi egunetako guztia"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Aurreratuak"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Orokorrak"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Laneko jakinarazpenak"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Jakinarazpen doigarriak"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Jakinarazpenen lehentasun doigarria"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Bistaratu goitibeherako barran, egoera-barran eta pantaila blokeatuan"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ezkutatu soinurik gabeko jakinarazpenak egoera-barran"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Argi keinukaria"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Pantaila blokeatua"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Pribatutasuna"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Saltatu pantaila blokeatua"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Aurpegiaren bidez desblokeatu ondoren, joan zuzenean erabili duzun azken pantailara"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"pantaila blokeatua, blokeo pantaila, saltatu, zeharbidea"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> jakinarazpen inguru asteko</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Inoiz ez"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Jakinarazpenetarako sarbidea"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Gailu eta aplikazioen jakinarazpenak"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Kontrolatu zer jakinarazpen agertzen den aplikazio eta gailuetan"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Blokeatuta dago laneko profileko jakinarazpenetarako sarbidea"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Aplikazioek ezin dituzte jakinarazpenak irakurri"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Desaktibatu"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Utzi"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Baimendutako jakinarazpen motak"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Abian diren jakinarazpen garrantzitsuak"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Elkarrizketei buruzko jakinarazpenak"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Jakinarazpen ohartarazleak"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Soinurik gabeko jakinarazpenak"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Denbora errealekoak"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Erabiltzen ari zaren aplikazioetako, nabigazioko, telefono-deietako eta abarretako denbora errealeko komunikazioa"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Elkarrizketak"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMSak eta beste komunikazio batzuk"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Lehenetsia"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Ezarpenen arabera tonua jo edo dar-dar egin dezaketen jakinarazpenak"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Isilak"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Soinurik edo dardararik egiten ez duten jakinarazpenak"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Ikusi aplikazio guztiak"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Aldatu jakinarazpenak bidal ditzakeen aplikazio bakoitzaren jakinarazpen-ezarpenak"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Gailuan agertzen diren aplikazioak"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Errealitate birtualeko laguntza-zerbitzuak"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ez dago errealitate birtualeko laguntza-zerbitzu gisa abiaraztea eskatu duen aplikaziorik instalatuta."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Errealitate birtualeko zerbitzuak atzitzeko baimena eman nahi diozu <xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Ireki modu lehenetsian"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Irekiko diren estekak"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Ireki esteka bateragarriak"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Esteka bateragarriak aplikazio honetan irekitzen dira"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Aplikazio honetan ireki beharreko estekak"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Ireki galdetu gabe"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Esteka bateragarriak"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Beste aplikazio lehenetsi batzuk"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Beste hobespen lehenetsi batzuk"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Gehitu esteka bat"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Aplikazio batek estekak egiazta ditzake, aplikazioan bertan automatikoki irekitzeko. "<annotation id="url">"Lortu informazio gehiago"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> esteka egiaztatu</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> esteka egiaztatu</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Egiaztatu egin dira esteka horiek eta aplikazio honetan automatikoki irekitzen dira.</item>
+      <item quantity="one">Egiaztatu egin da esteka hori eta aplikazio honetan automatikoki irekitzen da.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Ados"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Esteka bateragarri gehiago bilatzen…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Utzi"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> esteka bateragarri</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> esteka bateragarri</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Gehitu"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> aplikazioan irekitzen da"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> erabilita (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"barneko memoria"</string>
     <string name="storage_type_external" msgid="125078274000280821">"kanpoko memoria"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Ez da onartzen kamera erabiltzea"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Ez da onartzen pantaila-argazkiak ateratzea"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Ezin da ireki aplikazioa"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Galderarik baduzu, jarri IKT saileko administratzailearekin harremanetan"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Xehetasun gehiago"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Administratzaileak gainbegiratu eta kudeatu egin ditzake laneko profilarekin erlazionatutako aplikazioak eta datuak, besteak beste, ezarpenak, baimenak, enpresaren sarbide-baimenak, sareko jarduerak eta gailuaren kokapen-informazioa."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Administratzaileak gainbegiratu eta kudeatu egin ditzake erabiltzailearekin erlazionatutako aplikazioak eta datuak, besteak beste, ezarpenak, baimenak, enpresaren sarbide-baimenak, sareko jarduerak eta gailuaren kokapen-informazioa."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 murriztapen</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Agian ez dira bat etorriko gailuak eta operadoreak egindako datu-kontsumoen neurketak"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ez dira hartzen kontuan operadorearen sareek erabilitako datuak"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Ez dira sartzen operadoreen sareek erabilitako datuak"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> erabilita"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Ezarri datuen erabileraren abisua"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datuen erabileraren abisua"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g> - desinstalatuta)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g> - desgaituta)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Betetze automatikoaren zerbitzua"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"bete, automatikoki, betetze automatiko"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Pasahitzak"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automatikoa, bete, betetze automatikoa, pasahitza"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Ziurtatu aplikazioa fidagarria dela&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; eginbideak pantailan dagoena erabiltzen du automatikoki bete daitekeena zehazteko."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Betetze automatikoa"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Erregistratze-maila"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Aldatu sare modua"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Sare mota lehenetsia"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operadorea"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Ezarpenen bertsioa"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operadorearen ezarpenen bertsioa"</string>
     <string name="call_category" msgid="641461844504128789">"Deiak"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operadorearen bideo-deiak"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sistemaren hautapena"</string>
@@ -4930,7 +4978,7 @@
     <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Ezin da desgaitu operadorea"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Arazoren bat izan da, eta ezin izan da desgaitu operadorea."</string>
     <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Bi SIM txartel erabili nahi dituzu?"</string>
-    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Gailu honek bi SIM txartel izan ditzake aktibo aldi berean. SIM txartel bakarra erabili nahi baduzu, sakatu \"Ez, eskerrik asko\"."</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Gailu honek bi SIM txartel izan ditzake aktibo aldi berean. SIM txartel bakarra erabili nahi baduzu, sakatu \"Ez\"."</string>
     <string name="sim_action_restart_title" msgid="7054617569121993825">"Gailua berrabiarazi nahi duzu?"</string>
     <string name="sim_action_restart_text" msgid="8019300474703571013">"Hasteko, berrabiarazi gailua. Gero, beste SIM txartel bat gehitu ahalko duzu."</string>
     <string name="sim_action_continue" msgid="1688813133152389943">"Egin aurrera"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Kendu SIM txartela eta sar ezazu berriro. Arazoak badirau, berrabiarazi gailua."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Saiatu berriro SIM txartela aktibatzen. Arazoak badirau, berrabiarazi gailua."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Sarearen aktibazioa"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operadore-aldaketa"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Aktibo dago <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Sakatu hau SIM txartelarenaren ezarpenak eguneratzeko"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operadorera aldatu zara"</string>
@@ -4958,7 +5007,7 @@
     <string name="switch_sim_dialog_no_switch_title" msgid="809763410787744247">"Ez dago SIM txartel aktiborik erabilgarri"</string>
     <string name="switch_sim_dialog_no_switch_text" msgid="7053939850026876088">"Geroago datu-konexioa, deien eginbideak eta SMS mezuak erabiltzeko, joan sarearen ezarpenetara"</string>
     <string name="sim_card_label" msgid="5632157635124050923">"SIM txartela"</string>
-    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Deskargatutako SIM txartel honetako eduki guztia ezabatu?"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Deskargatutako SIM txartel honetako eduki guztia ezabatu nahi duzu?"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"SIM txartel honetako eduki guztia ezabatuz gero, <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> operadorearen zerbitzua kenduko da gailu honetatik.\n\nEz da utziko bertan behera <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> operadorearen zerbitzua."</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Ezabatu eduki guztia"</string>
     <string name="erasing_sim" msgid="7877703231075699139">"SIM txarteleko eduki guztia ezabatzen…"</string>
@@ -5046,7 +5095,7 @@
     <string name="dual_cdma_sim_warning_notification_summary" msgid="2826474790710586487">"<xliff:g id="OPERATOR_NAMES">%1$s</xliff:g> erabiliz gero, baliteke funtzioak mugatzea. Informazio gehiago lortzeko, sakatu hau."</string>
     <string name="dual_cdma_sim_warning_notification_channel_title" msgid="1049161096896074364">"SIM txartelen konbinazioa"</string>
     <string name="work_policy_privacy_settings" msgid="2702644843505242596">"Laneko gidalerroen informazioa"</string>
-    <string name="work_policy_privacy_settings_summary" msgid="690118670737638405">"IKTen administratzaileak kudeatzen ditu ezarpenak"</string>
+    <string name="work_policy_privacy_settings_summary" msgid="690118670737638405">"IKT saileko administratzaileak kudeatzen ditu ezarpenak"</string>
     <string name="track_frame_time_keywords" msgid="7885340257945922239">"GPUa"</string>
     <string name="bug_report_handler_title" msgid="713439959113250125">"Akatsen txostenaren kudeatzailea"</string>
     <string name="bug_report_handler_picker_footer_text" msgid="4935758328366585673">"Gailuko Akatsen txostenaren lasterbidea zein aplikaziok kontrolatzen duen zehazten du."</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desaktibatuta"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM txartelak"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Erakutsi hegaldi moduko sareak"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Aurkitu hegaldi moduko sareak eta konektatu haietara."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Aurkitu wifi-sareak eta konektatu haietara"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"hegaldia, hegaldietarako segurua"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Deiak eta SMSak"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wifi bidezko deiak"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ez dago erabilgarri"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Ez dago erabilgarri aldi baterako"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ez dago SIM txartelik"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Hobespenak"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Sarearen hobespenak"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Konektatu sare publikoetara"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"sareko konexioa, internet, hari gabeko konexioak, datuak, wifia, mugikorra, telefono mugikorra, operadorea, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ikusi hegaldi moduko sareak"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Hegaldi moduko sareak ikusgai"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Aktibatu sareak"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Desaktibatu sareak"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Interneteko konexioa berrezarri nahi duzu?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Telefono-deia amaitu egingo da"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Telefono-deia amaitu egingo da"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Interneteko konexioa berrezartzen…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Konpondu konexioa"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Hegaldi moduko sareak erabilgarri daude"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Sarez aldatzeko, deskonektatu Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ezin da aldatu sarea konektatuta zauden bitartean"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Hegaldi modurako sareak"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Konektatuta"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Ez da automatikoki konektatuko Internetera"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Kolorea"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Beste batzuk"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Orokorrak"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Ikusi aplikazio guztiak"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Desbideratze adimenduna"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Gaitu da desbideratze adimenduna"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Idatzi telefono-zenbakia"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefono-zenbakia falta da."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Ados"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Eman 2G erabiltzeko baimena"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Erabili 2G datu-konexioak. 2G beti dago aktibatuta larrialdi-deietarako."</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 83c2395..c067230 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"نوشتار روی صفحه‌نمایش را بزرگ‌تر یا کوچک‌تر کنید."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"کوچک‌تر کردن"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"بزرگ‌تر کردن"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"استفاده از چرخش خودکار"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"نوشتار نمونه"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"جادوگر شهر اوز"</string>
@@ -405,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> تنظیم اثر انگشت</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"بازکردن قفل با اثر انگشت"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"راه‌اندازی اثرانگشت"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"استفاده از اثر انگشت"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"برای باز کردن قفل تلفن، تأیید خریدها، یا ورود به سیستم برنامه‌ها، کافی است حسگر اثر انگشت را لمس کنید. مراقب باشید اثر انگشت چه کسی را اضافه می‌کنید. حتی یک اثر انگشت اضافه‌شده می‌تواند همه این کارها را انجام دهد."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"ممکن است امنیت اثر انگشت از الگو یا پین قوی کمتر باشد."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"کنترل در دست شماست"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"به‌خاطر داشته باشید"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"داده‌هایی که «اثر انگشت» ضبط می‌کند به‌طور ایمن ذخیره می‌شوند و هرگز از تلفن شما خارج نمی‌شوند. هروقت بخواهید می‌توانید داده‌هایتان را در «تنظیمات» حذف کنید."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"ممکن است امنیت اثر انگشت از الگو یا پین قوی کمتر باشد."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"تلفنتان هرازگاهی از تصویرهای اخیر اثر انگشتتان استفاده خواهد کرد تا مدل‌های بهبودیافته‌ای از اثر انگشت ایجاد کند."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"از اثر انگشتتان برای باز کردن قفل تلفن یا تأیید خریدها استفاده کنید.\n\nتوجه: نمی‌توانید از اثر انگشتتان برای باز کردن قفل این دستگاه استفاده کنید. برای اطلاعات بیشتر، با سرپرست سیستم سازمانتان تماس بگیرید."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"از اثر انگشتتان برای باز کردن قفل تلفن یا تأیید خریدها استفاده کنید.\n\nتوجه: ممکن است امنیت اثر انگشت از یک الگو یا پین قوی کمتر باشد."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"لغو"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"نه متشکرم"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"رد شدن"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ادامه"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"موافقم"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"رد شدن"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"بعدی"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"از تنظیم اثر انگشت رد می‌شوید؟"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"رد شدن"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"لغو"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"حسگر را لمس کنید"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"نماد اثر انگشت را لمس کنید و نگه دارید"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"در پشت تلفنتان قرار دارد. از انگشت اشاره‌تان استفاده کنید."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"حسگر روی صفحه قرار دارد. به‌دنبال اثر انگشت با حلقه نورانی بگردید."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"حسگر اثر انگشت روی صفحه‌نمایش قرار دارد. انگشتتان را روی صفحه‌نمایش حرکت دهید تا آن را پیدا کنید."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"تصویر دستگاه و مکان حسگر اثر انگشت"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"نام"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"تأیید"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"حذف"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"حسگر را لمس کنید"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"انگشتتان را روی حسگر بگذارید و بعد از احساس لرزش، آن را بردارید"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"بردارید و سپس دوباره لمس کنید"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"مدام انگشتتان را جابه‌جا کنید تا بخش‌های مختلف اثر انگشتتان را اضافه کنید"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"اثر انگشت اضافه شد"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"وقتی این نماد را می‌بینید، از اثر انگشتتان برای شناسایی یا تأیید خریدها استفاده کنید"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"بعداً انجام شود"</string>
@@ -755,7 +769,7 @@
     <string name="bluetooth_unpair_dialog_forget_confirm_button" msgid="9184489424930549015">"فراموش کردن دستگاه"</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="1323072239637864488">"اتصال به..."</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="339103864166293612">"اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> از صدای رسانه قطع می‌شود."</string>
-    <string name="bluetooth_disconnect_headset_profile" msgid="7857706184371154920">"اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> از صدای هندزفری قطع می‌شود."</string>
+    <string name="bluetooth_disconnect_headset_profile" msgid="7857706184371154920">"اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> از حالت صوتی دست‌آزاد قطع می‌شود."</string>
     <string name="bluetooth_disconnect_hid_profile" msgid="4794752406024916925">"اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g> از دستگاه ورودی قطع می‌شود."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="283176886159444413">"دسترسی به اینترنت از طریق <xliff:g id="DEVICE_NAME">%1$s</xliff:g> قطع خواهد شد."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="733193449967330892">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> از هم‌رسانی اتصال اینترنتی این رایانهٔ لوحی قطع خواهد شد."</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"جستجو"</string>
     <string name="display_settings" msgid="7197750639709493852">"صفحه‌نمایش"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"چرخش خودکار صفحه"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"خاموش"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"روشن"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"روشن - براساس چهره"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"فعال کردن «تشخیص چهره»"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"رنگ‌"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"طبیعی"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"تقویت‌شده"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"روشن / تازمانی‌که درحال تماشای صفحه‌نمایش باشید، صفحه خاموش نخواهد شد"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"خاموش"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"دسترسی به دوربین لازم است"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"برای مدیریت مجوزهای «خدمات شخصی‌سازی دستگاه» ضربه بزنید"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"باعث می‌شود تازمانی‌که فردی به صفحه‌نمایش نگاه می‌کند، صفحه خاموش نشود"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"‏«توجه به صفحه» با استفاده از دوربین جلو متوجه می‌شود که آیا فردی درحال تماشای صفحه‌نمایش است یا نه. این ویژگی در دستگاه کار می‌کند و تصاویر هرگز ذخیره نمی‌شوند و به Google فرستاده نمی‌شود."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"روشن کردن توجه به صفحه"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"وقتی صفحه تاریک است، برای اعلان‌های جدید روشن می‌شود"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"همیشه زمان و اطلاعات نمایش داده شود"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"مصرف باتری بالا"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"نوشتار پررنگ"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"نوشتار پررنگ"</string>
     <string name="title_font_size" msgid="570613010306330622">"اندازه قلم"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"نوشتار را بزرگ‌تر یا کوچک‌تر کنید"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"تنظیمات قفل سیم کارت"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"کاربران دیگر"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"دستگاه ذخیره‌سازی"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"دستگاه ذخیره‌سازی قابل حمل"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"زنگ‌های هشدار و یادآوری‌ها"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"مجاز کردن برای تنظیم زنگ هشدار و یادآوری"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"زنگ‌های هشدار و یادآوری‌ها"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"به این برنامه اجازه می‌دهد زنگ‌های هشدار و دیگر رویدادهای مبتنی بر زمان را زمان‌بندی کند. با این کار برنامه مجاز می‌شود حتی زمانی که از دستگاه استفاده نمی‌کنید بیدار و اجرا شود. توجه داشته باشید که لغو کردن این اجازه ممکن است باعث شود برنامه درست کار نکند، مخصوصاً اینکه همه زنگ‌های هشداری که برنامه زمان‌بندی کرده است دیگر کار نخواهند کرد."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"زمان‌بندی، زنگ هشدار، یادآوری، رویداد"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> از <xliff:g id="TOTAL">%2$s</xliff:g> مصرف شد"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>"‏ <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"از <xliff:g id="TOTAL">%1$s</xliff:g> مصرف شد"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"خدمات موقعیت مکانی"</string>
     <string name="location_title" msgid="5819154746934945021">"موقعیت مکانی شما"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"محل نمایه کارتان"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"دسترسی برنامه به مکان"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"مکان خاموش است"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> برنامه از<xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> برنامه به مکان شما دسترسی دارند</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> برنامه از<xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> برنامه به مکان شما دسترسی دارند</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"دسترسی مکان اخیر"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"مشاهده جزئیات"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"به تازگی هیچ برنامه‌ای موقعیت مکانی را درخواست نکرده است"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"اخیراً برنامه‌ای به مکان دسترسی نداشته است"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"استفاده زیاد از باتری"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"استفاده کم از باتری"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"‏اسکن کردن Wi‑Fi و بلوتوث"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"‏اسکن کردن Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"‏به برنامه‌ها و سرویس‌ها اجازه دهید درهر زمانی (حتی وقتی Wi‑Fi خاموش است) شبکه‌های Wi‑Fi را اسکن کنند. برای مثال این مورد مي‌تواند برای بهبود ویژگی‌ها و سرویس‌های مکان‌مبنا استفاده شود."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"اسکن کردن بلوتوث"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"به برنامه‌ها و سرویس‌ها اجازه دهید درهر زمانی (حتی وقتی «بلوتوث» خاموش است) دستگاه‌های اطراف را اسکن کنند. برای مثال این مورد مي‌تواند برای بهبود ویژگی‌ها و سرویس‌های مکان‌مبنا استفاده شود."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"خدمات مکان"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"خدمات مکان برای کار"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"تشخیص منطقه زمانی بااستفاده از مکان"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"تشخیص منطقه زمانی بااستفاده از مکان"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"‏اجازه می‌دهد از مکان دستگاه برای تشخیص منطقه زمانی کنونی استفاده شود. دیگر تنظیمات مکان مثل اسکن کردن Wi‑Fi می‌تواند بر دقت تشخیص منطقه زمانی تأثیر داشته باشد."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"روشن"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"خاموش"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"تشخیص خودکار منطقه زمانی غیرفعال است"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"منطقه زمانی خودکار خاموش است"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"تشخیص منطقه زمانی بااستفاده از مکان غیرفعال است"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"تشخیص منطقه زمانی بااستفاده از مکان پشتیبانی نمی‌شود"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"تغییر تشخیص منطقه زمانی بااستفاده از مکان مجاز نیست"</string>
@@ -1778,7 +1797,7 @@
     <string name="manual" msgid="3651593989906084868">"دفترچه راهنما"</string>
     <string name="regulatory_labels" msgid="5960251403367154270">"برچسب‌های نظارتی"</string>
     <string name="safety_and_regulatory_info" msgid="8285048080439298528">"راهنمای ایمنی و مقررات نظارتی"</string>
-    <string name="copyright_title" msgid="83245306827757857">"حق نسخه‌برداری"</string>
+    <string name="copyright_title" msgid="83245306827757857">"حق نشر"</string>
     <string name="license_title" msgid="8745742085916617540">"مجوز"</string>
     <string name="module_license_title" msgid="8705484239826702828">"‏مجوزهای به‌روزرسانی سیستم Google Play"</string>
     <string name="terms_title" msgid="2071742973672326073">"شرایط و مقررات"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"فعال کردن"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"پاک کردن فضای ذخیره‌سازی"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"حذف نصب نسخه‌های به روز"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"شما انتخاب کرده‌اید که این برنامه را به‌طور پیش‌فرض برای برخی از عملکردها راه‌اندازی کنید."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"برخی از فعالیت‌هایی که انتخاب کردید به‌طور پیش‌فرض در این برنامه باز می‌شوند."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"شما انتخاب کردید تا به این برنامه برای ایجاد ابزارک و دسترسی به اطلاعات آن‌ها اجازه دهید."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"پیش‌فرضی تنظیم نشده است."</string>
-    <string name="clear_activities" msgid="341345438786077236">"پاک کردن پیش‌فرض‌ها"</string>
+    <string name="clear_activities" msgid="488089228657585700">"پاک کردن اولویت‌های پیش‌فرض"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"ممکن است این برنامه برای صفحه شما طراحی نشده باشد، نحوه تنظیم آن برای صفحه را می‌توانید از این قسمت کنترل کنید."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"هنگام راه‌اندازی سؤال شود"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"مقیاس‌بندی برنامه"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"می‌توانید این دستگاه را متناسب با نیازهایتان سفارشی کنید. می‌توانید بعداً در «تنظیمات»، این ویژگی‌های دسترس‌پذیری را تغییر دهید."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"تغییر اندازه قلم"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"صفحه‌خوان‌ها"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"صدا و نوشتار روی صفحه"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"زیرنویس"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"صوتی"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"کلی"</string>
     <string name="display_category_title" msgid="6638191682294461408">"نمایشگر"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"نوشتار و نمایشگر"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"تیره‌تر کردن صفحه"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"قرمز-سبز"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"قرمز-سبز"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"آبی-زرد"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"کاهش روشنایی"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"کاهش روشنایی"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"صفحه تیره‌تر از حداقل روشنایی تلفن شود"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"صفحه تیره‌تر از حداقل روشنایی رایانه لوحی شود"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"‏صفحه را تیره‌تر کنید تا خواندن راحت‌تر باشد.&lt;br/&gt;&lt;br/&gt; این کار در موارد زیر می‌تواند مفید باشد: &lt;ol&gt; &lt;li&gt; حداقل روشنایی پیش‌فرض تلفن همچنان خیلی روشن باشد&lt;/li&gt; &lt;li&gt; از تلفن در شرایط تاریک استفاده کنید، برای مثال در شب یا در اتاقی تاریک قبل‌از خواب&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"چهره"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"اثر انگشت، افزودن اثر انگشت"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"تار کردن صفحه‌نمایش، صفحه لمسی، باتری، روشنایی هوشمند، روشنایی پویا، روشنایی خودکار"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"کم‌نور کردن صفحه، خواب، باتری، درنگ، توجه، نمایشگر، صفحه، بی‌فعالیتی"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"چرخاندن، چرخش، چرخش، عمودی، منظره، جهت، عمود، افقی"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"‏ارتقا دادن، Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"«مزاحم نشوید»، زمان‌بندی، اعلان‌ها، مسدود کردن، سکوت، لرزش، خواب، کار، کانونی کردن، صدا، صامت کردن، روز، روز هفته، آخر هفته، شب‌های طول هفته، رویداد"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"صفحه نمایش، زمان قفل شدن، درنگ، صفحه درحالت قفل"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"آهنگ‌های زنگ"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"صداها و لرزش‌های دیگر"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"اعلان‌ها"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"مکالمه"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"اخیراً ارسال‌شده"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"مشاهده همه موارد از ۷ روز پیش"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"پیشرفته"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"کلی"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"اعلان‌های کار"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"اعلان‌های تطبیقی"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"اولویت اعلان تطبیقی"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"در کشوی اعلان‌های پایین‌پر، نوار وضعیت و صفحه قفل نشان داده می‌شود"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"پنهان کردن اعلان‌های ساکت در نوار وضعیت"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"نور چشمک‌زن"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"اعلان‌ها در صفحه قفل"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"حریم‌خصوصی"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"رد کردن صفحه قفل"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"پس از «بازگشایی با چهره»، مستقیم به آخرین صفحه استفاده‌شده می‌روید"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"صفحه قفل، صفحه‌قفل، رد کردن، نادیده گرفتن"</string>
@@ -3638,7 +3662,7 @@
     <string name="allow_interruption" msgid="5237201780159482716">"وقفه‌ها مجاز شوند"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"به برنامه اجازه پخش صدا، لرزش و/یا نمایش اعلان‌های بازشو در صفحه‌نمایش داده شود"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"اولویت"</string>
-    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"در بالای بخش مکالمه به‌صورت حبابک شناور نشان داده می‌شود و تصویر نمایه را در صفحه قفل نمایش می‌دهد"</string>
+    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"در بالای بخش مکالمه به‌صورت حبابک شناور نشان داده می‌شود و عکس نمایه را در صفحه قفل نمایش می‌دهد"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"<xliff:g id="APP_NAME">%1$s</xliff:g> از اکثر ویژگی‌های مکالمه پشتیبانی نمی‌کند. نمی‌توانید مکالمه‌ای را به‌عنوان اولویت‌دار تنظیم کنید و مکالمه‌ها به‌صورت حبابک شناور نشان داده نمی‌شوند."</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"در اعلان‌های پایین‌پر تیره و کوچک در یک سطر"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"بدون صدا یا لرزش"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> اعلان در هفته</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"هرگز"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"دسترسی به اعلان"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"اعلان‌های دستگاه و برنامه"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"کنترل اینکه کدام اعلان‌ها در برنامه و دستگاه‌هایتان نمایش داده شوند"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"دسترسی به اعلان‌های نمایه کاری مسدود شده است"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"برنامه‌ها نمی‌توانند اعلان‌ها را بخوانند"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"خاموش کردن"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"لغو"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"انواع مجاز اعلان"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"اعلان‌های جاری مهم"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"اعلان‌های مکالمه"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"اعلان‌های هشداردهنده"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"اعلان‌های بی‌صدا"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"هم‌زمان"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"ارتباط هم‌زمان از برنامه‌های درحال استفاده، پیمایش، تماس‌های تلفنی، و غیره"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"مکالمه‌ها"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"پیامک و دیگر ارتباطات"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"پیش‌فرض"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"اعلان‌هایی که ممکن است بسته به تنظیمات زنگ بزنند یا بلرزند"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"بی‌صدا"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"اعلان‌هایی که همیشه بی‌صدا هستند و نمی‌لرزند"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"مشاهده همه برنامه‌ها"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"تغییر تنظیمات اعلان برای هر برنامه‌ای که می‌تواند اعلان ارسال کند"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"برنامه‌هایی که در دستگاه نشان داده می‌شوند"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"‏خدمات یاور VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"‏هیچ برنامه نصب‌شده‌ای درخواست نکرده به‌عنوان خدمات یاور VR اجرا شود."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"‏به <xliff:g id="SERVICE">%1$s</xliff:g> امکان داده شود به خدمات VR دسترسی یابد؟"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"باز کردن به‌صورت پیش‌فرض"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"باز کردن پیوندها"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"باز کردن پیوندهای پشتیبانی شده"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"پیوندهای پشتیبانی که در این برنامه باز می‌شوند"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"پیوندهایی که در این برنامه باز می‌شوند"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"باز کردن بدون پرسش"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"پیوندهای پشتیبانی شده"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"سایر پیش‌فرض‌ها"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"دیگر اولویت‌های پیش‌فرض"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"افزودن پیوند"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"برنامه می‌تواند پیوندها را تأیید کند تا به‌طور خودکار در آن باز شوند. "<annotation id="url">"بیشتر بدانید"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one">‏<xliff:g id="COUNT_1">%d</xliff:g> پیوند تأییدشده</item>
+      <item quantity="other">‏<xliff:g id="COUNT_1">%d</xliff:g> پیوند تأییدشده</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">این پیوند تأیید شده است و به‌طور خودکار در این برنامه باز می‌شود.</item>
+      <item quantity="other">این پیوندها تأیید شده‌اند و به‌طور خودکار در این برنامه باز می‌شوند.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"تأیید"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"درحال بررسی پیوند‌های پشتیبانی دیگر…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"لغو"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one">‏<xliff:g id="COUNT_1">%d</xliff:g> پیوند پشتیبانی</item>
+      <item quantity="other">‏<xliff:g id="COUNT_1">%d</xliff:g> پیوند پشتیبانی</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"افزودن"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"در <xliff:g id="APP_LABEL">%s</xliff:g> باز می‌شود"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> استفاده شده در <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"حافظه داخلی"</string>
     <string name="storage_type_external" msgid="125078274000280821">"حافظه خارجی"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"استفاده از دوربین مجاز نیست"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"گرفتن عکس از صفحه‌نمایش مجاز نیست"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"نمی‌توان این برنامه را باز کرد"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"اگر سؤالی دارید، با سرپرست فناوری اطلاعاتتان تماس بگیرید"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"جزئیات بیشتر"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"سرپرستتان می‌تواند بر برنامه‌ها و داده‌های مرتبط با این نمایه کاری (ازجمله تنظیمات، مجوزها، دسترسی شرکتی، فعالیت شبکه و اطلاعات مکان دستگاه) نظارت داشته باشد و آن‌ها را مدیریت کنید."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"سرپرستتان می‌تواند بر برنامه‌ها و داده‌های مرتبط با این کاربر (ازجمله تنظیمات، مجوزها، دسترسی شرکتی، فعالیت شبکه و اطلاعات مکان دستگاه) نظارت داشته باشد و آن‌ها را مدیریت کنید."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> محدودیت</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"روش شرکت مخابراتی برای اندازه‌گیری مصرف داده ممکن است با روش دستگاهتان متفاوت باشد."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"داده‌هایی را که شبکه‌های شرکت مخابراتی استفاده می‌کنند لحاظ نمی‌کند"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"داده‌هایی را که شبکه‌های شرکت مخابراتی استفاده می‌کنند لحاظ نمی‌کند"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> مصرف شده"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"تنظیم هشدار داده"</string>
     <string name="data_warning" msgid="2925054658166062884">"هشدار داده"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(برای کاربر <xliff:g id="USER">%s</xliff:g> حذف نصب شد)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(برای کاربر <xliff:g id="USER">%s</xliff:g> غیرفعال شد)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"سرویس تکمیل خودکار"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"خودکار، پر کردن، تکمیل خودکار"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"گذرواژه‌ها"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"خودکار، تکمیل، تکمیل خودکار، گذرواژه"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"‏&lt;b&gt;مطمئن شوید به این برنامه اطمینان دارید&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=تکمیل خودکار Google&gt;%1$s&lt;/xliff:g&gt; برای تعیین مواردی که می‌توانند به‌طور خودکار تکمیل شوند، از آنچه روی صفحه‌نمایش شما است استفاده می‌کند."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"تکمیل خودکار"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"سطح گزارش‌دهی"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"تغییر حالت عملکرد شبکه"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"نوع شبکه برگزیده"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"شرکت مخابراتی"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"نسخه تنظیمات"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"نسخه تنظیمات شرکت مخابراتی"</string>
     <string name="call_category" msgid="641461844504128789">"درحال تماس"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"تماس تصویری با شرکت مخابراتی"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"انتخاب سیستم"</string>
@@ -4916,7 +4964,7 @@
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"سیم‌کارت روشن شود؟"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"به <xliff:g id="CARRIER_NAME">%1$s</xliff:g> می‌روید؟"</string>
     <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"برای استفاده از سیم‌کارت، شرکت مخابراتی‌تان را عوض می‌کنید؟"</string>
-    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"هربار فقط یک سیم‌کارت را می‌توان فعال کرد.\n\nبا رفتن به <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>، سرویس <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> شما را لغو نخواهد کرد."</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"هربار فقط یک سیم‌کارت را می‌توان فعال کرد.\n\nبا رفتن به <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>، سرویس <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> شما لغو نخواهد شد."</string>
     <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"هربار فقط یک سیم‌کارت بارگیری‌شده می‌تواند فعال شود.\n\nبا رفتن به <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>، سرویس <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> شما لغو نخواهد شد."</string>
     <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"هربار فقط یک سیم‌کارت را می‌توان فعال کرد.\n\nعوض کردن شرکت مخابراتی، باعث لغو سرویس <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> شما نخواهد شد."</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"رفتن به <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"سیم‌کارت را خارج کنید و دوباره در دستگاه بگذارید. اگر مشکل ادامه داشت، دستگاهتان را بازراه‌اندازی کنید."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"سیم‌کارت را دوباره روشن کنید. اگر مشکل ادامه داشت، دستگاهتان را بازراه‌اندازی کنید."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"فعال‌سازی شبکه"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"تغییر شرکت مخابراتی"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> فعال است"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"برای به‌روزرسانی تنظیمات سیم‌کارت ضربه بزنید"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"به <xliff:g id="CARRIER_NAME">%1$s</xliff:g> جابه‌جا شدید"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"خاموش"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"اینترنت"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"سیم‌کارت‌ها"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"نمایش شبکه‌های حالت هواپیما"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"شبکه‌های حالت هواپیما را جستجو کنید و به آن‌ها متصل شوید."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"‏پیدا کردن شبکه‌های Wi-Fi و اتصال به آن‌ها"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"هواپیما، ایمن در هواپیما"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"تماس و پیامک"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"‏تماس ازطریق WiFi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"دردسترس نیست"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"موقتاً دردسترس نیست"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"سیم‌کارتی وجود ندارد"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"اولویت‌ها"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"اولویت‌های شبکه"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"اتصال به شبکه‌های عمومی"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏اتصال شبکه، اینترنت، بی‌سیم، داده، wifi،‏ wi-fi، ‏wi fi، شبکه تلفن همراه، تلفن همراه، شرکت مخابراتی تلفن همراه، 4g،‏ 3g،‏ 2g،‏ lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"مشاهده شبکه‌های حالت هواپیما"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"درحال مشاهده شبکه‌های دردسترس در حالت هواپیما"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"روشن کردن شبکه‌ها"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"خاموش کردن شبکه‌ها"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"اینترنت بازنشانی شود؟"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"با این کار، تماس تلفنی به‌پایان می‌رسد"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"با این کار، تماس تلفنی به‌پایان می‌رسد"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"درحال بازنشانی اینترنت…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"رفع مشکل اتصال"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"شبکه‌های حالت هواپیما دردسترس‌اند"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"برای تغییر شبکه، اترنت را قطع کنید"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"هنگامی که اتصال برقرار است نمی‌توان شبکه‌ها را عوض کرد"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"شبکه‌های «حالت هواپیما»"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"متصل است"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"اینترنت به‌طور خودکار متصل نخواهد شد"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"رنگ"</string>
     <string name="category_name_others" msgid="2366006298768550310">"غیره"</string>
     <string name="category_name_general" msgid="7737273712848115886">"کلی"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"مشاهده همه برنامه‌ها"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"بازارسال هوشمند"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"«بازارسال هوشمند» فعال شد"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"وارد کردن شماره تلفن"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"شماره تلفن وارد نشده است."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"تأیید"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"‏مجاز کردن 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"‏از اتصال همراه 2G استفاده کنید. برای تماس‌های اضطراری، 2G همیشه روشن است."</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 955c972..35422f8 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Suurenna tai pienennä tekstiä näytöllä."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Pienennä"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Suurenna"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Käytä automaattista kääntöä"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Esimerkkiteksti"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Ihmemaa Oz"</string>
@@ -155,7 +154,7 @@
     <string name="connected_device_saved_title" msgid="5607274378851905959">"Tallennetut laitteet"</string>
     <string name="connected_device_add_device_summary" msgid="8671009879957120802">"Bluetooth käynnistetään parinmuodostusta varten."</string>
     <string name="connected_device_connections_title" msgid="4164120115341579170">"Yhteysasetukset"</string>
-    <string name="connected_device_previously_connected_title" msgid="605808252622814415">"Aiemmin liitetyt laitteet"</string>
+    <string name="connected_device_previously_connected_title" msgid="605808252622814415">"Aiemmin yhdistetyt laitteet"</string>
     <string name="connected_device_previously_connected_screen_title" msgid="8823331744788100605">"Aiemmin liitetyt"</string>
     <string name="connected_device_bluetooth_turned_on_toast" msgid="144664089794199928">"Bluetooth käytössä"</string>
     <string name="previous_connected_see_all" msgid="7759413145713251328">"Näytä kaikki"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> sormenjälki määritetty</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Avaa sormenjäljellä"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Sormenjäljen käyttöönotto"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Sormenjäljen käyttäminen"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Voit avata puhelimen lukituksen, hyväksyä ostoksia ja kirjautua sovelluksiin koskettamalla sormenjälkitunnistinta. Harkitse tarkkaan, kenen sormenjäljet lisäät. Kaikkia näitä asioita voi tehdä vain yhdellä lisätyllä sormenjäljellä."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Sormenjälki ei välttämättä ole yhtä turvallinen kuin vahva kuvio tai PIN-koodi."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Sinä päätät"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Muistettavaa"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Sormenjälkitunnistimen tallentama data tallennetaan turvallisesti eikä se koskaan poistu puhelimeltasi. Voit poistaa datan milloin tahansa asetuksista."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Sormenjälki ei välttämättä ole yhtä turvallinen kuin vahva kuvio tai PIN-koodi."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Puhelin käyttää viimeaikaisia sormenjälkikuvia ajoittain parempien sormenjälkimallien luomiseen."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Avaa puhelin tai hyväksy ostoksia sormenjäljellä.\n\nHuom. Tämän laitteen lukitusta ei voi avata sormenjäljellä. Saat lisätietoja organisaatiosi järjestelmänvalvojalta."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Avaa puhelin tai hyväksy ostoksia sormenjäljellä.\n\nHuom. Sormenjälki ei välttämättä ole yhtä turvallinen kuin vahva kuvio tai PIN-koodi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Peruuta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ei kiitos"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Ohita"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Jatka"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Hyväksy"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ohita"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Seuraava"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Ohitetaanko sormenjälki?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Ohita"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Peruuta"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Kosketa tunnistinta"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Kosketa pitkään sormenjälkikuvaketta"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Se on puhelimen takaosassa. Käytä etusormea."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Se löytyy näytöltä. Etsi sormenjälki hohtavassa ympyrässä."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Sormenjälkitunnistin on näytölläsi. Löydä se liikuttamalla sormea näytöllä."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Laitteen ja sormenjälkianturin sijainnin kuva."</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nimi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Ok"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Poista"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Kosketa tunnistinta"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Aseta sormesi tunnistimelle ja nosta se, kun tunnet värähdyksen."</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Nosta sormi ja kosketa taas"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Kosketa tunnistinta toistuvasti, niin sormenjäljen eri osat lisätään."</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Sormenjälki lisätty"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Kun näet tämän kuvakkeen, voit tunnistautua tai vahvistaa ostoksia sormenjäljellä."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Tee myöhemmin"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Haku"</string>
     <string name="display_settings" msgid="7197750639709493852">"Näyttö"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Näytön automaattinen kierto"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Poissa päältä"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Päällä"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Päällä – kasvojen perusteella"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Ota kasvojentunnistus käyttöön"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Värit"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Luonnollinen"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Tehostettu"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Päällä / näyttö ei sammu, kun katsot sitä"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Pois päältä"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Kameran käyttöoikeus tarvitaan"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Napauta ja määritä käyttöoikeudet personoinnin palveluihin."</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Estää näyttöä sammumasta, kun katsot sitä"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Huomionäyttö näkee etukameralla, katsooko joku näyttöä. Ominaisuus toimii laitteella, eikä kuvia ikinä tallenneta tai lähetetä Googlelle."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Laita huomionäyttö päälle"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kun näyttö on pimeä, se aktivoituu uusien ilmoitusten myötä"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Näytä aina aika ja tiedot"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Tämä asetus kuluttaa akkua nopeammin"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Lihavoi teksti"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Lihavoi teksti"</string>
     <string name="title_font_size" msgid="570613010306330622">"Fontin koko"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Suurenna tai pienennä tekstiä."</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM-kortin lukitusasetukset"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Muut käyttäjät"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Laitteen tallennustila"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Kannettava tallennustila"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Herätykset ja muistutukset"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Salli herätysten ja muistutusten asettaminen"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Herätykset ja muistutukset"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Anna sovelluksen ajoittaa herätyksiä tai muita aikaan sidonnaisia tapahtumia. Siten sovellus voi aktivoitua ja toimia myös silloin, kun et käytä laitetta. Huomaa, että luvan peruuttaminen voi aiheuttaa sovelluksen toimintahäiriöitä, erityisesti sovelluksen ajoittamat herätykset eivät enää toimi."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"ajoitus, herätys, muistutus, tapahtuma"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Päällä <xliff:g id="USED">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Tallennustilasta (<xliff:g id="TOTAL">%1$s</xliff:g>) käytössä"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Sijaintipalvelut"</string>
     <string name="location_title" msgid="5819154746934945021">"Oma sijainti"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Työprofiilin sijainti"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Sovelluksen pääsy sijaintiin"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Sijainti on poissa käytöstä."</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>/<xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> sovelluksella on sijainnin käyttöoikeus</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g>/<xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> sovelluksella on sijainnin käyttöoikeus</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Viimeaikainen sijainnin käyttö"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Näytä tiedot"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Mikään sovellus ei ole pyytänyt sijaintia äskettäin"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Sovellukset eivät ole käyttäneet sijaintia äskettäin"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Suuri akun kulutus"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Vähäinen akun kulutus"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi-Fi- ja Bluetooth-haku"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi-haku"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Salli sovellusten ja palvelujen hakea Wi‑Fi-verkkoja aina, vaikka Wi-Fi olisi pois käytöstä. Näin voidaan esimerkiksi kehittää sijaintiin perustuvia ominaisuuksia ja palveluja."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-haku"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Salli sovellusten ja palvelujen hakea lähellä olevia laitteita aina, vaikka Bluetooth olisi pois käytöstä. Näin voidaan esimerkiksi kehittää sijaintiin perustuvia ominaisuuksia ja palveluja."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Sijaintipalvelut"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Sijaintipalvelut työkäyttöön"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Sijainnin aikavyöhykkeen tunnistus"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Sijainnin aikavyöhykkeen tunnistus"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Sallii laitteen sijainnin käyttämisen nykyisen aikavyöhykkeen tunnistamiseksi. Muut sijaintiasetukset, esim. Wi-Fi-haku, voivat vaikuttaa aikavyöhykkeen tunnistustarkkuuteen."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Päällä"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Poissa päältä"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automaattinen aikavyöhykkeen tunnistus on poistettu käytöstä"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automaattinen aikavyöhyke on poissa päältä"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Sijainnin aikavyöhykkeen tunnistus on poistettu käytöstä"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Sijainnin aikavyöhykkeen tunnistusta ei tueta"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Sijainnin aikavyöhykkeen tunnistukseen ei voi tehdä muutoksia"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Ota käyttöön"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Tyhjennä tallennustila"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Poista päivitykset"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Olet valinnut tämän sovelluksen käynnistettäväksi oletuksena tiettyjen toimintojen yhteydessä."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Jotkin valitsemasi toiminnot avataan oletuksena tällä sovelluksella."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Olet antanut sovellukselle oikeuden luoda widgetejä ja käyttää niiden tietoja."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Ei oletuksia valittuina."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Tyhjennä oletukset"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Tyhjennä oletusasetukset"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Tätä sovellusta ei välttämättä ole suunniteltu näytöllesi sopivaksi. Voit muuttaa asetuksia täältä."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Kysy käynnistettäessä"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Muuta sovelluksen kokoa"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Voit muokata laitteen ominaisuuksia tarpeidesi mukaan. Käytettävyysvalintoja voi muuttaa myöhemmin asetuksissa."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Muuta fonttikokoa"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Näytönlukuohjelmat"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Ääni ja näyttöteksti"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Tekstitykset"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Yleiset"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Näyttö"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Teksti ja näyttö"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Tummenna näyttöä"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Puna-vihersokeus"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Puna-vihersokeus"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Sini-keltasokeus"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Vähennä kirkkautta"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Vähennä kirkkautta"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Tummenna näyttöä puhelimen vähimmäiskirkkautta tummemmaksi"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Tummenna näyttöä tabletin vähimmäiskirkkautta tummemmaksi"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Tummenna näyttöä, jotta sen lukeminen on miellyttävämpää.&lt;br/&gt;&lt;br/&gt; Tästä voi olla apua, kun &lt;ol&gt; &lt;li&gt; puhelin on liian kirkas, vaikka kirkkauden oletusvähimmäisarvo on valittuna&lt;/li&gt; &lt;li&gt; käytät puhelinta pimeässä, esimerkiksi yöllä tai pimeässä huoneessa ennen nukkumaanmenoa&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"kasvot"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"sormenjälki, lisää sormenjälki"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"himmeä näyttö, kosketusnäyttö, akku, älykäs kirkkaus, dynaaminen kirkkaus, automaattinen kirkkaus"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"himmennä näyttö, virransäästötila, akku, aikakatkaisu, huomio, näyttö, käyttämättömyys"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"kiertää, kääntää, kääntäminen, pystysuunta, vaakasuunta, suunta, pystysuorassa, vaakasuorassa"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"päivitä, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"älä häiritse, aikataulu, ilmoitukset, estä, hiljennä, värinä, nukkuminen, työnteko, keskittyminen, äänet, mykistä, päivä, arkipäivä, viikonloppu, arki-ilta, tapahtuma"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"näyttö, lukitusaika, aikakatkaisu, lukitusnäyttö"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Soittoäänet"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Muut äänet ja värinä"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Ilmoitukset"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Keskustelu"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Äskettäin lähetetyt"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Näytä kaikki 7 viime päivän ajalta"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Lisäasetukset"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Yleiset"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Työilmoitukset"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Mukautuvat ilmoitukset"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Mukautuva ilmoitusten tärkeys"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Näytä vedettävällä ilmoitusalueella, tilapalkissa ja lukitusnäytöllä"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Piilota hiljaiset ilmoitukset tilapalkista"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Vilkuta valoa"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Ilmoitukset lukitusnäytöllä"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Tietosuoja"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Lukitusnäytön ohittaminen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Siirry Face Unlockin jälkeen suoraan viimeisimmälle näytölle"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lukitusnäyttö, ohita"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> ilmoitus viikossa</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Ei koskaan"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Pääsy ilmoituksiin"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Laite- ja sovellusilmoitukset"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Valitse, mitä ilmoituksia näytetään sovelluksellasi ja laitteillasi"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Työprofiilin ilmoitusten käyttö on estetty."</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Sovellukset eivät voi lukea ilmoituksia"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Poista käytöstä"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Peruuta"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Sallitut ilmoitustyypit"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Tärkeät pysyvät ilmoitukset"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Keskusteluilmoitukset"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Ääni-ilmoitukset"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Hiljaiset ilmoitukset"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Reaaliaikainen"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Käytössä olevien sovellusten reaaliaikainen viestintä, navigointi ja puhelut"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Keskustelut"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"Tekstiviestit ja muut viestit"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Oletus"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Ilmoitukset, jotka soivat tai värisevät asetuksista riippuen"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Äänetön"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Ilmoitukset, jotka eivät koskaan pidä ääntä tai värise"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Näytä kaikki sovellukset"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Muuta jokaisen ilmoituksia lähettävän sovelluksen ilmoitusasetukset"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Laitteella näkyvät sovellukset"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-avustinpalvelut"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Asennettuja sovelluksia ei ole pyydetty toimimaan VR-avustinpalveluina."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Sallitaanko VR-palveluiden käyttöoikeus palvelulle <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Avaa oletuksena"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Linkkien avautuminen"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Avaa tuetut linkit"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Sovelluksessa avoinna olevat tuetut linkit"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Sovelluksella avattavat linkit"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Avaa kysymättä"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Tuetut linkit"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Muut oletusarvot"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Muut oletusasetukset"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Lisää linkki"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Sovellus voi todentaa linkit ja avata ne automaattisesti sovelluksessa. "<annotation id="url">"Lue lisää"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> todennettua linkkiä</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> todennettu linkki</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Nämä linkit on todennettu ja ne avataan automaattisesti tällä sovelluksella.</item>
+      <item quantity="one">Tämä linkki on todennettu ja se avataan automaattisesti tällä sovelluksella.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Etsitään muita tuettuja linkkejä…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Peru"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tuettua linkkiä</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tuettu linkki</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Lisää"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Avataan sovelluksessa <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> käytössä kohteessa <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"sisäinen tallennustila"</string>
     <string name="storage_type_external" msgid="125078274000280821">"ulkoinen tallennustila"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Kameraa ei sallita"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Kuvakaappauksia ei sallita"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Sovellusta ei voi avata"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Jos sinulla on kysyttävää, ota yhteyttä järjestelmänvalvojaan."</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Lisätietoja"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Järjestelmänvalvoja voi valvoa ja hallita työprofiiliisi liittyviä sovelluksia ja tietoja, mukaan lukien asetuksia, käyttöoikeuksia, yrityskäyttöä, verkkotoimintaa ja laitteen sijaintitietoja."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Järjestelmänvalvoja voi hallita tähän käyttäjäprofiiliin liittyviä sovelluksia ja tietoja, mukaan lukien asetuksia, käyttöoikeuksia, yrityskäyttöä, verkkotoimintaa ja laitteen sijaintitietoja."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 rajoitus</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operaattorin mittaama datan määrä voi erota laitteen mittaustuloksesta."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ei sisällä operaattoriverkkojen käyttämää dataa"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Ei sisällä operaattoriverkkojen käyttämää dataa"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> käytetty"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Aseta datankäyttövaroitus"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datavaroitus"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(poistettu käyttäjältä <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(poistettu käytöstä: <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Automaattinen täyttö ‑palvelu"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automaattinen, täyttää, automaattinen täyttö"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Salasanat"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automaattinen, täyttö, automaattinen täyttö, salasana"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Varmista, että luotat tähän sovellukseen&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; päättelee näytöllä olevien kohteiden perusteella, mitä voidaan täyttää automaattisesti."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Automaattinen täyttö"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Lokikirjaustaso"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Vaihda verkon käyttötilaa"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Ensisijainen verkko"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operaattori"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Asetusten versio"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operaattoriasetusten versio"</string>
     <string name="call_category" msgid="641461844504128789">"Puhelut"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videopuheluiden operaattori"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Valitse järjestelmä"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Poista SIM-kortti ja aseta se takaisin. Jos ongelma ei ratkea, käynnistä laite uudelleen."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Kokeile kytkeä SIM-kortti päälle uudelleen. Jos ongelma ei ratkea, käynnistä laite uudelleen."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Verkon aktivointi"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operaattorin vaihto"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> on aktiivinen"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Päivitä SIM‑asetukset napauttamalla"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> otettiin käyttöön"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Poissa päältä"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kortit"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Näytä lentokonetilan verkot"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Hae lentokonetilan verkkoja ja yhdistä niihin."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Etsi Wi-Fi-verkkoja ja yhdistä niihin"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lentokone, lentokoneturvallinen"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Puhelut ja tekstiviestit"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-puhelut"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ei saatavilla"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tilapäisesti poissa käytöstä"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ei SIM-korttia"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Valinnat"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Verkkoasetukset"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Yhdistä julkisiin verkkoihin"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"verkkoyhteys, internet, langaton, data, langaton yhteys, Wi-Fi, Wi Fi, datayhteys, mobiili, puhelinoperaattori, 4g, 3g, 2g, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Näytä lentokonetilan verkot"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Näytetään lentokonetilan verkkoja"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Laita verkot päälle"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Laita verkot pois päältä"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Nollataanko internetyhteys?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Tämä lopettaa puhelusi"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Tämä lopettaa puhelusi"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Internetyhteyttä nollataan…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Korjaa yhteysongelmat"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Lentokonetilan verkkoja saatavilla"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Vaihda verkkoa irrottamalla Ethernet-johto"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Verkkoa ei voi vaihtaa verkkoyhteyden ollessa päällä"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Lentokonetila verkot"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Yhdistetty"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internetyhteyttä ei muodosteta automaattisesti"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Väri"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Muu"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Yleiset"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Näytä kaikki sovellukset"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Älykäs soitonsiirto"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Älykäs soitonsiirto otettu käyttöön"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Lisää puhelinnumero"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Puhelinnumero puuttuu."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Salli 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Käytä 2G-mobiiliyhteyksiä. 2G on aina päällä hätäpuheluita varten."</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index c917577..3d91ec2 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Rapetisser"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Agrandir"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Utiliser la rotation automatique"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"La rotation automatique en fonction du visage utilise l\'appareil photo frontal pour détecter si quelqu\'un regarde l\'écran, et connaître la position de cette personne par rapport à l\'écran. Elle permet de lire tout en étant allongé, et les images prises ne sont jamais stockées ni envoyées à Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;En savoir plus&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Exemple de texte"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Le Magicien d\'Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Chapitre 11 : La merveilleuse cité d\'émeraude d\'Oz"</string>
@@ -403,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> empreintes digitales configurées</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Déverr. avec empreinte digit."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Configurer empreinte digitale"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Utilisez votre empreinte digitale"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Il vous suffit de toucher le lecteur d\'empreintes digitales pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications. Toutes les personnes dont les empreintes digitales sont ajoutées sur votre téléphone peuvent effectuer ces opérations. Sélectionnez donc ces personnes avec soin."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Vos empreintes digitales peuvent être moins sécurisées qu\'un schéma ou un NIP fiables."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Vous êtes aux commandes"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Souvenez-vous"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Les données enregistrées par le capteur d\'empreintes digitales sont stockées de façon sécurisée et ne quittent jamais votre téléphone. Vous pouvez supprimer vos données à tout moment dans les paramètres."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Vos empreintes digitales peuvent être moins sécuritaires qu\'un schéma ou un NIP fiables."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Votre téléphone utilisera occasionnellement vos dernières empreintes digitales pour créer des empreintes digitales améliorées."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utilisez votre empreinte digitale pour déverrouiller votre téléphone ou autoriser des achats.\n\nRemarque : Vous ne pouvez pas utiliser vos empreintes digitales pour déverrouiller cet appareil. Pour obtenir plus d\'information, communiquez avec l\'administrateur de votre organisation."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utilisez votre empreinte digitale pour déverrouiller votre téléphone ou autoriser des achats.\n\nRemarque : Votre empreinte digitale peut être moins sécurisée qu\'un schéma ou un NIP fiables."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Annuler"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Non merci"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Ignorer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuer"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Accepter"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Passer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Suivant"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Ignorer configuration empreinte?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Ignorer"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Annuler"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Toucher le capteur"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Maintenez le doigt sur l\'icône d\'empreinte digitale"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Il se trouve à l\'arrière de votre téléphone. Utilisez votre index."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Il se trouve sur l\'écran. Trouvez l\'empreinte digitale dans un cercle lumineux."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Le capteur d\'empreintes digitales est sur votre écran. Faites glisser votre doigt sur l\'écran pour le trouver."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustration présentant l\'appareil et la position du capteur d\'empreinte digitale"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nom"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Supprimer"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Toucher le capteur"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Placez votre doigt sur le capteur, puis soulevez-le lorsque vous sentez une vibration"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Relever le doigt et toucher le capteur"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Déplacez légèrement votre doigt lorsque vous le relevez pour ajouter toutes les parties de votre empreinte digitale."</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Empreinte digitale ajoutée"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Lorsque vous voyez cette icône, vous pouvez utiliser votre empreinte digitale pour vous identifier ou pour autoriser un achat"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Plus tard"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activé : L\'écran ne s\'éteint pas pendant que vous le regardez"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Désactivé"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"L\'accès à l\'appareil photo est requis"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Touchez pour gérer les services de personnalisation de l\'appareil"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Empêche l\'écran de s\'éteindre pendant que vous le regardez"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"La fonctionnalité Écran attentif utilise l\'appareil photo avant pour détecter si quelqu\'un regarde l\'écran. Elle fonctionne sur l\'appareil, et les images ne sont jamais enregistrées ni envoyées à Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Activer la fonctionnalité d\'écran attentif"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Lorsque l\'écran est sombre, il s\'allume en cas de nouvelles notifications"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Toujours affich. heure et données"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Utilisation accrue de la pile"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Mettre le texte en gras"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Mettre le texte en gras"</string>
     <string name="title_font_size" msgid="570613010306330622">"Taille de police"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Agrandissez ou réduisez le texte"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Paramètres de verrouillage SIM"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Autres utilisateurs"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Mémoire interne de l\'appareil"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Mémoire de stockage externe"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmes et rappels"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Autoriser la création d\'alarmes ou de rappels"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmes et rappels"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Autorisez cette application à programmer des alarmes ou d\'autres événements temporels. Cette option permettra à l\'application de s\'activer et de fonctionner même si vous n\'utilisez pas l\'appareil. Notez que si vous révoquez cette autorisation, l\'application pourrait ne pas fonctionner correctement. En particulier, les alarmes que l\'application a programmées ne fonctionneront plus."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"horaire, alarme, rappel, événement"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> utilisé(s) sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"utilisé(s) sur <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Services de localisation"</string>
     <string name="location_title" msgid="5819154746934945021">"My Location"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Position pour profil profess."</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Accès de l\'appli à la position"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Le signalement de position est désactivé"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> application sur <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> a accès à la position</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> applications sur <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ont accès à la position</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Accès récents à la position"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Afficher les détails"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Aucune application n\'a récemment demandé l\'accès à votre position"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Aucune application n\'a récemment accédé à la position"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Forte utilisation de la pile"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Faible utilisation de la pile"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Recherche Wi‑Fi et Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Recherche de réseaux Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Autoriser les applications et les services à rechercher les réseaux Wi-Fi en tout temps, même lorsque le Wi-Fi est désactivé. Cette autorisation peut permettre, par exemple, d\'améliorer les fonctionnalités et les services basés sur la localisation."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Recherche d\'appareils Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Autoriser les applications et les services à rechercher les appareils à proximité en tout temps, même lorsque le Bluetooth est désactivé. Cette autorisation peut permettre, par exemple, d\'améliorer les fonctionnalités et les services basés sur la localisation."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Services de localisation"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Services de localisation pour le travail"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Détection du fuseau horaire basée sur la position"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Détection du fuseau horaire basée sur la position"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permet d\'utiliser la position de l\'appareil pour détecter le fuseau horaire actuel. D\'autres paramètres de localisation, comme la recherche de réseaux Wi-Fi, peuvent avoir un impact sur la précision de la détection du fuseau horaire."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Activée"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Désactivée"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"La détection automatique de fuseau horaire est désactivée"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"La détection automatique du fuseau horaire est désactivée"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"La détection du fuseau horaire basée sur la position est désactivée"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"La détection du fuseau horaire basée sur la position n\'est pas prise en charge"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Les modifications de la détection du fuseau horaire basée sur la position ne sont pas autorisées"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Activer"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Effacer l\'espace de stockage"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Désinstaller mises à jour"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Vous avez choisi de lancer cette application par défaut pour certaines actions."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Certaines activités que vous avez sélectionnées s\'ouvrent dans cette application par défaut."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Vous avez choisi de permettre à cette application de créer des widgets et d\'accéder à leurs données."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Aucun paramètre par défaut défini"</string>
-    <string name="clear_activities" msgid="341345438786077236">"Effacer les actions par défaut"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Effacer les préférences par défaut"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Cette application n\'est peut-être pas adaptée à votre écran. Vous pouvez modifier les paramètres d\'ajustement ici."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Demander au moment du lancement"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Mettre l\'application à l\'échelle"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Vous pouvez personnaliser cet appareil en fonction de vos besoins. Il est possible de modifier ces fonctionnalités d\'accessibilité plus tard dans les paramètres."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Modifier la taille de la police"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lecteurs d\'écran"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio et texte à l\'écran"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Sous-titres"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Généraux"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Affichage"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texte et affichage"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Assombrir l\'écran"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rouge-vert"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rouge-vert"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Bleu-jaune"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Réduire la luminosité"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Réduire la luminosité"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Assombrissez l\'écran de votre téléphone davantage que sa luminosité minimale"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Assombrissez l\'écran de votre tablette davantage que sa luminosité minimale"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Assombrissez votre écran pour qu\'il soit plus facile à lire.&lt;br/&gt;&lt;br/&gt; Cela peut être pratique dans certains cas : &lt;ol&gt; &lt;li&gt; La luminosité minimale par défaut de votre téléphone est quand même trop intense&lt;/li&gt; &lt;li&gt; Vous utilisez votre téléphone dans un environnement sombre, comme la nuit ou dans une salle sombre avant d\'aller vous coucher&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"visage"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"empreinte digitale, ajouter une empreinte digitale"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"réduire la luminosité de l\'écran, écran tactile, pile, réglage intelligent de la luminosité, luminosité dynamique, luminosité automatique"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"assombrir l\'écran, veille, pile, délai d\'inactivité, attention, affichage, écran, inactivité"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"faire pivoter, tourner, retourner, rotation, portrait, paysage, orientation, vertical, horizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"mise à niveau, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"ne pas déranger, horaire, notifications, bloquer, silence, vibrer, dormir, travailler, se concentrer, son, muet, jour, jour de semaine, fin de semaine, soir de semaine, événement"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"écran, temps de verrouillage, expiration du délai, verrouillage de l\'écran"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Sonneries"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Autres sons et vibrations"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifications"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversation"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Envoyées récemment"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Tout afficher depuis les sept derniers jours"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Paramètres avancés"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Général"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notifications professionnelles"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notifications adaptatives"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Priorité adaptative pour les notifications"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"S\'affiche dans le volet déroulant, dans la barre d\'état et sur l\'écran de verrouillage"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Masquer les notifications silencieuses dans la barre d\'état"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Faire clignoter le voyant"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notif. sur l\'écran verrouillé"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Confidentialité"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Ignorer l\'écran de verrouillage"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Après le déverr. par rec. faciale, aller au dernier écran util."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Écran de verrouillage, écran verrouillé, ignorer, contourner"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notifications par semaine</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Jamais"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Accès aux notifications"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Appareil et notifications de l\'application"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Définissez les notifications qui s\'affichent dans vos applications et sur vos appareils"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"L\'accès aux notifications du profil professionnel est bloqué"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Les applications ne peuvent pas lire les notifications."</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Désactiver"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Annuler"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Types de notifications autorisées"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Notifications actuelles importantes"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Notifications de conversations"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Notifications d\'alerte"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Notifications silencieuses"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"En temps réel"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Communications en temps réel des applications en cours (navigation, appels téléphoniques, etc.)"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Conversations"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"Messages texte et autres communications"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Par défaut"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Votre téléphone peut sonner ou vibrer lorsqu\'il reçoit des notifications, selon les paramètres"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Mode silencieux"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Votre téléphone ne sonnera ou ne vibrera pas lorsqu\'il reçoit ces notifications"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Afficher toutes les applications"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Modifier les paramètres de notification pour chaque application qui peut vous envoyer des notifications"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Applications affichées sur l\'appareil"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Services d\'assistance de réalité virtuelle"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Aucune demande d\'exécution en tant que services de soutien de réalité virtuelle n\'a été envoyée pour les applications installées."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Autoriser <xliff:g id="SERVICE">%1$s</xliff:g> à accéder au service de réalité virtuelle?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Ouvert par défaut"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Ouverture des liens"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Ouvrir les liens compatibles"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Liens pris en charge ouverts dans cette application"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Liens à ouvrir dans cette application"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Ouvrir sans demander"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Liens compatibles"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Autres défauts"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Autres préférences par défaut"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Ajouter un lien"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Une application peut vérifier les liens pour les ouvrir automatiquement. "<annotation id="url">"En savoir plus"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> lien vérifié</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> liens vérifiés</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Ce lien a été vérifié et s\'ouvre automatiquement dans l\'application.</item>
+      <item quantity="other">Ces liens ont été vérifiés et s\'ouvrent automatiquement dans l\'application.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Vérification des liens pris en charge en cours…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Annuler"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> lien pris en charge</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> liens pris en charge</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Ajouter"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"S\'ouvre dans <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> utilisé dans <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"stockage interne"</string>
     <string name="storage_type_external" msgid="125078274000280821">"stockage externe"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"L\'appareil photo est désactivé"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Les captures d\'écran sont désactivées"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Impossible d\'ouvrir cette application"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Si vous avez des questions, veuillez communiquer avec votre administrateur informatique"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Détails supplémentaires"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Votre administrateur peut surveiller et gérer les applications et les données associées à votre profil professionnel, y compris les paramètres, les autorisations, l\'accès aux contenus de l\'entreprise, l\'activité réseau et les données de localisation de l\'appareil."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Votre administrateur peut surveiller et gérer les applications et les données associées à cet utilisateur, y compris les paramètres, les autorisations, l\'accès aux contenus de l\'entreprise, l\'activité réseau et les données de localisation de l\'appareil."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Le suivi de consommation de données du fournisseur de services peut différer de celui de l\'appareil"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Les données utilisées sur les réseaux cellulaires sont exclues"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Exclut les données utilisées sur les réseaux cellulaires"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Activer une alerte"</string>
     <string name="data_warning" msgid="2925054658166062884">"Seuil d\'alerte"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(désinst. pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(désactivé pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Service de remplissage auto"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automatique, remplir, remplissage automatique"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Mots de passe"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automatique, remplir, remplissage automatique, mot de passe"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Assurez-vous de faire confiance à cette application&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Remplissage automatique&gt;%1$s&lt;/xliff:g&gt; utilise les éléments affichés à l\'écran pour déterminer les champs qui peuvent bénéficier de l\'entrée automatique."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Remplissage automatique"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Niveau de journalisation"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Changer le mode de fonctionnement du réseau"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Type de réseau préféré"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Fournisseur de services"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Version des paramètres"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Version des paramètres du fournisseur de services"</string>
     <string name="call_category" msgid="641461844504128789">"Appels"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Appels vidéo par l\'entremise du fournisseur de services"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sélection système"</string>
@@ -4909,7 +4963,7 @@
     <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Activer <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Activer la carte SIM?"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Passer au réseau de <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
-    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Passer à l\'utilisation d\'une carte SIM?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Passer à la carte SIM?"</string>
     <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Une seule carte SIM peut être active à la fois.\n\nLe fait de passer au réseau de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'annulera pas votre service auprès de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
     <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Une seule carte SIM téléchargée peut être active à la fois.\n\nLe fait de passer au réseau de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'annulera pas votre service auprès de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
     <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Une seule carte SIM peut être active à la fois.\n\nLe fait de passer à un autre réseau n\'annulera pas votre service auprès de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
@@ -4924,7 +4978,7 @@
     <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Impossible de désactiver le fournisseur de services"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Une erreur s\'est produite et le fournisseur de services n\'a pas pu être désactivé."</string>
     <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Utiliser deux cartes SIM?"</string>
-    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Cet appareil prend en charge deux cartes SIM actives simultanément. Pour continuer d\'utiliser une seule carte SIM à la fois, touchez « Non merci »"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Cet appareil prend en charge deux cartes SIM actives simultanément. Pour continuer d\'utiliser une seule carte SIM à la fois, touchez « Non merci »."</string>
     <string name="sim_action_restart_title" msgid="7054617569121993825">"Redémarrer l\'appareil?"</string>
     <string name="sim_action_restart_text" msgid="8019300474703571013">"Pour commencer, redémarrez votre appareil. Vous pourrez ensuite ajouter une carte SIM."</string>
     <string name="sim_action_continue" msgid="1688813133152389943">"Continuer"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Retirez la carte SIM, puis réinsérez-la. Si le problème persiste, redémarrez votre appareil."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Réessayer d\'activer la carte SIM. Si le problème persiste, redémarrez votre appareil."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activation du réseau"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Changement de fournisseur de services en cours…"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> est actif"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Touchez l\'écran pour mettre à jour les paramètres de la carte SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Vous êtes passé au réseau de <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Désactivé"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Cartes SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Afficher les réseaux accessibles en mode Avion"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Trouvez les réseaux accessibles en mode Avion et connectez-vous-y."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Rechercher des réseaux Wi-Fi et s\'y connecter"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, sécuritaire pour les avions"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Appels et messages texte"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Appels Wi‑Fi"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"non accessible"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Momentanément inaccessible"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Aucune carte SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Préférences"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Préférences réseau"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Se connecter aux réseaux publics"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connexion réseau, internet, sans fil, données, wifi, wi-fi, wi fi, cellulaire, mobile, fournisseur cellulaire, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Afficher les réseaux du mode Avion"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Affichage des réseaux accessibles en mode Avion"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Activer les réseaux"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Désactiver les réseaux"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Réinitialiser votre connexion Internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Cette action mettra fin à votre appel téléphonique"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Cette action mettra fin à votre appel téléphonique"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Réinitialisation de votre connexion Internet en cours…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Dépanner la connectivité"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Réseaux accessibles en mode Avion"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Pour changer de réseau, débranchez le câble Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Impossible de changer de réseau, alors que vous êtes connecté"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Réseaux compatibles avec le mode Avion"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> : <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connexion active"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Imposs. de se connecter automatiquement à Internet"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Couleur"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Autres"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Général"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Afficher toutes les applications"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Transfert d\'appels intelligent"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Le transfert d\'appels intelligent est activé"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Entrer le numéro de téléphone"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Le numéro de téléphone est manquant."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Autoriser les réseaux 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Utiliser les connexions cellulaires 2G. La 2G est toujours activée pour les appels d\'urgence."</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 76ffcc7..e57f105 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Réduire"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Agrandir"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Utiliser la rotation automatique"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"La rotation automatique en fonction du visage utilise la caméra avant pour vérifier si quelqu\'un regarde l\'écran et sous quel angle. Cela vous permet de lire en étant allongé. Le flux de la caméra n\'est jamais stocké ni envoyé à Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;En savoir plus&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Exemple de texte"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Le Magicien d\'Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Chapitre 11 : La merveilleuse cité d\'émeraude"</string>
@@ -403,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> empreintes digitales configurées</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Déverrouillage avec empreinte"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Configurez votre empreinte"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Utiliser votre empreinte digitale"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Il vous suffit d\'appuyer sur le lecteur d\'empreintes digitales pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications. Toutes les personnes dont les empreintes digitales sont ajoutées sur votre téléphone peuvent effectuer ces opérations. Choisissez donc ces personnes avec soin."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Il est possible que votre empreinte digitale soit moins sécurisée qu\'un schéma ou qu\'un code sécurisés."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Vous avez le contrôle"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"À noter"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Les données enregistrées par Fingerprint sont stockées de façon sécurisée et ne quittent jamais votre téléphone. Vous pouvez les supprimer à tout moment dans les paramètres."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Il est possible que votre empreinte digitale soit moins sécurisée qu\'un schéma ou qu\'un code fiable."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Votre téléphone utilisera occasionnellement vos dernières images d\'empreintes digitales pour créer des modèles d\'empreintes digitales améliorés."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utilisez votre empreinte digitale pour déverrouiller votre téléphone ou approuver des achats.\n\nRemarque : Vous ne pouvez pas utiliser votre empreinte digitale pour déverrouiller cet appareil. Pour en savoir plus, contactez l\'administrateur de votre entreprise."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utilisez votre empreinte digitale pour déverrouiller votre téléphone ou approuver des achats.\n\nRemarque : Votre empreinte digitale peut être moins sécurisée qu\'un schéma ou un code fiable."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Annuler"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Non, merci"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Passer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuer"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Accepter"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ignorer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Suivant"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Passer la config. empreinte ?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Passer"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Annuler"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Posez le doigt sur le lecteur"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Appuyez de manière prolongée sur l\'icône d\'empreinte"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Le lecteur se trouve à l\'arrière du téléphone. Utilisez l\'index."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Le capteur est à l\'écran. Localisez l\'empreinte digitale avec un cercle lumineux."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Le lecteur d\'empreinte digitale est affiché. Faites glisser votre doigt sur l\'écran pour le trouver."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustration présentant l\'appareil et la position du lecteur d\'empreintes digitales"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nom"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Supprimer"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Posez le doigt sur le lecteur"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Placez votre doigt sur le lecteur, puis soulevez-le lorsque vous sentez une vibration"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Levez le doigt, puis appuyez de nouveau"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Effectuez cette opération plusieurs fois pour ajouter les différentes parties de votre empreinte digitale"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Empreinte digitale ajoutée"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Quand cette icône s\'affiche, vous pouvez utiliser votre empreinte digitale pour vous identifier ou approuver des achats"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Plus tard"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activé - L\'écran ne s\'éteint pas pendant que vous le regardez"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Désactivé"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Accès à l\'appareil photo requis"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Appuyez ici pour gérer les autorisations relatives aux services de personnalisation de l\'appareil"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Empêche l\'écran de s\'éteindre pendant que vous le regardez"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"La fonctionnalité Regard sur écran utilise la caméra frontale pour détecter si quelqu\'un regarde l\'écran. Elle fonctionne seulement sur l\'appareil et les images ne sont jamais enregistrées ni envoyées à Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Activer Regard sur l\'écran"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Lorsque l\'écran est sombre, il s\'allume en cas de nouvelles notifications"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Toujours afficher heure et infos"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Batterie davantage sollicitée"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Mettre en gras"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Mettre en gras"</string>
     <string name="title_font_size" msgid="570613010306330622">"Taille de la police"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Agrandir ou réduire le texte"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Verrouillage SIM"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Autres utilisateurs"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Mémoire de l\'appareil"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Mémoire de stockage externe"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmes et rappels"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Autoriser à définir des alarmes et rappels"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmes et rappels"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Autoriser cette appli à définir des alarmes et d\'autres événements liés à l\'heure. L\'appli pourra alors se lancer et s\'exécuter même si vous n\'utilisez pas l\'appareil. Si vous révoquez cette autorisation, l\'appli risque de mal fonctionner. En particulier, les alarmes qu\'elle aura définies ne fonctionneront plus."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"définir, alarme, rappel, événement"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> utilisé(s) sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Utilisés sur <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Services de localisation"</string>
     <string name="location_title" msgid="5819154746934945021">"Ma position"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Position du profil pro"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Accès aux données de localisation"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"La localisation est désactivée"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> application sur <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> a accès à votre position</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> applications sur <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ont accès à votre position</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Accès récent à votre position"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Afficher les détails"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Aucune demande d\'accès à votre position n\'a récemment été envoyée pour une application."</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Aucune application n\'a récemment accédé à la position"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Forte utilisation de la batterie"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Faible utilisation de batterie"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Recherche Wi‑Fi et Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Recherche Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Autoriser les applications et les services à rechercher des réseaux Wi-Fi à tout moment, même si le Wi-Fi est désactivé. Cette autorisation peut permettre, par exemple, d\'améliorer les fonctionnalités et les services basés sur la localisation."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Recherche Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Autoriser les applications et les services à rechercher des appareils à proximité à tout moment, même si le Bluetooth est désactivé. Cette autorisation peut permettre, par exemple, d\'améliorer les fonctionnalités et les services basés sur la localisation."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Services de localisation"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Services de localisation pour le travail"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Détection du fuseau horaire basée sur la position"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Détection du fuseau horaire basée sur la position"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Autorisez l\'utilisation de la position de l\'appareil pour détecter le fuseau horaire actuel. D\'autres paramètres de localisation tels que la recherche Wi‑Fi peuvent affecter la précision de la détection du fuseau horaire."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Activée"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Désactivée"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Détection de fuseau horaire automatique désactivée"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Le fuseau horaire automatique est désactivé"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Détection du fuseau horaire basée sur la position désactivée"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Détection du fuseau horaire basée sur la position incompatible"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Modifications de la détection du fuseau horaire basée sur la position non autorisées"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Activer"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Vider l\'espace de stockage"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Désinstaller les mises à jour"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Vous avez choisi de lancer cette application par défaut pour certaines actions."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Certaines activités que vous avez sélectionnées s\'ouvrent dans cette appli par défaut."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Vous avez choisi de permettre à cette application de créer des widgets et d\'accéder à leurs données."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Aucun paramètre par défaut défini"</string>
-    <string name="clear_activities" msgid="341345438786077236">"Effacer les actions par défaut"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Effacer les préférences par défaut"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Cette application n\'est peut-être pas adaptée à votre écran. Vous pouvez modifier les paramètres d\'ajustement ici."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Demander au moment du lancement"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Mettre l\'application à l\'échelle"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Vous pouvez personnaliser cet appareil en fonction de vos besoins et modifier ces fonctionnalités d\'accessibilité ultérieurement dans les paramètres."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Modifier la taille de la police"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lecteurs d\'écran"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio et texte à l\'écran"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Sous-titres"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Général"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Écran"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Annonces textuelles et display"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Assombrir l\'écran"</string>
@@ -2168,7 +2195,7 @@
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Agrandir en appuyant trois fois"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Agrandir avec un raccourci"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="8067042663897802231">"Agrandir avec un raccourci et trois tapotements"</string>
-    <string name="accessibility_introduction_title" msgid="8834950581512452348">"À propos de la fonctionnalité <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
+    <string name="accessibility_introduction_title" msgid="8834950581512452348">"À propos de <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
     <string name="accessibility_screen_option" msgid="8465307075278878145">"Options"</string>
     <string name="accessibility_preference_magnification_summary" msgid="2875518904115896888">"Zoom avant sur l\'écran"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Appuyer trois fois pour zoomer"</string>
@@ -2189,7 +2216,7 @@
     <string name="accessibility_tutorial_dialog_message_gesture_settings" msgid="40769674586981429">"Pour utiliser une fonctionnalité d\'accessibilité, balayez l\'écran vers le haut avec deux doigts.\n\nPour changer de fonctionnalité, balayez l\'écran vers le haut avec deux doigts et appuyez de manière prolongée."</string>
     <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"Pour utiliser une fonctionnalité d\'accessibilité, balayez l\'écran vers le haut avec trois doigts.\n\nPour changer de fonctionnalité, balayez l\'écran vers le haut avec trois doigts et appuyez de manière prolongée."</string>
     <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"OK"</string>
-    <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Raccourci vers la fonctionnalité <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
+    <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Raccourci vers <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
     <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"Bouton Accessibilité"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"Balayer l\'écran vers le haut avec deux doigts"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"Balayer l\'écran vers le haut avec trois doigts"</string>
@@ -2282,7 +2309,7 @@
     <string name="accessibility_summary_state_stopped" msgid="2343602489802623424">"Ce service ne fonctionne pas. Appuyez ici pour en savoir plus."</string>
     <string name="accessibility_description_state_stopped" msgid="5364752492861199133">"Ce service ne fonctionne pas."</string>
     <string name="accessibility_shortcuts_settings_title" msgid="974740249671825145">"Raccourcis d\'accessibilité"</string>
-    <string name="enable_quick_setting" msgid="6648073323202243604">"Afficher dans la fenêtre de configuration rapide"</string>
+    <string name="enable_quick_setting" msgid="6648073323202243604">"Afficher dans les Réglages rapides"</string>
     <string name="daltonizer_type" msgid="1715154680803795947">"Mode de correction"</string>
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deutéranomalie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalie"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rouge-vert"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rouge-vert"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Bleu-jaune"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Réduire la luminosité"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Réduire la luminosité"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Assombrir l\'écran au-delà du niveau minimal de luminosité de votre téléphone"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Assombrir l\'écran au-delà du niveau minimal de luminosité de votre tablette"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Assombrissez l\'écran pour améliorer votre confort de lecture.&lt;br/&gt;&lt;br/&gt; Cela peut être utile quand : &lt;ol&gt; &lt;li&gt; Même le niveau minimal de luminosité par défaut de votre téléphone est trop lumineux.&lt;/li&gt; &lt;li&gt; Vous utilisez votre téléphone dans l\'obscurité, par exemple la nuit ou dans une pièce sombre avant de vous coucher.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"visage"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"empreinte digitale, ajouter une empreinte digitale"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"réduire la luminosité de l\'écran, écran tactile, batterie, réglage intelligent de la luminosité, luminosité dynamique, réglage automatique de la luminosité"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"assombrir l\'écran, veille, batterie, délai de mise en veille de l\'écran, regard sur écran, affichage, écran, inactivité"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"faire pivoter, inverser, rotation, portrait, paysage, orientation, vertical, horizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"mettre à jour, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"ne pas déranger, calendrier, notifications, bloquer, silence, vibreur, veille, travail, sélectionner, son, couper le son, jour, jour de semaine, week-end, soir de semaine, événement"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"écran, temps de verrouillage, délai de mise en veille de l\'écran, verrouillage de l\'écran"</string>
@@ -3467,7 +3496,7 @@
     <string name="zen_category_apps" msgid="1167374545618451925">"Applications"</string>
     <string name="zen_category_exceptions" msgid="1316097981052752811">"Alarmes et autres interruptions"</string>
     <string name="zen_category_schedule" msgid="2003707171924226212">"Horaires"</string>
-    <string name="zen_category_duration" msgid="7515850842082631460">"Durée du mode en Configuration rapide"</string>
+    <string name="zen_category_duration" msgid="7515850842082631460">"Durée pour les Réglages rapides"</string>
     <string name="zen_sound_footer" msgid="4090291351903631977">"Lorsque le mode Ne pas déranger est activé, le son et le vibreur sont désactivés, sauf pour les éléments autorisés ci-dessus."</string>
     <string name="zen_custom_settings_dialog_title" msgid="4613603772432720380">"Paramètres personnalisés"</string>
     <string name="zen_custom_settings_dialog_review_schedule" msgid="4674671820584759928">"Examiner une programmation"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Sonneries"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Autres sons et vibrations"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifications"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversation"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Envoyées récemment"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Tout afficher depuis les sept derniers jours"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Paramètres avancés"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Général"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notifications profil pro"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notifications intelligentes"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Priorité des notifications intelligentes"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"S\'affichent dans le volet des notifications, la barre d\'état et sur l\'écran de verrouillage"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Masquer les notifications silencieuses dans la barre d\'état"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Clignotement"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifications sur l\'écran de verrouillage"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Confidentialité"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Ignorer l\'écran de verrouillage"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Après le déverrouillage via Face Unlock, accéder au dernier écran utilisé"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Écran de verrouillage, verrouiller l\'écran, passer, ignorer"</string>
@@ -3632,7 +3662,7 @@
     <string name="allow_interruption" msgid="5237201780159482716">"Autoriser les interruptions"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"Autoriser l\'application à émettre des sons, vibrer et/ou afficher des notifications à l\'écran"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"Prioritaire"</string>
-    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"S\'affiche en haut de la section des conversations, apparaît sous forme de bulle flottante, affiche la photo de profil sur l\'écran de verrouillage"</string>
+    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"S\'affiche tout en haut des conversations et sous forme de bulle flottante, et entraîne l\'affichage d\'une photo de profil sur l\'écran de verrouillage"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"L\'application <xliff:g id="APP_NAME">%1$s</xliff:g> n\'est pas compatible avec la plupart des fonctionnalités de conversation. Vous ne pouvez pas définir une conversation comme prioritaire, et les conversations n\'apparaissent pas sous forme de bulles flottantes."</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"Dans le volet déroulant, afficher les notifications sur une seule ligne"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"Aucun son ni vibration"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="other">Environ <xliff:g id="NUMBER_1">%d</xliff:g> notifications par semaine</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Jamais"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Accès aux notifications"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Notifications des appareils et applis"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Contrôlez les notifications qui s\'affichent dans vos applis et sur vos appareils"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"L\'accès aux notifications du profil professionnel est bloqué"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Les applications ne peuvent pas lire les notifications."</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Désactiver"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Annuler"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Types de notifications autorisés"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Notifications importantes en cours"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Notifications de conversation"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Notifications d\'alerte"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Notifications silencieuses"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"En temps réel"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Communications en temps réel des applis en cours d\'utilisation (navigation, appels téléphoniques, etc.)"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Conversations"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS et autres communications"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Par défaut"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"En fonction des paramètres, votre téléphone sonne ou vibre lorsqu\'il reçoit des notifications"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Silencieuses"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Votre téléphone ne sonne ou ne vibre jamais lorsqu\'il reçoit des notifications"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Voir toutes les applis"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Modifier les paramètres de notification pour chaque appli pouvant envoyer des notifications"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Applis affichées sur l\'appareil"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Assistance réalité virtuelle"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Aucune demande d\'exécution en tant que service d\'assistance pour la réalité virtuelle n\'a été envoyée pour les applications installées."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Autoriser <xliff:g id="SERVICE">%1$s</xliff:g> à accéder au service de réalité virtuelle ?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Ouvrir par défaut"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Ouverture des liens"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Ouvrir les liens compatibles"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Liens compatibles ouverts dans cette appli"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Liens à ouvrir dans cette appli"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Ouvrir sans demander l\'autorisation"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Liens compatibles"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Autres valeurs par défaut"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Autres préférences par défaut"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Ajouter un lien"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Une appli peut vérifier les liens pour les ouvrir automatiquement dans son interface. "<annotation id="url">"En savoir plus"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> lien validé</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> liens validés</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Ce lien est validé et s\'ouvre automatiquement dans l\'appli.</item>
+      <item quantity="other">Ces liens sont validés et s\'ouvrent automatiquement dans l\'appli.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Recherche d\'autres liens compatibles…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Annuler"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> lien compatible</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> liens compatibles</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Ajouter"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"S\'ouvre dans <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> utilisé(s) dans <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"Stockage interne"</string>
     <string name="storage_type_external" msgid="125078274000280821">"Stockage externe"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Appareil photo non autorisé"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Capture d\'écran non autorisée"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Impossible d\'ouvrir cette application"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Pour toute question, contactez votre administrateur informatique"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Plus d\'informations"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Votre administrateur peut contrôler et gérer les applications et les données associées à votre profil professionnel, y compris les paramètres, les autorisations, l\'accès aux contenus de l\'entreprise, l\'activité réseau et les informations de localisation de l\'appareil."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Votre administrateur peut contrôler et gérer les applications et les données associées à ce profil utilisateur, y compris les paramètres, les autorisations, l\'accès aux contenus de l\'entreprise, l\'activité réseau et les informations de localisation de l\'appareil."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Le suivi de consommation de votre opérateur peut différer de celui qui est effectué sur votre appareil."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Les données consommées via les réseaux d\'opérateurs sont exclues"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Les données consommées via les réseaux d\'opérateurs sont exclues"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> utilisé(s)"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Définir un seuil d\'avertissement"</string>
     <string name="data_warning" msgid="2925054658166062884">"Seuil d\'avertissement"</string>
@@ -4465,7 +4518,7 @@
     <string name="dark_ui_settings_dialog_acknowledge" msgid="250437497729953965">"OK"</string>
     <string name="dark_theme_slice_title" msgid="4684222119481114062">"Essayer le thème sombre"</string>
     <string name="dark_theme_slice_subtitle" msgid="5555724345330434268">"Améliore l\'autonomie de la batterie"</string>
-    <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"Tuiles de configuration rapide pour les développeurs"</string>
+    <string name="quick_settings_developer_tiles" msgid="7336007844525766623">"Blocs Réglages rapides pour les développeurs"</string>
     <string name="adb_authorization_timeout_title" msgid="6996844506783749754">"Désactiver délai d\'expiration autorisation adb"</string>
     <string name="adb_authorization_timeout_summary" msgid="409931540424019778">"Désactiver le retrait automatique des autorisations adb pour des systèmes qui ne se sont pas connectés dans les délais par défaut (7 jours) ou dans un délai défini par l\'utilisateur (1 jour minimum)."</string>
     <string name="winscope_trace_quick_settings_title" msgid="4104768565053226689">"Trace Winscope"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(désinstallé pour utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(désactivé pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Service de saisie automatique"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automatique, saisie, saisie automatique"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Mots de passe"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automatique, saisie, saisie automatique, mot de passe"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Assurez-vous de faire confiance à cette application&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; utilise les éléments affichés à l\'écran pour déterminer les champs qui peuvent bénéficier de la saisie automatique."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Saisie automatique"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Niveau de journalisation"</string>
@@ -4863,7 +4917,7 @@
     <string name="subscription_available" msgid="2659722770210403365">"Disponible"</string>
     <string name="mobile_network_in_range" msgid="3528320750936028369">"à portée"</string>
     <string name="mobile_network_not_in_range" msgid="5680896182395366584">"Hors de portée"</string>
-    <string name="mobile_network_list_add_more" msgid="4478586073355236604">"En ajouter d\'autres"</string>
+    <string name="mobile_network_list_add_more" msgid="4478586073355236604">"Ajouter"</string>
     <string name="mobile_network_active_sim" msgid="6397581267971410039">"Actif/Carte SIM"</string>
     <string name="mobile_network_inactive_sim" msgid="5829757490580409899">"Inactif/Carte SIM"</string>
     <string name="mobile_network_active_esim" msgid="4673190244386572318">"Actif/Carte SIM téléchargée"</string>
@@ -4877,16 +4931,16 @@
     <string name="mobile_network_disable_sim_explanation" msgid="2851862257846773796">"Pour désactiver cette carte SIM, retirez-la"</string>
     <string name="mobile_network_tap_to_activate" msgid="4139979375717958102">"Appuyer pour activer <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="mobile_network_esim_swap_confirm_title" msgid="2762744961192218789">"Utiliser <xliff:g id="CARRIER">%1$s</xliff:g> ?"</string>
-    <string name="mobile_network_esim_swap_confirm_body" msgid="8168680839542031781">"Vous ne pouvez activer qu\'une seule carte SIM téléchargée à la fois.\n\nBasculer sur l\'opérateur <xliff:g id="CARRIER1">%1$s</xliff:g> n\'annulera pas votre service <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
+    <string name="mobile_network_esim_swap_confirm_body" msgid="8168680839542031781">"Une seule carte SIM téléchargée peut être active à la fois.\n\nPasser à <xliff:g id="CARRIER1">%1$s</xliff:g> n\'entraînera pas la résiliation de votre service <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="8695772737522378095">"Basculer vers le réseau <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
-    <string name="mobile_network_erase_sim" msgid="4629071168032714930">"Effacer une carte SIM"</string>
+    <string name="mobile_network_erase_sim" msgid="4629071168032714930">"Effacer la carte SIM"</string>
     <string name="mobile_network_erase_sim_error_dialog_title" msgid="6680959559589234726">"Impossible d\'effacer la carte SIM"</string>
     <string name="mobile_network_erase_sim_error_dialog_body" msgid="6401922869095572710">"Une erreur empêche l\'effacement de cette carte SIM.\n\nRedémarrez votre appareil et réessayez."</string>
     <string name="preferred_network_mode_title" msgid="3083431168988535628">"Type de réseau préféré"</string>
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Changer le mode de fonctionnement du réseau"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Type de réseau préféré"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Opérateur"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Version des paramètres"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Version des paramètres de l\'opérateur"</string>
     <string name="call_category" msgid="641461844504128789">"Appels"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Appels vidéo via l\'opérateur"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sélection système"</string>
@@ -4909,10 +4963,10 @@
     <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Activer <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ?"</string>
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Activer la carte SIM ?"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Passer à <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ?"</string>
-    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Passer à l\'utilisation de la carte SIM ?"</string>
-    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Vous ne pouvez activer qu\'une seule carte SIM à la fois.\n\nLe passage à <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'entraînera pas la résiliation de votre service <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
-    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Vous ne pouvez activer qu\'une seule carte SIM téléchargée à la fois.\n\nLe passage à <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'entraînera pas la résiliation de votre service <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
-    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Vous ne pouvez activer qu\'une seule carte SIM à la fois.\n\nCe changement n\'entraînera pas la résiliation de votre service <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Utiliser la carte SIM ?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Une seule carte SIM peut être active à la fois.\n\nPasser à <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'entraînera pas la résiliation de votre service <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Une seule carte SIM téléchargée peut être active à la fois.\n\nPasser à <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'entraînera pas la résiliation de votre service <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Une seule carte SIM peut être active à la fois.\n\nCe changement n\'entraînera pas la résiliation de votre service <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Passer à <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connexion au réseau…"</string>
     <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Passage à <xliff:g id="CARRIER_NAME">%1$s</xliff:g>…"</string>
@@ -4924,7 +4978,7 @@
     <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Impossible de désactiver l\'opérateur"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Un problème a empêché l\'appareil de désactiver votre opérateur."</string>
     <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Utiliser deux cartes SIM ?"</string>
-    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Cet appareil peut posséder deux cartes SIM actives en même temps. Pour continuer à utiliser une seule carte SIM à la fois, appuyez sur \"Non, merci\"."</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Deux cartes SIM peuvent être actives en même temps sur cet appareil. Pour continuer à utiliser une seule carte SIM à la fois, appuyez sur \"Non, merci\"."</string>
     <string name="sim_action_restart_title" msgid="7054617569121993825">"Redémarrer l\'appareil ?"</string>
     <string name="sim_action_restart_text" msgid="8019300474703571013">"Pour commencer, redémarrez votre appareil. Vous pouvez ensuite ajouter une autre carte SIM."</string>
     <string name="sim_action_continue" msgid="1688813133152389943">"Continuer"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Retirez la carte SIM et insérez-la de nouveau. Si le problème persiste, redémarrez l\'appareil."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Essayez à nouveau d\'activer la carte SIM. Si le problème persiste, redémarrez l\'appareil."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activation du réseau"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Changement d\'opérateur…"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> est actif"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Appuyez pour mettre à jour les paramètres de la carte SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Nouveau réseau : <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -4953,7 +5008,7 @@
     <string name="switch_sim_dialog_no_switch_text" msgid="7053939850026876088">"Pour utiliser ultérieurement les données mobiles, les fonctionnalités d\'appel et les SMS, accédez à vos paramètres réseau"</string>
     <string name="sim_card_label" msgid="5632157635124050923">"Carte SIM"</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"Effacer cette carte SIM téléchargée ?"</string>
-    <string name="erase_sim_dialog_text" msgid="753031064269699885">"L\'effacement de cette carte SIM va supprimer le service <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> de cet appareil.\n\nLe service pour <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ne sera pas annulé."</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Si vous effacez cette carte SIM, le service <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ne sera plus disponible sur cet appareil.\n\nVotre forfait <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ne sera pas résilié."</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Effacer"</string>
     <string name="erasing_sim" msgid="7877703231075699139">"Effacement de la carte SIM…"</string>
     <string name="erase_sim_fail_title" msgid="2024446702985862427">"Impossible d\'effacer la carte SIM"</string>
@@ -5083,7 +5138,7 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Autoriser superpositions d\'écran dans paramètres"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Autoriser les applications pouvant se superposer à d\'autres à se superposer aux écrans de paramètres"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multimédia"</string>
-    <string name="media_controls_summary" msgid="3573121049460596520">"Lecteur multimédia dans la fenêtre de configuration rapide"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Lecteur multimédia dans les Réglages rapides"</string>
     <string name="media_controls_resume_description" msgid="7702723104730495227">"Afficher le lecteur multimédia pendant une période prolongée pour reprendre la lecture facilement"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Masquer le lecteur"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Afficher le lecteur"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Désactivé"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Cartes SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Afficher les réseaux du mode Avion"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Rechercher les réseaux acceptés dans les avions et s\'y connecter."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Recherchez des réseaux Wi-Fi et connectez-vous-y"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, accepté dans les avions"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Appels et SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Appels Wi‑Fi"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"non disponible"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Momentanément indisponible"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Aucune carte SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Préférences"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Préférences réseau"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Se connecter aux réseaux publics"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connexion réseau, internet, sans fil, données, wifi, wi-fi, wi fi, cellulaire, mobile, opérateur mobile, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Afficher les réseaux du mode Avion"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Afficher les réseaux du mode Avion"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Activer les réseaux"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Désactiver les réseaux"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Réinitialiser votre connexion Internet ?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Cette action mettra fin à votre appel téléphonique"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Cette action mettra fin à votre appel téléphonique"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Réinitialisation de votre connexion Internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Corriger la connectivité"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Réseaux disponibles en mode Avion"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Pour changer de réseau, déconnectez l\'Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Impossible de changer de réseau en étant connecté"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Réseaux du mode Avion"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connecté"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Connexion Internet automatique impossible"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Couleur"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Autres"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Général"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Voir toutes les applis"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Transfert intelligent"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Transfert intelligent activé"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Saisir le numéro de téléphone"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Numéro de téléphone manquant."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Autoriser la 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Utilisez des connexions au réseau mobile 2G. Pour les appels d\'urgence, le 2G est toujours activé."</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index c2ceeab..093149e 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Reduce ou amplía o tamaño do texto na pantalla."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Reducir"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Ampliar"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Usar Xirar automaticamente"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Texto de mostra"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"O marabilloso mago de Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="one">Configurouse <xliff:g id="COUNT_0">%1$d</xliff:g> impresión dixital</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Desbloquear coa impresión dixital"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Configurar impresión dixital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Usa a túa impresión dixital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Toca o sensor de impresión dixital para desbloquear o teléfono, autorizar compras ou iniciar sesión nas aplicacións. Ten coidado coas impresións dixitais que engadas, pois mesmo cunha soa impresión dixital se pode facer todo o indicado previamente."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"A impresión dixital pode ser menos segura que un padrón ou un PIN fiable."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Ti tes o control"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Importante"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Os datos gravados por Impresión dixital almacénanse de forma segura e nunca saen do teu teléfono. Podes eliminalos cando queiras en Configuración."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"A impresión dixital pode ser menos segura que un padrón ou un PIN fiable."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"O teu teléfono utilizará ocasionalmente as imaxes recentes da túa impresión dixital para crear modelos de impresión dixital mellorados."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utiliza a impresión dixital para desbloquear o teléfono ou autorizar as compras.\n\nNota: Non podes utilizar a impresión dixital para desbloquear este dispositivo. Para obter máis información, ponte en contacto co administrador da túa organización."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utiliza a impresión dixital para desbloquear o teléfono ou autorizar as compras.\n\nNota: É posible que a impresión dixital sexa menos segura que un padrón ou un PIN fiables."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Non, grazas"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Omitir"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Aceptar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Omitir"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Seguinte"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Omitir a impresión dixital?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Omitir"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Toca o sensor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Mantén premida a icona da impresión dixital"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Está na parte posterior do teléfono. Utiliza o dedo índice."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Aparece na pantalla. Busca a impresión dixital cun círculo brillante."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"O sensor de impresión dixital está na pantalla. Move o dedo por ela para atopalo."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustración coa localización do sensor de impresión dixital e do dispositivo"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Aceptar"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Eliminar"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Toca o sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Coloca o dedo no sensor e levántao cando notes unha vibración"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Levanta o dedo e volve tocar"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Continúa levantando o dedo para engadir as diferentes partes da túa impresión dixital"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Engadiuse a impresión dixital"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Cando vexas esta icona, utiliza a impresión dixital para efectuar a identificación ou autorizar as compras"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Facelo máis tarde"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Buscar"</string>
     <string name="display_settings" msgid="7197750639709493852">"Pantalla"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Xirar pantalla automaticamente"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Non"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Si"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Activada: baseada na cara"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Activar detección facial"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Cores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturais"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Realzadas"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activado/A pantalla non se apagará se miras para ela"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Opción desactivada"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Necesítase acceso á cámara"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Toca para xestionar os permisos dos servizos de personalización do dispositivo"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Evita que se apague a pantalla se miras para ela"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"A función Atención á pantalla utiliza a cámara dianteira para ver se alguén está mirando a pantalla. Funciona no dispositivo e as imaxes nunca se almacenan nin envían a Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Activar a atención á pantalla"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Cando a pantalla está escura, actívase para notificacións novas"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Mostrar sempre a hora e datos"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Maior uso da batería"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Usar letra grosa"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Letra grosa"</string>
     <string name="title_font_size" msgid="570613010306330622">"Tamaño do tipo de letra"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Reduce ou amplía o texto"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Configuración de bloqueo da SIM"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Outros usuarios"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Almacenamento do dispositivo"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Almacenamento portátil"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmas e recordatorios"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Permitir definir alarmas ou recordatorios"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmas e recordatorios"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Permite que esta aplicación planifique alarmas ou outros eventos que dependan do tempo para que poida activarse e funcionar aínda que non esteas usando o dispositivo. Se revogas este permiso, é posible que a aplicación deixe de funcionar correctamente. Ademais, as alarmas que planificase non soarán."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"planificar, alarma, recordatorio, evento"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> usados de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Usados de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Servizos de localización"</string>
     <string name="location_title" msgid="5819154746934945021">"A miña localización"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Localización perfil traballo"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Acceso das apps á localización"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"A localización está desactivada"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplicacións teñen acceso á localización</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> aplicacións ten acceso á localización</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Acceso á localización recente"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Ver detalles"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Ningunha aplicación solicitou a túa localización recentemente"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ningunha aplicación accedeu recentemente á localización"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Uso da batería elevado"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Uso da batería baixo"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Busca de wifi e Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Busca de redes wifi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permite que as aplicacións e os servizos busquen redes wifi en calquera momento, mesmo se a wifi está desactivada. Esta opción pode utilizarse, por exemplo, para mellorar as funcións e os servizos baseados na localización."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Busca de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite ás aplicacións e aos servizos buscar dispositivos próximos en calquera momento, mesmo cando o Bluetooth está desactivado. Esta opción pode utilizarse, por exemplo, para mellorar as funcións e os servizos baseados na localización."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Servizos de localización"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servizos de localización para o traballo"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detección do fuso horario da localización"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detección do fuso horario da localización"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permite usar a localización do dispositivo para detectar o fuso horario actual. A exactitude da detección pode verse afectada por outras opcións de configuración da localización, como Busca de redes wifi."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Activada"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desactivada"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"A detección automática do fuso horario está desactivada"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"A detección automática do fuso horario está desactivada"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"A detección do fuso horario da localización está desactivada"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Non se admite a detección do fuso horario da localización"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Non está permitido modificar a detección do fuso horario da localización"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Activar"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Borrar almacenamento"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Desinstalar actualizacións"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Decidiches iniciar esta aplicación de forma predeterminada para algunhas accións."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Algunhas actividades que seleccionaches ábrense nesta aplicación de forma predeterminada."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Decidiches permitir a esta aplicación crear widgets e acceder aos seus datos."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Non se definiu ningún valor predeterminado."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Borrar valores predeterminados"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Borrar preferencias predeterminadas"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"É posible que esta aplicación non estea deseñada para a túa pantalla. Aquí podes controlar como queres que se axuste á túa pantalla."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Preguntar ao iniciar"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Escalar aplicación"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Podes personalizar este dispositivo segundo as túas necesidades. Podes cambiar estas funcións de accesibilidade máis tarde en Configuración."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Cambiar tamaño do tipo de letra"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lectores de pantalla"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio e texto na pantalla"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtítulos"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Xeral"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Pantalla"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texto e pantalla"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Escurecer pantalla"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermello-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermello-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reducir brillo"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Reducir brillo"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Reducir o brillo da pantalla por debaixo da intensidade mínima do teléfono"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Reducir o brillo da pantalla por debaixo da intensidade mínima da tableta"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Escurece a pantalla para que che resulte máis cómoda a lectura.&lt;br/&gt;&lt;br/&gt; Esta opción de configuración pode serche útil nestas situacións: &lt;ol&gt; &lt;li&gt; O brillo mínimo predeterminado do teléfono é demasiado intenso&lt;/li&gt; &lt;li&gt; Utilizas o teléfono en espazos con pouca luz (por exemplo, pola noite ou nunha estancia ás escuras antes de deitarte)&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"cara"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"impresión dixital, engadir impresión dixital"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"atenuar pantalla, pantalla táctil, batería, brillo intelixente, brillo dinámico, brillo intelixente"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"atenuar pantalla, modo de suspensión, batería, tempo de espera, atención, visualización, pantalla, inactividade"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"xirar, voltear, xiro, retrato, orientación, horizontal, vertical"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"actualizar, actualización, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"non molestar, programar, programación, notificacións, bloquear, bloqueo, silenciar, silencio, vibrar, suspender, suspensión, traballar, traballo, centrarse, son, día, día da semana, fin de semana, noite da semana, evento"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"pantalla, tempo de bloqueo, tempo de espera, pantalla de bloqueo"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Tons de chamada"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Outros sons e vibracións"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificacións"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversas"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Notificacións enviadas recentemente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ver todas as dos últimos 7 días"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Configuración avanzada"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Xeral"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificacións do traballo"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificacións intelixentes"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioridade das notificacións intelixentes"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Mostrar no panel despregable, na barra de estado e na pantalla de bloqueo"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ocultar notificacións silenciosas na barra de estado"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Luz intermitente"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notif. na pantalla de bloqueo"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacidade"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Omitir a pantalla de bloqueo"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Tras o desbloqueo facial, vai á última pantalla usada"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Pantalla de bloqueo, bloquear pantalla, omitir, saltar"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> notificación á semana aproximadamente</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nunca"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Acceso a notificacións"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Notificacións de aplicacións e dispositivos"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Controla as notificacións que se mostran nas túas aplicacións e dispositivos"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"O acceso ás notificacións do perfil de traballo está bloqueado"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"As aplicacións non poden ler as notificacións"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3675,18 +3700,18 @@
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Se desactivas o acceso de <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ás notificacións, é posible que tamén se desactive o acceso en modo Non molestar."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Desactivar"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Cancelar"</string>
-    <string name="notification_listener_type_title" msgid="2791552789364336733">"Tipos de notificacións permitidos"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Notificacións en curso importantes"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Notificacións de conversa"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Notificación de alerta"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Notificacións silenciadas"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notification_listener_type_title" msgid="2791552789364336733">"Tipos de notificacións permitidas"</string>
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Tempo real"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Comunicación en tempo real das aplicacións que usas, navegación, chamadas telefónicas e moito máis"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Conversas"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS e outras comunicacións"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Opción predeterminada"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Notificacións que poden facer soar ou vibrar o dispositivo en función da configuración"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Silencio"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Notificacións que nunca fan soar nin vibrar o dispositivo"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Ver todas as aplicacións"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Cambia a configuración de notificacións para cada aplicación que poida mostralas"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Aplicacións que se mostran no dispositivo"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Servizos do asistente de RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ningunha aplicación instalada solicitou executarse como servizos do asistente de RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Queres permitir o acceso do servizo de RV para <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Abrir de forma predeterminada"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Apertura de ligazóns"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Abre ligazóns compatibles"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"As ligazóns compatibles ábrense nesta aplicación"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Ligazóns que queres abrir nesta aplicación"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Abrir sen preguntar"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Ligazóns compatibles"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Abrir predeterminados"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Outras preferencias predeterminadas"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Engadir ligazón"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"As aplicacións poden verificar ligazóns para que se abran nelas automaticamente. "<annotation id="url">"Máis información"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ligazóns verificadas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ligazón verificada</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Estas ligazóns están verificadas e ábrense automaticamente nesta aplicación.</item>
+      <item quantity="one">Esta ligazón está verificada e ábrese automaticamente nesta aplicación.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Aceptar"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Comprobando se hai outras ligazóns compatibles…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Cancelar"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ligazóns compatibles</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ligazón compatible</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Engadir"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Ábrese en <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> en uso en <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"almacenamento interno"</string>
     <string name="storage_type_external" msgid="125078274000280821">"almacenamento externo"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"O uso da cámara non está permitido"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"As capturas de pantalla non están permitidas"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Non se pode abrir esta aplicación"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Se tes algunha pregunta, contacta co teu administrador de TI"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Máis detalles"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"O teu administrador pode supervisar e xestionar as aplicacións e os datos asociados ao teu perfil de traballo, mesmo os permisos, a configuración, o acceso corporativo, a actividade da rede e a información de localización do dispositivo."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"O teu administrador pode supervisar e xestionar as aplicacións e os datos asociados a este usuario, mesmo os permisos, a configuración, o acceso corporativo, a actividade da rede e a información de localización do dispositivo."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 restrición</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"A maneira na que o operador contabiliza os datos usados pode ser diferente á do dispositivo"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Exclúe os datos usados nas redes dos operadores"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Exclúe os datos usados nas redes dos operadores"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Datos usados: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Definir aviso de consumo de datos"</string>
     <string name="data_warning" msgid="2925054658166062884">"Aviso de consumo de datos"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(desinstalado polo usuario <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(desactivado polo usuario <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Servizo de autocompletar"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automático, completar, autocompletar"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Contrasinais"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automaticamente, completar, autocompletar, contrasinal"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Asegúrate de que confías nesta aplicación&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Autocompletar de Google&gt;%1$s&lt;/xliff:g&gt; utiliza o contido da pantalla para determinar o que se pode completar."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Autocompletar"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Nivel de rexistro"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Cambia o modo de funcionamento da rede"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipo de rede preferido"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operador"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versión da configuración"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versión da configuración do operador"</string>
     <string name="call_category" msgid="641461844504128789">"Chamando"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videochamadas do operador"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Selección do sistema"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Quita a SIM e introdúcea de novo. Se o problema persiste, reinicia o dispositivo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Tenta activar a SIM de novo. Se o problema persiste, reinicia o dispositivo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activación da rede"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Cambio de operador"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Operador activo: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toca para modificar a configuración da SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Cambiouse a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desactivar"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Tarxetas SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Mostrar redes cando se usa o modo avión"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Cando se usa o modo avión, busca redes e conecta o dispositivo a elas."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Busca redes wifi e conecta o dispositivo a elas"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avión, segura para os avións"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Chamadas por wifi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"non dispoñibles"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Non está dispoñible temporalmente"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Sen SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencias"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferencias de rede"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectarse a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexión de rede, Internet, sen fíos, datos, wifi, móbil, operador, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ver redes no modo avión"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Mostrando redes do avión"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Activar redes"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Desactivar redes"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Queres restablecer a conexión a Internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Ao realizar esta acción finalizará a chamada telefónica"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Ao realizar esta acción finalizará a chamada telefónica"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Restablecendo conexión a Internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Solucionar conectividade"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Hai redes dispoñibles no modo avión"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para cambiar de rede, desconecta a Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Non se pode cambiar de rede se hai unha conexión establecida"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes do modo avión"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectada"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet non se conectará automaticamente"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Cor"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Outras opcións de configuración"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Xeral"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Ver todas as aplicacións"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Reenvío intelixente"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"O reenvío intelixente está activado"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Escribir o número de teléfono"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Falta o número de teléfono."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Aceptar"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Permitir uso de 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Usa conexións móbiles 2G. O 2G está sempre activo para facer chamadas de emerxencia."</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 10b5b50..be8cc58 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"વધુ નાનું બનાવો"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"વધુ મોટું બનાવો"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ઑટો રોટેટનો ઉપયોગ કરો"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"ચહેરા આધારિત ઑટો-રોટેટ સુવિધા કોઈ સ્ક્રીન તરફ જોઈ રહ્યું છે કે નહીં અને જોઈ રહ્યું હોય તો કેવી રીતે તે જોવા માટે સામેના કૅમેરાનો ઉપયોગ કરે છે. આની મદદથી તમે પથારીમાં આડા પડીને પણ વાંચી શકો છો અને છબીઓ ક્યારેય સ્ટોર થતી નથી કે Google પર મોકલવામાં આવતી નથી.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;વધુ જાણો&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"ટેક્સ્ટની સાઇઝનો નમૂનો"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"અદ્ભુત Wizard of Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"પ્રકરણ 11: ધ વન્ડરફૂલ એમરલ્ડ સીટી ઓફ ઓઝ"</string>
@@ -403,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ફિંગરપ્રિન્ટ સેટ અપ</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"ફિંગરપ્રિન્ટથી અનલૉક"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"તમારી ફિંગરપ્રિન્ટ સેટઅપ કરો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"તમારી ફિંગરપ્રિન્ટ વાપરો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા ઍપમાં સાઇન ઇન કરવા માટે બસ ફિંગરપ્રિન્ટ સેન્સરને ટચ કરો. તમે કોની ફિંગરપ્રિન્ટ ઉમેરો છો તે બાબતે સાવચેત રહો. ઉમેરવામાં આવેલી એક ફિંગરપ્રિન્ટથી પણ, આમાંનું કોઈપણ કાર્ય કરી શકાય છે."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"સશક્ત પૅટર્ન અથવા પિન કરતાં તમારી ફિંગરપ્રિન્ટ ઓછી સુરક્ષિત હોઈ શકે છે."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"તમારા નિયંત્રણમાં છે"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"ધ્યાનમાં રાખો"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"ફિંગરપ્રિન્ટ વડે રેકોર્ડ થયેલો ડેટા સુરક્ષિત રીતે સ્ટોર કરવામાં આવે છે અને તે ક્યારેય પણ તમારા ફોનમાંથી બહાર જતો નથી. તમે સેટિંગમાં જઈને તમારા ડેટાને કોઈપણ સમયે ડિલીટ કરી શકો છો."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"સશક્ત પૅટર્ન અથવા પિન કરતાં તમારી ફિંગરપ્રિન્ટ ઓછી સુરક્ષિત હોઈ શકે છે."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"ફિંગરપ્રિન્ટનાં વધુ સારા મૉડલ બનાવવા માટે, તમારો ફોન સમય-સમય પર તમારી તાજેતરની ફિંગરપ્રિન્ટની છબીઓનો ઉપયોગ કરશે."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"તમારા ફોનને અનલૉક કરવા અથવા ખરીદી મંજૂર કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો.\n\nનોંધ: આ ઉપકરણને અનલૉક કરવા માટે તમે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ નહીં કરી શકો. વધુ માહિતી માટે, તમારી સંસ્થાના વ્યવસ્થાપકનો સંપર્ક કરો."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"તમારા ફોનને અનલૉક કરવા અથવા ખરીદી મંજૂર કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો.\n\nનોંધ: સશક્ત પૅટર્ન અથવા પિન કરતાં તમારી ફિંગરપ્રિન્ટ ઓછી સુરક્ષિત હોઈ શકે છે."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"રદ કરો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ના, આભાર"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"છોડો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ચાલુ રાખો"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"સંમત છું"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"છોડો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"આગલી"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"ફિંગરપ્રિન્ટ છોડી દઈએ?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"છોડો"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"રદ કરો"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"સેન્સરને સ્પર્શ કરો"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"ફિંગરપ્રિન્ટ આઇકનને ટચ કરીને થોડીવાર દબાવી રાખો"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"તે તમારા ફોનના પાછળના ભાગ પર છે. તમારી પ્રથમ આંગળીનો ઉપયોગ કરો."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"તે સ્ક્રીન પર છે. ચમકતા વર્તુળવાળી ફિંગરપ્રિન્ટ જુઓ."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"ફિંગરપ્રિન્ટ સેન્સર તમારી સ્ક્રીન પર છે. તેને શોધવા માટે તમારી આંગળી સ્ક્રીન પર ફેરવો."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"ડિવાઇસ અને ફિંગરપ્રિન્ટ સેન્સર સ્થાન સાથેનું ચિત્ર"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"નામ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ઓકે"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"ડિલીટ કરો"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"સેન્સરને સ્પર્શ કરો"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"સેન્સર પર તમારી આંગળી મૂકો અને વાઇબ્રેશનનો અનુભવ થવા પર ઉઠાવી લો"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"ઉપાડો, પછી ફરી સ્પર્શ કરો"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"તમારી ફિંગરપ્રિન્ટના વિવિધ ભાગ ઉમેરવા માટે તમારી આંગળી ઉપાડતા રહો"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ફિંગરપ્રિન્ટ ઉમેરી"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"જ્યારે તમે આ આઇકન જુઓ, ત્યારે ઓળખ માટે અથવા ખરીદી મંજૂર કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"આને થોડા સમય પછી કરો"</string>
@@ -561,7 +577,7 @@
     <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"બાયોમેટ્રિક્સ + પાસવર્ડ"</string>
     <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"બાયોમેટ્રિક્સ વિના ચાલુ રાખો"</string>
     <string name="biometrics_unlock_title" msgid="7769374223959937435">"તમે તમારા ફોનને તમારા બાયોમેટ્રિક્સનો ઉપયોગ કરીને અનલૉક કરી શકો છો. સુરક્ષા ખાતર, આ વિકલ્પ માટે બૅકઅપ સ્ક્રીન લૉક આવશ્યક છે."</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"વ્યવસ્થાપક, એન્ક્રિપ્શન નીતિ અથવા ઓળખપત્ર સ્ટોરેજ દ્વારા અક્ષમ કરાયેલ"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"વ્યવસ્થાપક, એન્ક્રિપ્શન પૉલિસી કે ક્રિડેન્શ્યલ સ્ટોરેજ દ્વારા બંધ કરાયેલો"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"કોઈ નહીં"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"સ્વાઇપ કરો"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="1926480143883094896">"પૅટર્ન"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ચાલુ / જો તમે સ્ક્રીન તરફ જોતા હો, તો તમારી સ્ક્રીન બંધ થશે નહીં"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"બંધ છે"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"કૅમેરાનો ઍક્સેસ જરૂરી છે"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"ડિવાઇસ મરજી મુજબનું બનાવવાની સેવાઓની પરવાનગીઓ મેનેજ કરવા માટે ટૅપ કરો"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"જો તમે સ્ક્રીન તરફ જોતા હો, તો આ સુવિધા તમારી સ્ક્રીનને બંધ થતા અટકાવશે"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"કોઈ સ્ક્રીન તરફ જોઈ રહ્યું છે કે નહીં તેની ખાતરી કરવા માટે સ્ક્રીન અટેન્શનની સુવિધા ફોનનો આગળનો કૅમેરા વાપરે છે. આ સુવિધા ડિવાઇસ પર કામ કરે છે, તેમજ છબીઓને ક્યારેય સ્ટોર કરવામાં અથવા Googleને મોકલવામાં આવતી નથી."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"સ્ક્રીન અટેન્શન ચાલુ કરો"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"જ્યારે સ્ક્રીન ઘેરા રંગની હોય છે, ત્યારે તે નવા નોટિફિકેશન માટે ચાલુ થઈ જાય છે"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"સમય અને માહિતી હંમેશાં બતાવો"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"વધારેલો બૅટરી વપરાશ"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"બોલ્ડ ટેક્સ્ટ"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"બોલ્ડ ટેક્સ્ટ"</string>
     <string name="title_font_size" msgid="570613010306330622">"ફોન્ટનું કદ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ટેક્સ્ટને નાની અથવા મોટી કરો"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"સિમ કાર્ડ લૉક સેટિંગ્સ"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"અન્ય વપરાશકર્તાઓ"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ઉપકરણ સંગ્રહ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"પોર્ટેબલ સંગ્રહ"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"અલાર્મ અને રિમાઇન્ડર"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"અલાર્મ અને રિમાઇન્ડર સેટ કરવાની મંજૂરી આપો"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"અલાર્મ અને રિમાઇન્ડર"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"આ ઍપને અલાર્મ અથવા અન્ય સમય આધારિત ઇવેન્ટને શેડ્યૂલ કરવાની મંજૂરી આપો. જ્યારે તમે ડિવાઇસનો ઉપયોગ કરતા ન હો, ત્યારે પણ આ સુવિધા ઍપને સક્રિય થવાની અને કામ કરવાની મંજૂરી આપશે. નોંધો કે આ પરવાનગીને રદ કરવાથી ઍપમાં ખામી સર્જાઈ શકે છે, ખાસ કરીને કોઈપણ અલાર્મ કે જે ઍપ દ્વારા શેડ્યૂલ કરવામાં આવ્યું હોય, તે હવે કામ કરશે નહીં."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"શેડ્યૂલ, અલાર્મ, રિમાઇન્ડર, ઇવેન્ટ"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> માંથી <xliff:g id="USED">%1$s</xliff:g> ઉપયોગમાં લેવાયેલ"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> માંથી ઉપયોગમાં લેવાયેલ"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"સ્થાન સેવાઓ"</string>
     <string name="location_title" msgid="5819154746934945021">"મારું સ્થાન"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ઑફિસની પ્રોફાઇલ માટે સ્થાન"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"સ્થાન માટે ઍપનો ઍક્સેસ"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"સ્થાન બંધ છે"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g>માંથી <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ઍપ સ્થાનનો ઍક્સેસ ધરાવે છે</item>
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g>માંથી <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ઍપ સ્થાનનો ઍક્સેસ ધરાવે છે</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"તાજેતરનો સ્થાન ઍક્સેસ"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"વિગતો જુઓ"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"હાલમાં કોઈ એપ્લિકેશને સ્થાન વિનંતી કરી નથી"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"હાલમાં કોઈ ઍપ દ્વારા સ્થાન ઍક્સેસ કરવામાં આવ્યું નથી"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"વધુ બૅટરી ઉપયોગ"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ઓછો બૅટરી ઉપયોગ"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"વાઇ-ફાઇ અને બ્લૂટૂથના સ્કૅનિંગનું સેટિંગ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"વાઇ-ફાઇ સ્કૅનિંગ"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"જ્યારે વાઇ-ફાઇ બંધ હોય ત્યારે પણ ગમે ત્યારે ઍપ અને સેવાઓને વાઇ-ફાઇ નેટવર્ક સ્કૅન કરવાની મંજૂરી આપો. ઉદાહરણ તરીકે, આનો ઉપયોગ સ્થાન આધારિત સુવિધાઓ અને સેવાઓને બહેતર બનાવવા માટે કરી શકાય છે."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"બ્લૂટૂથ સ્કેનિંગ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"જ્યારે બ્લૂટૂથ બંધ હોય ત્યારે પણ ગમે ત્યારે ઍપ અને સેવાઓને નજીકના ઉપકરણો સ્કૅન કરવાની મંજૂરી આપો. ઉદાહરણ તરીકે, આનો ઉપયોગ સ્થાન આધારિત સુવિધાઓ અને સેવાઓને બહેતર બનાવવા માટે કરી શકાય છે."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"સ્થાન સેવાઓ"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"કાર્ય માટે સ્થાનની સેવાઓ"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"સ્થાનના સમય ઝોનની ઓળખ"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"સ્થાનના સમય ઝોનની ઓળખ"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"હાલના સમય ઝોનની ઓળખ કરવા માટે, ડિવાઇસના સ્થાનનો ઉપયોગ કરવાની મંજૂરી આપે છે. વાઇ-ફાઇ સ્કૅનિંગ જેવા અન્ય સ્થાન સેટિંગ, સમય ઝોનની ઓળખ કરવાની સચોટતા પર અસર કરી શકે છે."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ચાલુ છે"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"બંધ છે"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ઑટોમૅટિક રીતે સમય ઝોનની ઓળખ કરવાનું બંધ છે"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ઑટોમૅટિક રીતે સમય ઝોનની ઓળખ કરવાનું બંધ છે"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"સ્થાનના સમય ઝોનની ઓળખ બંધ કરવામાં આવેલી છે"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"સ્થાનના સમય ઝોનની ઓળખ કરવાને સપોર્ટ આપવામાં આવતો નથી"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"સ્થાનના સમય ઝોનની ઓળખમાં ફેરફાર કરવાની મંજૂરી નથી"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"સક્ષમ કરો"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"સ્ટોરેજ સાફ કરો"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"અપડેટ્સ અનઇન્સ્ટોલ કરો"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"તમે કેટલીક ક્રિયાઓ માટે ડિફોલ્ટ તરીકે આ એપ્લિકેશનને લોંચ કરવાનું પસંદ કર્યું છે."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"તમે પસંદ કરેલી અમુક પ્રવૃતિઓ ડિફૉલ્ટ તરીકે આ ઍપમાં ખૂલે છે."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"તમે આ એપ્લિકેશનને વિજેટ્સ બનાવવા અને તેના ડેટાની અ‍ૅક્સેસ આપવાનું નક્કી કર્યુ છે"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"કોઇ ડિફોલ્ટ્સ સેટ કરેલ નથી."</string>
-    <string name="clear_activities" msgid="341345438786077236">"ડિફૉલ્ટ્સ સાફ કરો"</string>
+    <string name="clear_activities" msgid="488089228657585700">"ડિફૉલ્ટ પસંદગીઓ સાફ કરો"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"આ એપ્લિકેશનને તમારી સ્ક્રીન માટે ડિઝાઇન કરી શકાશે નહીં. તમે તેને તમારી સ્ક્રીનમાં કેવી રીતે સમાયોજિત કરવી તે અહીં નિયંત્રિત કરી શકો છો."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"લોંચ કરવા પર પૂછો"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"ઍપ્લિકેશન સ્કેલ કરો"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"તમે તમારી જરૂરતોના મુજબ આ ડિવાઇસને કસ્ટમાઇઝ કરી શકો છો. સેટિંગમાં આ ઍક્સેસિબિલિટી સુવિધાઓ પછીથી બદલી શકાય છે."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ફોન્ટનું કદ બદલો"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"સ્ક્રીન રીડર"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ઑડિઓ અને સ્ક્રીન પરની ટેક્સ્ટ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"કૅપ્શન"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ઑડિયો"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"સામાન્ય"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ડિસ્પ્લે"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ટેક્સ્ટ અને ડિસ્પ્લે"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"સ્ક્રીનને વધુ ઘેરી બનાવો"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"લાલ-લીલો"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"લાલ-લીલો"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"વાદળી-પીળો"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"બ્રાઇટનેસ ઘટાડો"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"બ્રાઇટનેસ ઘટાડો"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"સ્ક્રીનને તમારા ફોનની ઓછામાં ઓછી બ્રાઇટનેસ કરતાં વધુ ઘેરી બનાવો"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"સ્ક્રીનને તમારા ટૅબ્લેટની ઓછામાં ઓછી બ્રાઇટનેસ કરતાં વધુ ઘેરી બનાવો"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"તમારી સ્ક્રીનને વધુ ઘેરી બનાવો, જેથી તે વાંચવામાં વધુ આરામદાયક બને.&lt;br/&gt;&lt;br/&gt; આ સહાયરૂપ થઈ શકે છે, જ્યારે: &lt;ol&gt; &lt;li&gt; તમારા ફોનની ડિફૉલ્ટ તરીકે બ્રાઇટનેસ ઓછામાં ઓછી હોવા છતાં ખૂબ જ વધુ બ્રાઇટ દેખાય&lt;/li&gt; &lt;li&gt; તમે તમારા ફોનનો ઉપયોગ અંધારામાં કરી રહ્યાં હો, જેમ કે રાત્રે અથવા સૂતા પહેલાં અંધારીયા રૂમમાં&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3097,7 +3124,7 @@
     <string name="user_guest" msgid="4545590092001460388">"અતિથિ"</string>
     <string name="user_exit_guest_title" msgid="2653103120908427236">"અતિથિ દૂર કરો"</string>
     <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"અતિથિ દૂર કરીએ?"</string>
-    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"આ સત્રમાંની તમામ ઍપ્લિકેશનો અને ડેટા કાઢી નાખવામાં આવશે."</string>
+    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"આ સત્રમાંની તમામ ઍપ અને ડેટા કાઢી નાખવામાં આવશે."</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"દૂર કરો"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"ફોન કૉલ ચાલુ કરો"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ફોન કૉલ અને SMS ચાલુ કરો"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"ચહેરો"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"ફિંગરપ્રિન્ટ, ફિંગરપ્રિન્ટ ઉમેરો"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"ઝાંખી સ્ક્રીન, ટચસ્ક્રીન, બૅટરી, સ્માર્ટ બ્રાઇટનેસ, ડાયનામિક બ્રાઇટનેસ, ઑટો બ્રાઇટનેસ"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"ઝાંખી સ્ક્રીન, સ્ક્રીનની લાઇટ બંધ, બૅટરી, સમયસમાપ્તિ, સ્ક્રીન અટેન્શન, ડિસ્પ્લે, સ્ક્રીન, સ્ક્રીન બંધ"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"ફેરવો, ફ્લિપ કરો, રોટેશન, પોર્ટ્રેટ, લૅન્ડસ્કેપ, ઓરિએન્ટેશન, ઊભું, આડું કરો"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"અપગ્રેડ કરો, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, શેડ્યૂલ, સૂચનાઓ, બ્લૉક, સાઇલન્સ, વાઇબ્રેટ, ઊંઘ, કાર્ય, ધ્યાન, સાઉન્ડ, મ્યૂટ, દિવસ, અઠવાડિયાના દિવસ, વીકએન્ડ, સપ્તાહની રાત્રિ, ઇવેન્ટ"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"સ્ક્રીન, લૉક ટાઇમ, સમયસમાપ્તિ, લૉકસ્ક્રીન"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"રિંગટોન"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"અન્ય ધ્વનિ અને વાઇબ્રેશન"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"નોટિફિકેશનો"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"વાતચીત"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"તાજેતરમાં મોકલેલ"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"છેલ્લા 7 દિવસની બધી ઍપ જુઓ"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"વિગતવાર"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"સામાન્ય"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"કાર્યની સૂચનાઓ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"સુવિધાજનક નોટિફિકેશન"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"સુવિધાજનક નોટિફિકેશનને પ્રાથમિકતા"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"નીચે દેખાતા શેડ, સ્ટેટસ બાર અને લૉક સ્ક્રીનમાં બતાવો"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"સ્ટેટસ બારમાં સાઇલન્ટ નોટિફિકેશનને છુપાવો"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"લાઇટ ઝબકવી"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"લૉક સ્ક્રીન પર નોટિફિકેશન"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"પ્રાઇવસી"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"લૉક સ્ક્રીન છોડો"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ફેસ અનલૉક પછી, સીધા જ છેલ્લે ઉપયોગમાં લીધેલી સ્ક્રીન પર જાઓ"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"લૉક સ્ક્રીન, લૉક સ્ક્રીન, છોડો, બાયપાસ"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> નોટિફિકેશન પ્રતિ સપ્તાહ</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"ક્યારેય નહીં"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"નોટિફિકેશન ઍક્સેસ"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"ડિવાઇસ અને ઍપના નોટિફિકેશન"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"તમારી ઍપ અને ડિવાઇસ પર ક્યા નોટિફિકેશન દેખાશે તેનું નિયંત્રણ કરો"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"કાર્યાલયની પ્રોફાઇલની સૂચનાઓનો ઍક્સેસ બ્લૉક કરવામાં આવ્યો છે"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"ઍપ્લિકેશનો સૂચનાઓ વાંચી શકતી નથી"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"બંધ કરો"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"રદ કરો"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"નોટિફિકેશનના મંજૂર કરેલા પ્રકારો"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"હાલના મહત્ત્વપૂર્ણ નોટિફિકેશન"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"વાતચીત સંબંધિત નોટિફિકેશન"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"અલર્ટ આપતાં નોટિફિકેશન"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"સાઇલન્ટ નોટિફિકેશન"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"રીયલ ટાઇમ"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"ઉપયોગમાં લેવાઈ રહેલી ઍપ, નૅવિગેશન, ફોન કૉલ અને ઘણાં બધાથી રીયલ ટાઇમ સંચાર"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"વાતચીતો"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS અને અન્ય સંચાર"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"ડિફૉલ્ટ"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"સેટિંગના આધારે રિંગ વગાડતા અથવા વાઇબ્રેટ થતા નોટિફિકેશન"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"સાયલન્ટ"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"ક્યારેય સાઉન્ડ કે વાઇબ્રેશન ન કરતા નોટિફિકેશન"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"બધી ઍપ જુઓ"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"નોટિફિકેશન મોકલી શકતી દરેક ઍપ માટે નોટિફિકેશનના સેટિંગ બદલો"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"ડિવાઇસ પર બતાવેલી ઍપ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR સહાયક સેવાઓ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"કોઇ ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશનોએ VR સહાયક સેવાઓ તરીકે શરૂ કરવાની વિનંતી કરી નથી."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> માટે VR સેવા ઍક્સેસની મંજૂરી આપીએ?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"ડિફોલ્ટ તરીકે ખોલો"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"લિંક્સ ખોલી રહ્યાં છે"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"સમર્થિત લિંક્સ ખોલો"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"સપોર્ટ કરવામાં આવતી લિંક આ ઍપમાં ખૂલે છે"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"આ ઍપમાં ખોલવા માટેની લિંક"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"પૂછ્યાં વિના ખોલો"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"સમર્થિત લિંક્સ"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"અન્ય ડિફોલ્ટ્સ"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"અન્ય ડિફૉલ્ટ પસંદગીઓ"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"લિંક ઉમેરો"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"ઍપમાં ઑટોમૅટિક રીતે ખોલવા માટે, કોઈ ઍપ લિંકની ચકાસણી કરી શકે છે. "<annotation id="url">"વધુ જાણો"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one">ચકાસણી કરાયેલી <xliff:g id="COUNT_1">%d</xliff:g> લિંક</item>
+      <item quantity="other">ચકાસણી કરાયેલી <xliff:g id="COUNT_1">%d</xliff:g> લિંક</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">આ લિંકની ચકાસણી થઈ ગઈ છે અને તે આ ઍપમાં ઑટોમૅટિક રીતે ખુલે છે.</item>
+      <item quantity="other">આ લિંકની ચકાસણી થઈ ગઈ છે અને તે આ ઍપમાં ઑટોમૅટિક રીતે ખુલે છે.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ઓકે"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"સપોર્ટ કરવામાં આવતી અન્ય લિંક માટે ચેક કરી રહ્યાં છીએ…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"રદ કરો"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one">સપોર્ટ કરવામાં આવતી <xliff:g id="COUNT_1">%d</xliff:g> લિંક</item>
+      <item quantity="other">સપોર્ટ કરવામાં આવતી <xliff:g id="COUNT_1">%d</xliff:g> લિંક</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"ઉમેરો"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g>માં ખૂલે છે"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> માં <xliff:g id="SIZE">%1$s</xliff:g> ઉપયોગમાં લેવાયું"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"આંતરિક સ્ટોરેજ"</string>
     <string name="storage_type_external" msgid="125078274000280821">"બાહ્ય સ્ટોરેજ"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"કૅમેરાની મંજૂરી નથી"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"સ્ક્રીનશૉટની મંજૂરી નથી"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"આ ઍપ ખોલી શકાતી નથી"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"જો તમને કોઈ પ્રશ્ન હોય, તો તમારા IT વ્યવસ્થાપકનો સંપર્ક કરો"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"વધુ વિગતો"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"તમારા વ્યવસ્થાપક સેટિંગ્સ, પરવાનગીઓ, કૉર્પોરેટ ઍક્સેસ, નેટવર્ક પ્રવૃત્તિ અને ઉપકરણની સ્થાન માહિતી સહિત તમારી કાર્યાલયની પ્રોફાઇલ સાથે સંકળાયેલ ઍપ્લિકેશનો અને ડેટાનું નિયમન અને સંચાલન કરી શકે છે."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"તમારા વ્યવસ્થાપક સેટિંગ, પરવાનગીઓ, કૉર્પોરેટ ઍક્સેસ, નેટવર્ક પ્રવૃત્તિ અને ડિવાઇસની સ્થાન માહિતી સહિત આ વપરાશકર્તા સાથે સંકળાયેલ ઍપ અને ડેટાને મોનિટર અને મેનેજ કરી શકે છે."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> પ્રતિબંધ</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"કૅરિઅર ડેટા ગણતરી, ડિવાઇસ ગણતરીથી અલગ હોઈ શકે છે"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"મોબાઇલ ઑપરેટરના નેટવર્ક દ્વારા વપરાયેલો ડેટા શામેલ નથી"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"મોબાઇલ ઑપરેટરના નેટવર્ક દ્વારા વપરાયેલો ડેટા શામેલ નથી"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ઉપયોગ થયો"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ડેટા ચેતવણી સેટ કરો"</string>
     <string name="data_warning" msgid="2925054658166062884">"ડેટા ચેતવણી"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g> માટે અનઇન્સ્ટૉલ કરેલ)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(વપરાશકર્તા <xliff:g id="USER">%s</xliff:g> માટે અક્ષમ કરેલ)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"સ્વતઃભરણ સેવા"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"સ્વતઃ, ભરો, સ્વતઃભરણ"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"પાસવર્ડ"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"ઑટો, ભરો, આપમેળે ભરવાની સુવિધા, પાસવર્ડ"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;ખાતરી કરો કે તમે આ ઍપનો વિશ્વાસ કરો છો&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ઑટોમૅટિક રીતે ભરવાની સુવિધા&gt;%1$s&lt;/xliff:g&gt; તમારી સ્ક્રીન પર શું છે તેનો ઉપયોગ એ નક્કી કરવા કરે છે કે ઑટોમૅટિક રીતે શું દાખલ થશે."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"ઑટોમૅટિક રીતે ભરવાના સેટિંગ"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"લૉગિંગનું સ્તર"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"નેટવર્ક ઑપરેટિંગ મોડ બદલો"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"પસંદગીનો નેટવર્ક પ્રકાર"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"કૅરિઅર"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"સેટિંગનું વર્ઝન"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"મોબાઇલ ઑપરેટર સંબંધિત સેટિંગનું વર્ઝન"</string>
     <string name="call_category" msgid="641461844504128789">"કૉલિંગ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"કૅરિઅર વીડિયો કૉલિંગ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"સિસ્ટમ પસંદગી"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"સિમ કાર્ડ કાઢી નાખો અને તેને ફરીથી દાખલ કરો. તેમ છતાં સમસ્યા આવે, તો તમારું ડિવાઇસ ફરી શરૂ કરો."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"સિમ કાર્ડ ફરીથી ચાલુ કરવાનો પ્રયાસ કરો. તેમ છતાં સમસ્યા આવે, તો તમારું ડિવાઇસ ફરી શરૂ કરો."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"નેટવર્કનું સક્રિયકરણ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"મોબાઇલ ઑપરેટર સ્વિચ કરી રહ્યાં છે"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> સક્રિય છે"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"સિમના સેટિંગ અપડેટ કરવા માટે ટૅપ કરો"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કર્યુ"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"બંધ"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"ઇન્ટરનેટ"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"સિમ"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"એરપ્લેન મોડ માટે નેટવર્ક બતાવો"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"એરપ્લેન મોડમાં નેટવર્ક શોધો અને તેની સાથે કનેક્ટ કરો."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"વાઇ-ફાઇ નેટવર્ક શોધીને તેની સાથે કનેક્ટ કરો"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"એરપ્લેન, એરપ્લેન મોડમાં ઉપયોગ માટે સુરક્ષિત"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"કૉલ અને SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"વાઇ-ફાઇ કૉલિંગ"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ઉપલબ્ધ નથી"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"હંગામી રૂપે અનુપલબ્ધ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"કોઈ સિમ કાર્ડ નથી"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"પસંદગીઓ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"નેટવર્કની પસંદગીઓ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"સાર્વજનિક નેટવર્ક સાથે કનેક્ટ કરો"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"નેટવર્ક કનેક્શન, ઇન્ટરનેટ, વાયરલેસ, ડેટા, વાઇ-ફાઇ, સેલ્યુલર, મોબાઇલ, સેલ, મોબાઇલ ઑપરેટર, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"એરપ્લેન મોડ માટે સુરક્ષિત નેટવર્ક જુઓ"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"એરપ્લેન મોડમાં ઉપલબ્ધ નેટવર્ક જોઈ રહ્યાં છીએ"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"નેટવર્ક ચાલુ કરો"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"નેટવર્ક બંધ કરો"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"તમારું ઇન્ટરનેટ રીસેટ કરીએ?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"આનાથી તમારો ફોન કૉલ સમાપ્ત થશે"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"આનાથી તમારો ફોન કૉલ સમાપ્ત થશે"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"તમારું ઇન્ટરનેટ રીસેટ કરી રહ્યાં છીએ…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"કનેક્ટિવિટી સુધારો"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"એરપ્લેન મોડમાં નેટવર્ક ઉપલબ્ધ છે"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"બીજા નેટવર્ક પર જવા માટે, ઇથરનેટ ડિસ્કનેક્ટ કરો"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"કનેક્ટેડ હો ત્યારે નેટવર્ક સ્વિચ કરી શકાતા નથી"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"એરપ્લેન મોડના નેટવર્ક"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"કનેક્ટ કરેલું"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"ઇન્ટરનેટ ઑટોમૅટિક રીતે કનેક્ટ થશે નહીં"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"રંગ"</string>
     <string name="category_name_others" msgid="2366006298768550310">"અન્ય"</string>
     <string name="category_name_general" msgid="7737273712848115886">"સામાન્ય"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"બધી ઍપ જુઓ"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"સ્માર્ટ ફૉરવર્ડિંગ"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"સ્માર્ટ ફૉરવર્ડિંગની સુવિધા ચાલુ કરી છે"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ફોન નંબર દાખલ કરો"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ફોન નંબર ખૂટે છે."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ઓકે"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2Gની મંજૂરી આપો"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G સેલ્યુલર કનેક્શનનો ઉપયોગ કરો. ઇમર્જન્સી કૉલ માટે, 2G હંમેશાં ચાલુ રહે છે."</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a0ae1ab..8fd90c9 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"स्क्रीन पर मौजूद टेक्स्ट को छोटा या बड़ा करें."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"छोटा करें"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"बड़ा करें"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"स्क्रीन के अपने-आप घूम जाने की सुविधा का इस्तेमाल करें"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"नमूना लेख"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"ओज़ का अद्भुत जादू"</string>
@@ -405,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़िंगरप्रिंट सेट अप</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"फ़िंगरप्रिंट से अनलॉक"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"अपना फ़िंगरप्रिंट सेट अप करें"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"फ़िंगरप्रिंट का उपयोग करें"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"फ़ोन को अनलॉक करने, खरीदारी की मंज़ूरी देने या ऐप्लिकेशन में साइन इन करने के लिए, बस फ़िंगरप्रिंट सेंसर को छुएं. इस बारे में सावधानी बरतें कि आप किसका फ़िंगरप्रिंट जोड़ रहे हैं. जोड़े गए किसी भी फ़िंगरप्रिंट से, इनमें से कोई भी काम किया जा सकता है."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"किसी मुश्किल पैटर्न या पिन के मुकाबले, फ़िंगरप्रिंट कम सुरक्षित हो सकता है."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"इस सुविधा का कंट्रोल आपके पास है"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"ध्यान रखें"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"आपके फ़िंगरप्रिंट का डेटा सुरक्षित तरीके से स्टोर किया जाता है. यह कभी भी आपके फ़ोन से बाहर नहीं जाता. आप सेटिंग में जाकर, कभी भी अपना डेटा मिटा सकते हैं."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"किसी मुश्किल पैटर्न या पिन के मुकाबले, फ़िंगरप्रिंट कम सुरक्षित हो सकता है."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"कभी-कभी आपका फ़ोन, हाल ही में ली गई आपकी फ़िंगरप्रिंट इमेज का इस्तेमाल करके, बेहतर फ़िंगरप्रिंट मॉडल तैयार कर सकता है."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"अपना फ़ोन अनलॉक करने या खरीदारियों को मंज़ूरी देने के लिए अपने फ़िंगरप्रिंट का इस्तेमाल करें.\n\nनोट: आप इस डिवाइस का लॉक खोलने के लिए अपने फ़िंगरप्रिंट का इस्तेमाल नहीं कर सकते हैं. और जानकारी के लिए, अपने संगठन के एडमिन से संपर्क करें."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"अपना फ़ोन अनलॉक करने या खरीदारियों को मंज़ूरी देने के लिए अपने फ़िंगरप्रिंट का इस्तेमाल करें.\n\nनोट: आपका फ़िंगरप्रिंट किसी मज़बूत पैटर्न या पिन से कम सुरक्षित हो सकता है."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"रद्द करें"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"रहने दें"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"अभी नहीं"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"जारी रखें"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"सहमत हूं"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"अभी नहीं"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"आगे बढ़ें"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"फ़िंगरप्रिंट का सेट अप छोड़ें?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"छोड़ें"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"अभी नहीं"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"सेंसर को छुएं"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"फ़िंगरप्रिंट आइकॉन को दबाकर रखें."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"यह आपके फ़ोन के पीछे दिया गया है. अपने अंगूठे के पास की उंगली का उपयोग करें."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"सेंसर स्क्रीन पर है. स्क्रीन पर, चमकते हुए गोले में मौजूद फ़िंगरप्रिंट पर जाएं."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"फ़िंगरप्रिंट सेंसर आपकी स्क्रीन पर मौजूद है. स्क्रीन पर अपनी उंगलियां घुमाकर, इसे ढूंढें."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"डिवाइस और उस पर फ़िंगरप्रिंट सेंसर की जगह बताने वाला चित्रण"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"नाम"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ठीक है"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"मिटाएं"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"सेंसर को छुएं"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"अपनी उंगली सेंसर पर रखें और कंपन (वाइब्रेशन) महसूस होने पर उठा लें"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"हटाएं, फिर दोबारा छुएं"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"अपने फ़िंगरप्रिंट के अलग-अलग भागों को जोड़ने के लिए अपनी उंगली को उठाते रहें"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"फ़िंगरप्रिंट जोड़ा गया"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"जब आपको यह आइकॉन दिखाई दे, तब पहचान के लिए या खरीदारियों को मंज़ूरी देने के लिए अपना फ़िंगरप्रिंट इस्तेमाल करें"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"इसे बाद में करें"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"सर्च"</string>
     <string name="display_settings" msgid="7197750639709493852">"डिसप्ले"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"स्‍क्रीन अपने-आप घूमने की सुविधा"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"बंद है"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"चालू है"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"चालू है - चेहरे के हिसाब से"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"चेहरा पहचानने की सुविधा चालू करें"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"रंग"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"बिना किसी बदलाव के"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"बढ़ाया गया"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"चालू / अगर आप स्क्रीन को देख रहे हैं, तो वह बंद नहीं होगी"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"बंद"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"कैमरा ऐक्सेस करने की ज़रूरत है"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"डिवाइस को मनमुताबिक बनाने की सेवाओं की अनुमतियां प्रबंधित करने के लिए, टैप करें"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"जब तक आप स्क्रीन की तरफ़ देखते रहेंगे, स्क्रीन बंद नहीं होगी"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"स्क्रीन चालू रखने की सुविधा, सामने वाले कैमरे का इस्तेमाल करके यह पता लगाती है कि कोई स्क्रीन देख रहा है या नहीं. यह डिवाइस पर काम करती है. इसमें न तो इमेज सेव होती है और न ही Google को भेजी जाती है."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"स्क्रीन चालू रखने की सुविधा चालू करें"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"जब स्क्रीन गहरे रंग की हो, तब यह नई सूचनाओं के लिए चालू हो जाती है"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"समय और जानकारी हमेशा दिखाएं"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"बढ़ा हुआ बैटरी खर्च"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"टेक्स्ट को बोल्ड करें"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"टेक्स्ट को बोल्ड करें"</string>
     <string name="title_font_size" msgid="570613010306330622">"फ़ॉन्ट साइज़"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"टेक्स्ट को बड़ा या छोटा करें"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"सिम कार्ड लॉक सेटिंग"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"अन्य उपयोगकर्ता"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"डिवाइस मेमोरी"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"पोर्टेबल संग्रहण"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"अलार्म और रिमाइंडर"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"अलार्म या रिमाइंडर सेट करने की अनुमति दें"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"अलार्म और रिमाइंडर"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"इस ऐप्लिकेशन को अलार्म या इवेंट के रिमाइंडर सेट करने की अनुमति दें. इससे, यह ऐप्लिकेशन तब भी काम करना शुरू कर देगा, जब आप डिवाइस का इस्तेमाल नहीं कर रहे होंगे. ध्यान रखें कि यह अनुमति न देने पर, हो सकता है कि ऐप्लिकेशन ठीक तरह से काम न करे. खास तौर पर, ऐप्लिकेशन में शेड्यूल किए गए अलार्म नहीं बजेंगे."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"शेड्यूल, अलार्म, रिमाइंडर, इवेंट"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> में से <xliff:g id="USED">%1$s</xliff:g> उपयोग किया गया"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> में से इस्तेमाल की गई"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"जगह की जानकारी की सुविधा"</string>
     <string name="location_title" msgid="5819154746934945021">"मेरी जगह"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"वर्क प्रोफ़ाइल की जगह"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"ऐप को जगह की जानकारी की अनुमति"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"जगह की जानकारी बंद है"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> में से <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ऐप्लिकेशन के पास जगह की जानकारी का ऐक्सेस है</item>
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> में से <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ऐप्लिकेशन के पास जगह की जानकारी का ऐक्सेस है</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"हाल ही में ऐक्सेस की गई जगह की जानकारी"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"जानकारी देखें"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"किसी भी ऐप्लिकेशन ने हाल में जगह की जानकारी नहीं मांगी है"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"किसी भी ऐप्लिकेशन ने हाल ही में जगह की जानकारी का इस्तेमाल नहीं किया"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ज़्यादा बैटरी उपयोग"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"कम बैटरी उपयोग"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"वाई-फ़ाई और ब्लूटूथ से स्कैन करना"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"वाई-फ़ाई स्‍कैन करना"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"ऐप्लिकेशन और सेवाओं को किसी भी समय वाई-फ़ाई नेटवर्क स्कैन करने की मंज़ूरी दें, भले ही वाई-फ़ाई बंद हो. इसका इस्तेमाल करके, जगह की जानकारी जैसी सुविधाओं और सेवाओं में सुधार किया जा सकता है."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ब्‍लूटूथ स्‍कैन करना"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ऐप्लिकेशन और सेवाओं को किसी भी समय आस-पास के डिवाइस स्कैन करने की मंज़ूरी दें, भले ही ब्लूटूथ बंद हो. इसका इस्तेमाल करके, जगह की जानकारी जैसी सुविधाओं और सेवाओं में सुधार किया जा सकता है."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"जगह की जानकारी"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"दफ़्तर के लिए, जगह की जानकारी से जुड़ी सेवाएं."</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"जगह के समय क्षेत्र की पहचान करने की सुविधा"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"जगह के समय क्षेत्र की पहचान करने की सुविधा"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"मौजूदा समय क्षेत्र की पहचान करने के लिए, डिवाइस की जगह की जानकारी का इस्तेमाल करने देता है. जगह की जानकारी की दूसरी सेटिंग, समय क्षेत्र की सटीक पहचान करने पर असर डाल सकती है. जैसे कि वाई-फ़ाई स्कैन करना."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"चालू है"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"बंद है"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"समय क्षेत्र की अपने-आप पहचान करने की सुविधा बंद है"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"समय क्षेत्र अपने-आप सेट होने की सुविधा बंद है"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"जगह के समय क्षेत्र की पहचान करने की सुविधा बंद है"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"जगह के समय क्षेत्र की पहचान करने की सुविधा काम नहीं कर रही"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"जगह के समय क्षेत्र की पहचान करने की सुविधा में, बदलाव करने की अनुमति नहीं है"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"चालू करें"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"मेमोरी खाली करें"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"अपडेट अनइंस्टॉल करें"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"आपने कुछ क्रियाओं के लिए इस ऐप्लिकेशन को डिफ़ॉल्‍ट रूप से लॉन्‍च करना चुना है."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"आपकी चुनी गई कुछ गतिविधियां, डिफ़ॉल्ट तौर पर इस ऐप्लिकेशन में खुलती हैं."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"आपने इस ऐप्लिकेशन को शॉर्टकट बनाने और उनके डेटा पर पहुंचने की अनुमति देना चुना है."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"कोई डिफ़ॉल्‍ट सेट नहीं है."</string>
-    <string name="clear_activities" msgid="341345438786077236">"डिफ़ॉल्‍ट साफ़ करें"</string>
+    <string name="clear_activities" msgid="488089228657585700">"डिफ़ॉल्ट प्राथमिकताएं हटाएं"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"इस ऐप्लिकेशन  को संभवत: आपकी स्क्रीन के लिए डिज़ाइन नहीं किया गया है. आप यहां अपनी स्‍क्रीन को इसके द्वारा समायोजित किए जाने के तरीके को नियंत्रित कर सकते हैं."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"लॉन्‍च होने पर पूछें"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"ऐप्लिकेशन स्‍केल करें"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"आप इस डिवाइस में अपनी जरूरतों के हिसाब से बदलाव ला सकते हैं. ये सुलभता सुविधाएं बाद में सेटिंग में बदली जा सकती हैं."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"फ़ॉन्ट का आकार बदलें"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"स्क्रीन रीडर"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ऑडियो और ऑन-स्क्रीन लेख"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"कैप्शन"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ऑडियो"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"सामान्य"</string>
     <string name="display_category_title" msgid="6638191682294461408">"डिसप्ले"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"टेक्स्ट और डिसप्ले"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"स्क्रीन की चमक को कम करें"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"लाल-हरा रंग पहचान न पाना"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"लाल-हरा रंग पहचान न पाना"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"नीला-पीला रंग पहचान न पाना"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"स्क्रीन की चमक कम करें"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"स्क्रीन की चमक कम करें"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"स्क्रीन की चमक को, अपने फ़ोन की सबसे कम चमक से भी कम करें"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"स्क्रीन की चमक को, अपने टैबलेट की सबसे कम चमक से भी कम करें"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"स्क्रीन की चमक को और कम करें, ताकि इस पर दिखने वाले कॉन्टेंट को ज़्यादा सहजता से पढ़ा जा सके.&lt;br/&gt;&lt;br/&gt; यह तब ज़्यादा मददगार होती है, जब: &lt;ol&gt; &lt;li&gt; आपके फ़ोन की स्क्रीन की चमक डिफ़ॉल्ट तौर पर सबसे कम होने के बावजूद, बहुत ज़्यादा हो&lt;/li&gt; &lt;li&gt; आप फ़ोन को अंधेरे में इस्तेमाल कर रहे हों, जैसे कि रात के समय या सोने से पहले बिना रोशनी वाले कमरे में&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3102,7 +3123,7 @@
     <string name="user_delete_button" msgid="3833498650182594653">"मिटाएं"</string>
     <string name="user_guest" msgid="4545590092001460388">"मेहमान"</string>
     <string name="user_exit_guest_title" msgid="2653103120908427236">"अतिथि को निकालें"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"अतिथि को निकालें?"</string>
+    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"क्या आप मेहमान को हटाना चाहते हैं?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"इस सत्र के सभी ऐप्लिकेशन और डेटा को हटा दिया जाएगा."</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"निकालें"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"फ़ोन कॉल की सुविधा चालू करें"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"चेहरा"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"फ़िंगरप्रिंट, फ़िंगरप्रिंट जोड़ें"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"हल्की रोशनी वाली स्क्रीन, टचस्क्रीन, बैटरी, स्मार्ट ब्राइटनेस, डाइनैमिक ब्राइटनेस, ऑटो ब्राइटनेस"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"हल्की रोशनी वाली स्क्रीन, सुलाएं (कम बैटरी मोड), बैटरी, स्क्रीन बंद होना, स्क्रीन चालू रखने की सुविधा, डिसप्ले, स्क्रीन, गतिविधि न होना"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"घुमाएं, फ़्लिप करें, घुमाव, पोर्ट्रेट, लैंडस्केप, स्क्रीन की दिशा, वर्टिकल, हॉरिज़ॉन्टल"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"अपग्रेड, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"परेशान न करें, शेड्यूल, सूचनाएं, रोक लगाएं, आवाज़ बंद करें, वाइब्रेट करें, कम बैटरी वाला मोड, काम, ध्यान दें, म्यूट, दिन, सोमवार से शुक्रवार के बीच कोई दिन, हफ़्ते के आखिरी दिन, सोमवार से शुक्रवार के बीच की कोई रात, इवेंट"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"स्क्रीन, स्क्रीन लॉक होने में लगने वाला समय, स्क्रीन इतनी देर में बंद हो जाएगी, लॉकस्क्रीन"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"रिंगटोन"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"और आवाज़ें और कंपन (वाइब्रेशन)"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"सूचनाएं"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"बातचीत से जुड़ी सेटिंग"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"हाल ही में सूचनाएं भेजने वाले ऐप्लिकेशन"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"पिछले 7 दिनों में इस्तेमाल किए गए सभी ऐप्लिकेशन देखें"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"बेहतर"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"सामान्य"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"वर्क प्रोफ़ाइल सूचनाएं"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"ज़रूरत के हिसाब से सूचनाएं"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ज़रूरत के हिसाब से सूचनाओं को प्राथमिकता देना"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"नीचे खींचने वाली सूची, स्टेटस बार और लॉक स्क्रीन पर दिखाएं"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"आवाज़ और/या वाइब्रेशन के बिना मिलने वाली सूचनाएं, स्टेटस बार में न दिखाएं"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ब्लिंक लाइट"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"लॉक स्क्रीन पर दिखने वाली सूचनाएं"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"निजता"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"लॉक स्क्रीन छोड़कर आगे बढ़ें"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"चेहरा पहचानकर अनलॉक के बाद, सीधे पिछली खुली स्क्रीन पर जाएं"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"लॉक स्क्रीन, लॉकस्क्रीन, छोड़ें, बायपास"</string>
@@ -3638,7 +3662,7 @@
     <string name="allow_interruption" msgid="5237201780159482716">"रुकावटों की अनुमति दें"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"ऐप को आवाज़, थरथराहट (वाइब्रेशन) करने दें और/या स्क्रीन पर सूचना नई विंडो में खुलने दें"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"प्राथमिकता"</string>
-    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"इससे बातचीत, सेक्शन में सबसे ऊपर और फ़्लोटिंग बबल के तौर पर दिखती है. साथ ही, लॉक स्क्रीन पर प्रोफ़ाइल फ़ोटो दिखती है"</string>
+    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"इससे चैट, बातचीत सेक्शन में सबसे ऊपर फ़्लोटिंग बबल के तौर पर दिखती है. साथ ही, लॉक स्क्रीन पर प्रोफ़ाइल फ़ोटो दिखती है"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"<xliff:g id="APP_NAME">%1$s</xliff:g>, बातचीत वाली कई सुविधाओं के साथ काम नहीं करता. आप किसी \'बातचीत\' को प्राथमिकता के तौर पर सेट नहीं कर सकते. इसके अलावा, \'बातचीत\', फ़्लोटिंग बबल के रूप में नहीं दिखेंगी."</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"नीचे खींचने वाली सूची में, सूचनाओं को एक लाइन तक छोटा करें"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"किसी तरह की आवाज़ या वाइब्रेशन न हो"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="other">हर हफ़्ते~<xliff:g id="NUMBER_1">%d</xliff:g> सूचनाएं</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"कभी नहीं"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"सूचना का ऐक्सेस"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"डिवाइस और ऐप्लिकेशन पर मिलने वाली सूचनाएं"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"कंट्रोल करें कि आपके डिवाइसों और ऐप्लिकेशन पर किस तरह की सूचनाएं दिखें"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"वर्क प्रोफ़ाइल सूचना की पहुंच रोक दी गई है"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"ऐप सूचनाएं नहीं पढ़ सकते"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"बंद करें"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"रद्द करें"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"अलग-अलग तरह की सूचनाएं जिन्हें अनुमति दी गई हैं"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"मौजूदा अहम सूचनाएं"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"बातचीत से जुड़ी सूचनाएं"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"आवाज़ या वाइब्रेशन वाली सूचनाएं"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"बिना आवाज़ या वाइब्रेशन वाली सूचनाएं"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"रीयल-टाइम"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"इस्तेमाल किए जा रहे ऐप्लिकेशन की मदद से, रीयल-टाइम में बातचीत, फ़ोन कॉल, नेविगेट करना, और बहुत कुछ"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"बातचीत"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"एसएमएस और बातचीत के दूसरे तरीके"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"डिफ़ॉल्ट"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"सेटिंग के हिसाब से, आवाज़ या वाइब्रेशन के साथ मिलने वाली सूचनाएं"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"साइलेंट"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"बिना आवाज़ या वाइब्रेशन के मिलने वाली सूचनाएं"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"सभी ऐप्लिकेशन देखें"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"सूचनाएं भेजने वाले हर ऐप्लिकेशन के लिए सूचना की सेटिंग बदलें"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"डिवाइस पर दिखने वाले ऐप्लिकेशन"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR सहायक सेवाएं"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"इंस्टॉल किए गए किसी भी ऐप ने VR सहायक सेवाओं के तौर पर चलाए जाने के लिए अनुरोध नहीं किया है."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए VR सेवा के इस्तेमाल की अनुमति दें?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"डिफ़ॉल्ट रूप से खोलें"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"खुलने वाले लिंक"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"समर्थित लिंक खोलें"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"काम करने वाले सभी लिंक इस ऐप्लिकेशन में खुलते हैं"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"इस ऐप्लिकेशन में खुलने वाले लिंक"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"बिना पूछे खोलें"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"समर्थित लिंक"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"अन्य डिफ़ॉल्ट"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"अन्य डिफ़ॉल्ट प्राथमिकताएं"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"लिंक जोड़ें"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"कोई ऐप्लिकेशन, लिंक की पुष्टि कर सकता है कि वे सुरक्षित हैं या नहीं. सुरक्षित पाए जाने पर लिंक को अनुमति दी जाती है, ताकि वे उस ऐप्लिकेशन में अपने-आप खुल सकें. "<annotation id="url">"ज़्यादा जानें"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> लिंक, जिसकी पुष्टि हो चुकी है</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> लिंक, जिनकी पुष्टि हो चुकी है</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">इस लिंक की पुष्टि हो चुकी है. यह अपने-आप ही इस ऐप्लिकेशन में खुलता है.</item>
+      <item quantity="other">इन लिंक की पुष्टि हो चुकी है. ये अपने-आप ही इस ऐप्लिकेशन में खुलते हैं.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ठीक है"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"काम करने वाले दूसरे लिंक ढूंढे जा रहे हैं…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"अभी नहीं"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> काम करने वाला लिंक</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> काम करने वाले लिंक</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"जोड़ें"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> में खुलता है"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> में <xliff:g id="SIZE">%1$s</xliff:g> का उपयोग किया गया"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"डिवाइस की मेमोरी"</string>
     <string name="storage_type_external" msgid="125078274000280821">"बाहरी मेमोरी"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"कैमरा की अनुमति नहीं है"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"स्क्रीनशॉट की अनुमति नहीं है"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"इस ऐप्लिकेशन को खोला नहीं जा सकता"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"अगर आपके कोई सवाल हैं, तो अपने आईटी एडमिन से संपर्क करें"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"ज़्यादा विवरण"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"आपका एडमिन आपकी वर्क प्रोफ़ाइल से जुड़े ऐप और डेटा की निगरानी और उनका प्रबंधन कर सकता है, जिनमें सेटिंग, अनुमतियां, कॉर्पोरेट पहुंच, नेटवर्क गतिविधि और डिवाइस के जगह की जानकारी शामिल हैं."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"आपका एडमिन इस उपयोगकर्ता से जुड़े ऐप्लिकेशन और डेटा की निगरानी और उनका प्रबंधन कर सकता है, जिनमें सेटिंग, अनुमतियां, कॉर्पोरेट पहुंच, नेटवर्क गतिविधि और डिवाइस के जगह की जानकारी शामिल है."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> प्रतिबंध</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"डेटा खर्च को लेकर मोबाइल और इंटरनेट सेवा देने वाली कंपनी का हिसाब आपके डिवाइस के हिसाब से अलग हो सकता है."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी के बजाय किसी दूसरी कंपनी का इस्तेमाल किया गया डेटा"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी के बजाय किसी दूसरी कंपनी का इस्तेमाल किया गया डेटा"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> का उपयोग किया गया"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"डेटा चेतावनी सेट करें"</string>
     <string name="data_warning" msgid="2925054658166062884">"डेटा चेतावनी"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(उपयोगकर्ता <xliff:g id="USER">%s</xliff:g> के लिए अनइंस्टॉल है)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(उपयोगकर्ता <xliff:g id="USER">%s</xliff:g> के लिए बंद है)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"ऑटोमैटिक भरने की सेवा"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"ऑटो, भरना, ऑटोमैटिक भरना"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"पासवर्ड"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"अपने-आप, भरना, अपने-आप भरने वाला, पासवर्ड"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;पक्का करें कि आप इस ऐप्लिकेशन पर भरोसा करते हैं&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ऑटोमैटिक भरना&gt;%1$s&lt;/xliff:g&gt; ऑटोमैटिक भरी जा सकने वाली चीज़ें तय करने के लिए आपकी स्क्रीन पर मौजूद चीज़ों का उपयोग करता है."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"अपने आप भरने की सुविधा (ऑटो फ़िल)"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"लॉग की गई जानकारी का लेवल"</string>
@@ -4836,7 +4884,7 @@
     <string name="preferred_network_mode_nr_lte_tdscdma_wcdma_summary" msgid="506057560516483258">"पसंदीदा नेटवर्क मोड: NR/LTE/TDSCDMA/WCDMA"</string>
     <string name="preferred_network_mode_nr_lte_tdscdma_gsm_wcdma_summary" msgid="4337061745216872524">"पसंदीदा नेटवर्क मोड: NR/LTE/TDSCDMA/GSM/WCDMA"</string>
     <string name="preferred_network_mode_nr_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="3396717432149544381">"पसंदीदा नेटवर्क मोड: NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
-    <string name="network_recommended" msgid="4665525658003183348">" (सुझाए गए)"</string>
+    <string name="network_recommended" msgid="4665525658003183348">" (सुझाए गया)"</string>
     <string name="network_lte" msgid="2449425437381668780">"LTE (सुझाया गया)"</string>
     <string name="network_4G" msgid="9018841362928321047">"4G (सुझाया गया)"</string>
     <string name="label_available" msgid="5305726869955838606">"उपलब्ध नेटवर्क"</string>
@@ -4869,7 +4917,7 @@
     <string name="subscription_available" msgid="2659722770210403365">"उपलब्ध"</string>
     <string name="mobile_network_in_range" msgid="3528320750936028369">"पहुंच में"</string>
     <string name="mobile_network_not_in_range" msgid="5680896182395366584">"सीमा में नहीं है"</string>
-    <string name="mobile_network_list_add_more" msgid="4478586073355236604">"ज़्यादा जोड़ें"</string>
+    <string name="mobile_network_list_add_more" msgid="4478586073355236604">"और जोड़ें"</string>
     <string name="mobile_network_active_sim" msgid="6397581267971410039">"चालू / सिम"</string>
     <string name="mobile_network_inactive_sim" msgid="5829757490580409899">"बंद / सिम"</string>
     <string name="mobile_network_active_esim" msgid="4673190244386572318">"चालू / डाउनलोड किया गया सिम"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"नेटवर्क संचालन मोड बदलें"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"पसंदीदा नेटवर्क प्रकार"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"सेटिंग वर्शन"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी से जुड़ी सेटिंग का वर्शन"</string>
     <string name="call_category" msgid="641461844504128789">"कॉल करना"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी की वीडियो कॉलिंग सुविधा"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"सिस्टम चुनें"</string>
@@ -4914,14 +4962,14 @@
     <string name="see_less" msgid="2642392725363552793">"कम देखें"</string>
     <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"क्या आप <xliff:g id="CARRIER_NAME">%1$s</xliff:g> चालू करना चाहते हैं?"</string>
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"क्या आप सिम चालू करना चाहते हैं?"</string>
-    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"क्या आप <xliff:g id="CARRIER_NAME">%1$s</xliff:g> का इस्तेमाल करना चाहते हैं?"</string>
-    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"क्या आप इस्तेमाल करने के लिए सिम कार्ड पर जाना चाहते हैं?"</string>
-    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"एक समय में सिर्फ़ एक सिम इस्तेमाल किया जा सकता है.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> पर जाने से आपके <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> की सेवा रद्द नहीं की जाएगी."</string>
-    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"एक समय में, डाउनलोड किया गया सिर्फ़ एक सिम इस्तेमाल किया जा सकता है.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> पर जाने से आपके <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> की सेवा रद्द नहीं की जाएगी."</string>
-    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"एक समय में सिर्फ़ एक सिम इस्तेमाल किया जा सकता है.\n\nएक से दूसरे सिम पर जाने से, आपको मिल रही <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> की सेवा रद्द नहीं की जाएगी."</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"क्या आप <xliff:g id="CARRIER_NAME">%1$s</xliff:g> पर स्विच करना चाहते हैं?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"क्या आप सिम कार्ड पर स्विच करना चाहते हैं?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"एक समय में सिर्फ़ एक सिम चालू हो सकता है.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> पर स्विच करने से आपके <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> की सेवा रद्द नहीं की जाएगी."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"एक समय में, डाउनलोड किया गया सिर्फ़ एक सिम चालू हो सकता है.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> पर स्विच करने से आपके <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> की सेवा रद्द नहीं की जाएगी."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"एक समय में सिर्फ़ एक सिम चालू हो सकता है.\n\nस्विच करने से, आपको मिल रही <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> की सेवा रद्द नहीं की जाएगी."</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> पर जाएं"</string>
     <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"नेटवर्क से कनेक्ट किया जा रहा है…"</string>
-    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> पर ले जाया जा रहा है"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> पर स्विच किया जा रहा है"</string>
     <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी को बदला नहीं जा सकता"</string>
     <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"किसी गड़बड़ी की वजह से, मोबाइल और इंटरनेट सेवा देने वाली कंपनी को बदला नहीं जा सकता."</string>
     <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"क्या आप <xliff:g id="CARRIER_NAME">%1$s</xliff:g> को बंद करना चाहते हैं?"</string>
@@ -4936,11 +4984,12 @@
     <string name="sim_action_continue" msgid="1688813133152389943">"जारी रखें"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"रीस्टार्ट करें"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"रहने दें"</string>
-    <string name="sim_switch_button" msgid="1405772571706095387">"दूसरे नेटवर्क पर जाएं"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"स्‍विच करें"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"सिम चालू नहीं किया जा सका"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"सिम निकालकर फिर से लगाएं. अगर तब भी समस्या ठीक नहीं होती, तो डिवाइस को रीस्टार्ट करें."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"सिम दोबारा चालू करने की कोशिश करें. अगर तब भी समस्या ठीक नहीं होती, तो डिवाइस को रीस्टार्ट करें."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"नेटवर्क चालू करना"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी बदली जा रही है"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> चालू है"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"सिम की सेटिंग अपडेट करने के लिए टैप करें"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"अब <xliff:g id="CARRIER_NAME">%1$s</xliff:g> का इस्तेमाल किया जा रहा है"</string>
@@ -4959,8 +5008,8 @@
     <string name="switch_sim_dialog_no_switch_text" msgid="7053939850026876088">"मोबाइल डेटा, कॉल से जुड़ी सुविधाएं, और मैसेज (एसएमएस) को बाद में इस्तेमाल करने के लिए, अपने नेटवर्क की सेटिंग पर जाएं"</string>
     <string name="sim_card_label" msgid="5632157635124050923">"सिम कार्ड"</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"क्या आप डाउनलोड किए गए इस सिम को हमेशा के लिए मिटाना चाहते हैं?"</string>
-    <string name="erase_sim_dialog_text" msgid="753031064269699885">"इस सिम को डिवाइस से हमेशा के लिए मिटाने पर, <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> की सेवा हट जाती है.\n\nहालांकि, <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> की सेवा नहीं हटेगी."</string>
-    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"हमेशा के लिए मिटाएं"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"इस सिम को मिटाने से, <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> की सेवा इस डिवाइस से हट जाती है.\n\nहालांकि, <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> की सेवा रद्द नहीं की जाएगी."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"मिटाएं"</string>
     <string name="erasing_sim" msgid="7877703231075699139">"सिम को हमेशा के लिए मिटाया जा रहा है…"</string>
     <string name="erase_sim_fail_title" msgid="2024446702985862427">"सिम हमेशा के लिए नहीं मिटाया जा सका"</string>
     <string name="erase_sim_fail_text" msgid="7870804401227483131">"किसी गड़बड़ी की वजह से, इस सिम को हमेशा के लिए नहीं मिटाया जा सका.\n\nडिवाइस को रीस्टार्ट करें और फिर से कोशिश करें."</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"बंद है"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"इंटरनेट"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"सिम"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"हवाई जहाज़ मोड चालू होने पर, काम करने वाले नेटवर्क दिखाएं"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"हवाई जहाज़ मोड चालू होने पर, काम करने वाले नेटवर्क ढूंढें और उनसे कनेक्ट करें."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"वाई-फ़ाई नेटवर्क ढूंढकर, उनसे कनेक्ट करता है"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"हवाई जहाज़, हवाई जहाज़ सुरक्षित नेटवर्क"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"कॉल और मैसेज (एसएमएस)"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"वाई-फ़ाई कॉलिंग"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"उपलब्ध नहीं है"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"फ़िलहाल, उपलब्ध नहीं है"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"कोई सिम कार्ड नहीं लगाया गया है"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"प्राथमिकताएं"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"नेटवर्क की सेटिंग"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक नेटवर्क से कनेक्ट करें"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्शन, इंटरनेट, वायरलेस, डेटा, वाईफ़ाई, सेल्युलर, मोबाइल, मोबाइल और इंटरनेट सेवा देने वाली कंपनी, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"हवाई जहाज़ मोड वाले नेटवर्क देखें"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"हवाई जहाज़ मोड में उपलब्ध नेटवर्क देखे जा रहे हैं"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"नेटवर्क चालू करें"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"नेटवर्क बंद करें"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"इंटरनेट रीसेट करना है?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"ऐसा करने पर आपका कॉल कट जाएगा"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ऐसा करने पर आपका कॉल कट जाएगा"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"इंटरनेट रीसेट हो रहा है…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"कनेक्टिविटी से जुड़ी समस्याएं ठीक करें"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"हवाई जहाज़ मोड पर काम करने वाले नेटवर्क उपलब्ध हैं"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"नेटवर्क बदलने के लिए, पहले ईथरनेट को डिसकनेक्ट करें"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"नेटवर्क बदलने के लिए, पहले ईथरनेट को डिसकनेक्ट करें"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"हवाई जहाज़ मोड नेटवर्क"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"कनेक्ट हो गया"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"इंटरनेट अपने-आप कनेक्ट नहीं होगा"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"रंग"</string>
     <string name="category_name_others" msgid="2366006298768550310">"अन्य"</string>
     <string name="category_name_general" msgid="7737273712848115886">"सामान्य"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"सभी ऐप्लिकेशन देखें"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"स्मार्ट फ़ॉरवर्डिंग"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"स्मार्ट फ़ॉरवर्डिंग की सुविधा चालू है"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"फ़ोन नंबर डालें"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"फ़ोन नंबर नहीं डाला गया."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ठीक है"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G के इस्तेमाल की मंज़ूरी दें"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G मोबाइल इंटरनेट कनेक्शन का इस्तेमाल करें. आपातकालीन कॉल करने के लिए, 2G सेवा हमेशा चालू रहती है."</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 52b40b6..615947d 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -53,9 +53,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Smanjite ili povećajte tekst na zaslonu."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Smanji"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Povećaj"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Upotreba automatskog zakretanja"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Primjer teksta"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Čarobnjak iz Oza"</string>
@@ -409,15 +408,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> otisaka prsta postavljeno</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Otključavanje otiskom"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Postavljanje otiska prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Upotreba otiska prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Jednostavno dodirnite senzor otiska prsta da biste otključali telefon, autorizirali kupnje ili se prijavili u aplikacije. Pazite čije otiske prstiju dodajete. Čak i samo jedan dodani otisak može činiti sve to."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Otisak prsta može biti manje siguran od snažnog uzorka ili PIN-a."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Vi ste glavni"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Napomena"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Podaci koje snimi otisak prsta pohranjuju se sigurno i nikamo se ne šalju s telefona. Svoje podatke možete izbrisati kad god želite u postavkama."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Otisak prsta može biti manje siguran od snažnog uzorka ili PIN-a."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Vaš će telefon povremeno upotrijebiti vaše nedavne slike otiska prsta kako bi izradio poboljšane modele otiska prsta."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Otključajte telefon ili odobrite kupnje otiskom prsta.\n\nNapomena: ovaj uređaj ne možete otključati otiskom prsta. Za više informacija obratite se administratoru organizacije."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Otključajte telefon ili odobrite kupnje otiskom prsta.\n\nNapomena: otisak prsta može biti manje siguran od snažnog uzorka ili PIN-a."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Odustani"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, hvala"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Nastavi"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Slažem se"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Dalje"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Želite li preskočiti otisak prsta?"</string>
@@ -434,16 +439,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Preskoči"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Odustani"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Dodirnite senzor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Dodirnite i zadržite ikonu otiska prsta"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Nalazi se na stražnjoj strani telefona. Upotrijebite kažiprst."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Na zaslonu je. Potražite otisak prsta sa svijetlećim krugom."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Senzor otiska prsta nalazi se na zaslonu. Pomičite prst po zaslonu da biste ga pronašli."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustracija uređaja i lokacije senzora otiska prsta"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Naziv"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"U redu"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Izbriši"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Dodirnite senzor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Stavite prst na senzor i podignite ga kada osjetite vibraciju"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Podignite i ponovo dodirnite"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Nastavite podizati prst da biste dodali različite dijelove otiska prsta"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Otisak prsta dodan"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Kada se prikaže ta ikona, upotrijebite otisak prsta da biste se identificirali ili odobrili kupnju"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Kasnije ću"</string>
@@ -1196,14 +1210,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Pretraži"</string>
     <string name="display_settings" msgid="7197750639709493852">"Prikaz"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automatski zakreni zaslon"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Isključeno"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Uključeno"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Uključeno – na temelju lica"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Omogući prepoznavanje lica"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Boje"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Prirodno"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Pojačano"</string>
@@ -1248,7 +1258,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Uključeno/zaslon se neće isključiti ako ga gledate"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Isključeno"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Potreban je pristup kameri"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Dodirnite da biste upravljali dopuštenjima za usluge personaliziranja uređaja"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Sprječava isključivanje zaslona ako ga gledate"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Značajka Pozornost zaslona pomoću prednje kamere otkriva gleda li netko zaslon. Funkcionira na uređaju i slike se nikad ne pohranjuju i ne šalju Googleu."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Uključivanje pozornosti na zaslonu"</string>
@@ -1329,7 +1342,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kada je zaslon taman, uključit će se u slučaju novih obavijesti"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Uvijek prikaži vrijeme i podatke"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Povećana potrošnja baterije"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Podebljano"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Podebljano"</string>
     <string name="title_font_size" msgid="570613010306330622">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Smanjite ili povećajte tekst"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Postavke zaklj. SIM kartice"</string>
@@ -1499,6 +1512,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Drugi korisnici"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Pohrana na uređaju"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Prijenosna pohrana"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmi i podsjetnici"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Dopusti postavljanje alarma ili podsjetnika"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmi i podsjetnici"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Aplikaciji dopustite zakazivanje alarma ili drugih događaja koji se temelje na vremenskom rasporedu. Time će se aplikaciji omogućiti aktiviranje i pokretanje čak i dok ne koristite uređaj. Ako to dopuštenje opozovete, aplikacija bi mogla nepravilno raditi, odnosno nijedan alarm koji je zakazala neće više funkcionirati."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"raspored, alarm, podsjetnik, događaj"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Iskorišteno <xliff:g id="USED">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Iskorišteno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1748,31 +1766,32 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Usluge lociranja"</string>
     <string name="location_title" msgid="5819154746934945021">"Moja lokacija"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokacija za poslovni profil"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Pristup aplikacije lokaciji"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokacija je isključena"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> od <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplikacija ima pristup lokaciji</item>
       <item quantity="few"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> od <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplikacija imaju pristup lokaciji</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> od <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplikacija ima pristup lokaciji</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Nedavni pristup lokaciji"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Prikaži pojedinosti"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Nijedna aplikacija nije nedavno zatražila lokaciju"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nijedna aplikacija nije pristupila lokaciji u posljednje vrijeme"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Visoka potrošnja baterije"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Niska potrošnja baterije"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Traženje Wi‑Fija i Bluetootha"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Traženje Wi‑Fi-ja"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Dopustite aplikacijama i uslugama da traže Wi‑Fi mreže u bilo kojem trenutku, čak i kada je Wi‑Fi isključen. Na taj se način mogu, na primjer, poboljšati značajke i usluge koje se temelje na lokaciji."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Traženje Bluetootha"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Dopustite aplikacijama i uslugama da traže uređaje u blizini u bilo kojem trenutku, čak i kada je Bluetooth isključen. Na taj se način mogu, na primjer, poboljšati značajke i usluge koje se temelje na lokaciji."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Usluge lokacije"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usluge lokacije za posao"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Otkrivanje vremenske zone lokacije"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Otkrivanje vremenske zone lokacije"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Dopušta korištenje lokacije uređaja kako bi se utvrdila trenutačna vremenska zona. Ostale postavke lokacije, kao što je traženje Wi-Fija, mogu utjecati na točnost utvrđivanja vremenske zone."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Uključeno"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Isključeno"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatsko je otkrivanje vremenske zone onemogućeno"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatska vremenska zona je isključena"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Onemogućeno je otkrivanje vremenske zone lokacije"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Nije podržano otkrivanje vremenske zone lokacije"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Izmjene značajke otkrivanja vremenske zone lokacije nisu dopuštene"</string>
@@ -1953,10 +1972,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Omogući"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Isprazni pohranu"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Deinstaliraj ažuriranja"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Odlučili ste da se ta aplikacija pokreće prema zadanim postavkama za neke radnje."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Neke aktivnosti koje ste odabrali otvaraju se u ovoj aplikaciji prema zadanim postavkama."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Odlučili ste dopustiti ovoj aplikaciji izradu widgeta i pristupanje njihovim podacima."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Nema zadanih postavki."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Izbriši zadane postavke"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Izbriši zadane postavke"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Ta aplikacija možda nije dizajnirana za vaš zaslon. Ovdje možete provjeriti kako se prilagođava vašem zaslonu."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Pitaj pri pokretanju"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Skaliranje aplikacije"</string>
@@ -2168,7 +2187,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Ovaj uređaj možete prilagoditi svojim potrebama. Značajke pristupačnosti možete promijeniti kasnije u postavkama."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Promijenite veličinu fonta"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Čitači zaslona"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvuk i tekst na zaslonu"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Titlovi"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audiozapis"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Općenito"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Zaslon"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst i prikaz"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Zatamnjenje zaslona"</string>
@@ -2322,7 +2343,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Crveno – zeleno"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Crveno – zeleno"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Plavo – žuto"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Smanjenje svjetline"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Smanjenje svjetline"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Zatamnite zaslon više od minimalne zadane svjetline svojeg telefona"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Zatamnite zaslon više od minimalne zadane svjetline svojeg tableta"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Zatamnite zaslon kako vam ne bi blještao u oči dok čitate.&lt;br/&gt;&lt;br/&gt; To može biti korisno u sljedećim situacijama: &lt;ol&gt; &lt;li&gt; Zadana minimalna svjetlina na telefonu i dalje je presvijetla.&lt;/li&gt; &lt;li&gt; Koristite telefon u mraku, na primjer noću ili u tamnoj sobi prije spavanja.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3378,8 +3399,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"lice"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"otisak prsta, dodati otisak prsta"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"zatamnjenje zaslona, dodirni zaslon, baterija, pametna svjetlina, dinamična svjetlina, automatska svjetlina"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"zatamnjeni zaslon, mirovanje, baterija, vrijeme čekanja, pozornost, prikaz, zaslon, neaktivnost"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"zakrenuti, okrenuti, rotacija, portret, pejzaž, usmjerenje, okomito, vodoravno"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"nadogradnja, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, raspored, obavijesti, blokiranje, tišina, vibracija, mirovanje, rad, fokus, zvuk, utišano, dan, dan u tjednu, vikend, noć tijekom tjedna, događaj"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"zaslon, vrijeme zaključavanja, vrijeme čekanja, zaključan zaslon"</string>
@@ -3548,9 +3571,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Melodije zvona"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Ostali zvukovi i vibracije"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Obavijesti"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Razgovor"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nedavno poslano"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Pogledajte sve u posljednjih 7 dana"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Dodatne postavke"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Opće"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Obavijesti s radnog profila"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Prilagodljive obavijesti"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prilagodljiv prioritet obavijesti"</string>
@@ -3612,7 +3636,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Prikaži na zaslonu obavijesti, traci statusa i zaključanom zaslonu"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Sakrij tihe obavijesti na traci statusa"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Trepereće svjetlo"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Obavijesti na zaklj. zaslonu"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privatnost"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Preskoči zaključan zaslon"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Nakon otključavanja licem otvori posljednji korišteni zaslon"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Zaključan zaslon, preskakanje, zaobilaženje"</string>
@@ -3704,7 +3728,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> obavijesti tjedno</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nikada"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Pristup obavijestima"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Obavijesti na uređaju i u aplikacijama"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Odaberite koje će se obavijesti prikazivati u aplikacijama i na uređajima"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Blokiran je pristup obavijestima radnog profila"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Aplikacije ne mogu čitati obavijesti"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3724,17 +3749,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Isključi"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Odustani"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Dopuštene vrste obavijesti"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Važne tekuće obavijesti"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Obavijesti o razgovorima"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Zvučne obavijesti"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Bešumne obavijesti"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"U stvarnom vremenu"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Komunikacija u stvarnom vremenu iz aplikacija koje se upotrebljavaju, kao što su navigacija, telefonski pozivi i drugo"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Razgovori"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS i ostala komunikacija"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Zadano"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Obavijesti koje mogu zvoniti ili vibrirati ovisno o postavkama"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Tiho"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Obavijesti koje su uvijek bez zvuka i vibracija"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Pogledajte sve aplikacije"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Promijenite postavke obavijesti za svaku aplikaciju koja može slati obavijesti"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Aplikacije koje se prikazuju na uređaju"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Pomoćne usluge za virtualnu stvarnost"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nijedna instalirana aplikacija nije zatražila da se pokrene kao pomoćna usluga za virtualnu stvarnost."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Želite li dopustiti pristup usluge virtualne stvarnosti za uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4028,9 +4053,33 @@
     <string name="launch_by_default" msgid="892824422067985734">"Otvori prema zadanim postavkama"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Otvaranje veza"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Otvori podržane veze"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Podržane veze otvaraju se u ovoj aplikaciji"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Veze koje se otvaraju u ovoj aplikaciji"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Otvori bez postavljanja pitanja"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Podržane veze"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Ostale zadane postavke"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Ostale zadane postavke"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Dodaj vezu"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Aplikacija može potvrditi veze tako da se automatski otvaraju u aplikaciji. "<annotation id="url">"Saznajte više"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> potvrđena veza</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> potvrđene veze</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> potvrđenih veza</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Ove su veze potvrđene i automatski se otvaraju u ovoj aplikaciji.</item>
+      <item quantity="few">Ove su veze potvrđene i automatski se otvaraju u ovoj aplikaciji.</item>
+      <item quantity="other">Ove su veze potvrđene i automatski se otvaraju u ovoj aplikaciji.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"U redu"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Traženje drugih podržanih veza…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Odustani"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> podržana veza</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> podržane veze</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> podržanih veza</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Dodaj"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Otvara se u aplikaciji <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>, iskorišteno <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"interna pohrana"</string>
     <string name="storage_type_external" msgid="125078274000280821">"vanjska pohrana"</string>
@@ -4335,7 +4384,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Fotoaparat nije dopušten"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Snimka zaslona nije dopuštena"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Aplikacija se ne može otvoriti"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Ako imate pitanja, obratite se administratoru"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Više pojedinosti"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Vaš administrator može nadzirati aplikacije i postavke povezane s vašim radnim profilom, uključujući postavke, dopuštenja, korporacijski pristup, aktivnost na mreži i podatke o lokaciji uređaja, te njima upravljati."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Vaš administrator može nadzirati aplikacije i podatke povezane s tim korisnikom, uključujući postavke, dopuštenja, korporacijski pristup, aktivnost na mreži i podatke o lokaciji uređaja, te njima upravljati."</string>
@@ -4415,7 +4465,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ograničenja</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Mobilni operater može obračunavati podatke na drugačiji način od uređaja"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Izuzima podatke koje koriste mreže mobilnog operatera"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Izuzima podatke koje koriste mreže mobilnog operatera"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Potrošili ste <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Postavi upozorenje o potrošnji"</string>
     <string name="data_warning" msgid="2925054658166062884">"Upozorenje o potrošnji"</string>
@@ -4439,9 +4489,9 @@
     <string name="data_usage_chart_brief_content_description" msgid="5548074070258881530">"Grafikon koji prikazuje potrošnju podatakovnog prometa između <xliff:g id="START_DATE">%1$s</xliff:g> i <xliff:g id="END_DATE">%2$s</xliff:g>."</string>
     <string name="data_usage_chart_no_data_content_description" msgid="5481968839079467231">"Nema podataka za taj datumski raspon"</string>
     <plurals name="billing_cycle_days_left" formatted="false" msgid="661792524671718753">
-      <item quantity="one">još %d dan</item>
-      <item quantity="few">još %d dana</item>
-      <item quantity="other">još %d dana</item>
+      <item quantity="one">Još %d dan</item>
+      <item quantity="few">Još %d dana</item>
+      <item quantity="other">Još %d dana</item>
     </plurals>
     <string name="billing_cycle_none_left" msgid="1694844019159277504">"Nema preostalog vremena"</string>
     <string name="billing_cycle_less_than_one_day_left" msgid="1210202399053992163">"Preostalo je manje od 1 dana"</string>
@@ -4765,7 +4815,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(deinstalirano za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Automatsko popunjavanje"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automatski, popunjavanje, automatsko popunjavanje"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Zaporke"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automatsko, popunjavanje, automatsko popunjavanje, zaporka"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Provjerite je li ova aplikacija pouzdana&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google automatsko popunjavanje&gt;%1$s&lt;/xliff:g&gt; upotrebljava sadržaj na zaslonu za procjenu onoga što se može automatski popuniti."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Automatski popuni"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Razina zapisivanja"</string>
@@ -4973,7 +5024,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Promijenite način rada mreže"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Željena vrsta mreže"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Dostavljač"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Verzija postavki"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Verzija postavki mobilnog operatera"</string>
     <string name="call_category" msgid="641461844504128789">"Pozivanje"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videopozivanje putem mobilnog operatera"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Odabir sustava"</string>
@@ -4993,25 +5044,25 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nedostupno kada je povezano s mobilnim operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Prikaži više"</string>
     <string name="see_less" msgid="2642392725363552793">"Prikaži manje"</string>
-    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Uključiti mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Želite li uključiti uslugu mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Uključiti SIM?"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Želite li prijeći na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
     <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Želite li prijeći na SIM karticu?"</string>
     <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Istovremeno može biti aktivan samo jedan SIM.\n\nPrelaskom na mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> neće se otkazati vaša usluga kod mobilnog operatera <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
     <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Istovremeno može biti aktivan samo jedan preuzeti SIM.\n\nPrelaskom na mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> neće se otkazati vaša usluga kod mobilnog operatera <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
     <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Istovremeno može biti aktivan samo jedan SIM.\n\nPrelaskom se neće otkazati vaša usluga kod mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
-    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Prebacite se na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Prebaci me na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Povezivanje s mrežom…"</string>
     <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Prijelaz na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Promjena mobilnog operatera nije uspjela"</string>
     <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Mobilni operater ne može se promijeniti zbog pogreške."</string>
-    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Isključiti uslugu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Želite li isključiti uslugu mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
     <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Isključiti SIM?"</string>
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Isključivanje SIM-a<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
     <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Onemogućivanje mobilnog operatera nije uspjelo"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Nešto je pošlo po zlu i onemogućivanje mobilnog operatera nije uspjelo."</string>
     <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Želite li upotrebljavati dvije SIM kartice?"</string>
-    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Ovaj uređaj istovremeno može imati dvije aktivne SIM kartice. Da biste nastavili s upotrebom samo jedne SIM kartice, dodirnite \"Ne, hvala\"."</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Ovaj uređaj može istovremeno imati dvije aktivne SIM kartice. Da biste nastavili s upotrebom samo jedne SIM kartice, dodirnite \"Ne, hvala\"."</string>
     <string name="sim_action_restart_title" msgid="7054617569121993825">"Želite li ponovo pokrenuti uređaj?"</string>
     <string name="sim_action_restart_text" msgid="8019300474703571013">"Za početak ponovo pokrenite uređaj. Zatim možete dodati drugu SIM karticu."</string>
     <string name="sim_action_continue" msgid="1688813133152389943">"Nastavi"</string>
@@ -5022,6 +5073,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Izvadite SIM i umetnite ga ponovo. Ako se problem ponovi, ponovo pokrenite uređaj."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Pokušajte ponovo uključiti SIM. Ako se problem ponovi, ponovo pokrenite uređaj."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivacija mreže"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Promjena mobilnog operatera"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktivan"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Dodirnite da biste ažurirali postavke SIM-a"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Prešli ste na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5184,8 +5236,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Isključeno"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-ovi"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Prikaz mreža za način rada u zrakoplovu"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Pronađite mreže i povežite se s njima u načinu rada u zrakoplovu."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Pronađite Wi-Fi mreže i povežite se"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"zrakoplov, sigurno za rad u zrakoplovu"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Pozivi i SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi pozivi"</string>
@@ -5199,22 +5250,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nije dostupno"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Privremeno nedostupno"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nema SIM kartice"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Postavke"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Postavke mreže"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Poveži se s javnim mrežama"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"mrežna veza, internet, bežično, podaci, wifi, wi-fi, wi fi, mobilno, mobilni uređaj, mobilni operater, 4 g, 3 g, 2 g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Pregled mreža sigurnih za rad u zrakopl."</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Pregled mreža u načinu rada u zrakoplovu"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Uključivanje mreža"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Isključivanje mreža"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Vratiti internet na zadano?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Time će se prekinuti vaš telefonski poziv"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Time će se prekinuti vaš telefonski poziv"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Vraćanje interneta na zadano…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Rješavanje problema s povezivošću"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Dostupne su mreže za način rada u zrakoplovu"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Da biste se prebacili na drugu mrežu, odspojite ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ne možete promijeniti mrežu dok ste povezani"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mreže u načinu rada u zrakoplovu"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Neće biti automatskog povezivanja s internetom"</string>
@@ -5235,6 +5285,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Boja"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Ostalo"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Općenito"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Pogledajte sve aplikacije"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Pametno prosljeđivanje"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Pametno prosljeđivanje omogućeno"</string>
@@ -5248,4 +5302,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Unesite telefonski broj"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Nedostaje telefonski broj."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"U redu"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Dopusti 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Koristite 2G mobilne veze. Za hitne pozive 2G je uvijek uključen."</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index fcfe9c5..7995278 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Kicsinyítheti vagy nagyíthatja a képernyőn megjelenő szöveget."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Kisebb"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Nagyobb"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Automatikus forgatás használata"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Mintaszöveg"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Óz, a csodák csodája"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ujjlenyomat beállítva</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Feloldás ujjlenyomattal"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Ujjlenyomat beállítása"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Az ujjlenyomat használata"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Egyszerűen érintse meg az ujjlenyomat-érzékelőt telefonja feloldásához, a vásárlások engedélyezéséhez és az alkalmazásokba való bejelentkezéshez. Ügyeljen arra, hogy kinek az ujjlenyomatát adja hozzá. Bármelyik hozzáadott ujjlenyomattal lehetséges ezen műveletek elvégzése."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Az ujjlenyomat kevésbé biztonságos, mint az erős minta vagy PIN-kód."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Az irányítás az Ön kezében van"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Fontos tudnivalók"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Az ujjlenyomat-érzékelő által rögzített adatokat biztonságosan, mindig csak az Ön telefonján tárolja a rendszer. Az adatait bármikor törölheti a Beállításokban."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Az ujjlenyomat kevésbé biztonságos, mint az erős minta vagy PIN-kód."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Telefonja időnként felhasználja az ujjlenyomat-beolvasásra használt legutóbbi képeit továbbfejlesztett ujjlenyomatmodellek létrehozásához."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Használja ujjlenyomatát a telefon feloldásához vagy vásárlások engedélyezéséhez.\n\nMegjegyzés: Nem használhatja ujjlenyomatát azt eszköz feloldására. További információért forduljon szervezete rendszergazdájához."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Használja ujjlenyomatát a telefon feloldásához vagy vásárlások engedélyezéséhez.\n\nMegjegyzés: Az ujjlenyomat kevésbé biztonságos, mint az erős minta vagy PIN-kód."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Mégse"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nem"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Kihagyás"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Tovább"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Elfogadom"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Kihagyás"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Következő"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Kihagyja az ujjlenyomatot?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Kihagyás"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Mégse"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Érintse meg az érzékelőt"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Tartsa nyomva az ujjlenyomat ikont"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"A telefon hátoldalán találja. Használja a mutatóujját."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"A képernyőn található. Keresse a fénylő körvonalú ujjlenyomatot."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Az ujjlenyomat-érzékelő a képernyőn található. Keresse meg az ujja húzásával."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Az eszközt és az ujjlenyomat-érzékelő helyét ábrázoló illusztráció"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Név"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Törlés"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Érintse meg az érzékelőt"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Helyezze az ujját az érzékelőre, és emelje fel a rezgést követően"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Emelje fel, majd érintse újra"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Emelgesse az ujját az ujjlenyomat különböző részeinek hozzáadásához"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Ujjlenyomat hozzáadva"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Ha ezt az ikont látja, akkor ujjlenyomata használatával azonosítsa magát vagy engedélyezze a vásárlást."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Később"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Keresés"</string>
     <string name="display_settings" msgid="7197750639709493852">"Megjelenítés"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automatikus képernyőforgatás"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Ki"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Be"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Be: Arcalapú"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Arcfelismerés bekapcsolása"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Színek"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Természetes"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Élénk"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Be / A képernyő nem kapcsol majd ki, ha Ön épp azt nézi"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Ki"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Kamera-hozzáférés szükséges"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Koppintson ide az Eszköz-személyreszabási szolgáltatások engedélyeinek kezeléséhez"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Amíg Ön a képernyőt nézi, megakadályozza annak kikapcsolását"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"A Képernyőfigyelő az előlapi kamerát használja annak ellenőrzésére, hogy nézi-e felhasználó a képernyőt. A funkció az eszközön működik, és a fotókat sosem tárolja vagy küldi tovább a Google-nak."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Képernyőfigyelő bekapcsolása"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Amikor a képernyő ki van kapcsolva, bekapcsol az új értesítéseknél"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Idő és adatok mindig láthatók"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Növeli az akkumulátorhasználatot"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Félkövér szöveg"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Félkövér szöveg"</string>
     <string name="title_font_size" msgid="570613010306330622">"Betűméret"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Szöveg nagyítása és kicsinyítése"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM-kártya lezárási beállításai"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Egyéb felhasználók"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Eszköz tárhelye"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Hordozható tárhely"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Ébresztések és emlékeztetők"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Ébresztés/emlékeztető beállításának engedélyezése"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Ébresztések és emlékeztetők"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Ez az alkalmazás ütemezhet ébresztéseket és más időzítésalapú eseményeket. Ez lehetővé teszi, hogy az alkalmazás még akkor is felébredjen és fusson, amikor Ön éppen nem használja az eszközt. Az engedély visszavonása esetén előfordulhat, hogy az alkalmazás nem működik majd megfelelően. Ez különösen igaz azokra az ébresztésekre, amelyeket az alkalmazás már ütemezett."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"ütemezés, ébresztés, emlékeztető, esemény"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g>/<xliff:g id="USED">%1$s</xliff:g> foglalt"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"/ <xliff:g id="TOTAL">%1$s</xliff:g> foglalt"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Helyszolgáltatások"</string>
     <string name="location_title" msgid="5819154746934945021">"Saját pozíció"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"A munkahelyi profil helye"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Alkalmazás helyhozzáférése"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"A helyadatok ki vannak kapcsolva"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g>/<xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> alkalmazás hozzáfér a helyadatokhoz</item>
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g>/<xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> alkalmazás hozzáfér a helyadatokhoz</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Legutóbbi helyhozzáférés"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Részletek megtekintése"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Az utóbbi időben egy alkalmazás sem kért le helyadatokat."</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Egy alkalmazás sem fért hozzá a helyadatokhoz a közelmúltban"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Magas akkumulátorhasználat"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Alacsony akkumulátorhasználat"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi- és Bluetooth-alapú keresés"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi-keresés"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Engedélyezi az alkalmazásoknak és szolgáltatásoknak, hogy Wi-Fi-hálózatokat keressenek még akkor is, ha ki van kapcsolva a Wi-Fi. Ez például a helyalapú funkciók és szolgáltatások javítására használható."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-alapú keresés"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Engedélyezi az alkalmazásoknak és szolgáltatásoknak, hogy közeli eszközöket keressenek még akkor is, ha ki van kapcsolva a Bluetooth. Ez például a helyalapú funkciók és szolgáltatások javítására használható."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Helyszolgáltatások"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Munkahelyi helyszolgáltatások"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Helyalapú időzóna-meghatározás"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Helyalapú időzóna-meghatározás"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Lehetővé teszi, hogy a rendszer felhasználja az eszköz helyadatait az aktuális időzóna észleléséhez. Az egyéb helybeállítások, például a Wi‑Fi-keresés, befolyásolhatják az időzóna-felismerés pontosságát."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Be"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Ki"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Az időzóna automatikus észlelése ki van kapcsolva"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Az automatikus időzóna ki van kapcsolva"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"A helyalapú időzóna-meghatározás ki van kapcsolva"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"A helyalapú időzóna-meghatározás nem támogatott"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"A helyalapú időzóna-meghatározásra vonatkozó módosítások nem engedélyezettek"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Engedélyezés"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Tárhely törlése"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Frissítések eltávolítása"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Úgy döntött, hogy ezt az alkalmazást indítja el alapértelmezettként egyes műveletekhez."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Egyes kiválasztott tevékenységek alapértelmezés szerint ebben az alkalmazásban nyílnak meg."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Ön engedélyezte az alkalmazás számára modulok létrehozását, illetve az adataikhoz való hozzáférést."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Nincs alapbeállítás."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Alapértelmezések törlése"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Alapértelmezett beállítások törlése"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Nem biztos, hogy ezt az alkalmazást az Ön képernyőjére tervezték. Itt szabályozhatja az alkalmazás megjelenítését."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Kérdezzen rá elindításkor"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Alkalmazás skálázása"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Eszközét saját igényeinek megfelelően testre szabhatja. Ezeket a kisegítő lehetőségeket később a Beállítások menüben módosíthatja."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Betűméret módosítása"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Képernyőolvasók"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Hang és képernyőn megjelenő szöveg"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Feliratok"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Hang"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Általános"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Megjelenítés"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Szöveg és megjelenítés"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Képernyő sötétítése"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vörös-zöld"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vörös-zöld"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Kék-sárga"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Fényerő csökkentése"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Fényerő csökkentése"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"A képernyő sötétítése a telefon minimális fényerejénél sötétebbre"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"A képernyő sötétítése a táblagép minimális fényerejénél sötétebbre"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Sötétítéssel könnyebben olvasható a képernyő.&lt;br/&gt;&lt;br/&gt; Ez például a következő esetekben lehet hasznos: &lt;ol&gt; &lt;li&gt; Ha a telefon alapértelmezett minimális fényereje még mindig túl nagy.&lt;/li&gt; &lt;li&gt; Ha a telefont sötét körülmények között használja (például éjjel vagy sötét szobában lefekvés előtt).&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"arc"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"ujjlenyomat, ujjlenyomat hozzáadása"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"képernyő halványítása, érintőképernyő, akkumulátor, okos fényerő, dinamikus fényerő, automatikus fényerő"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"képernyő halványítása, alvó mód, akkumulátor, időkorlát, figyelem, képernyő, kijelző, inaktivitás, képernyőfigyelő"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"elforgatás, elfordítás, forgatás, álló, fekvő, tájolás, függőleges, vízszintes"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"verziófrissítés, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"ne zavarjanak, ütemezés, értesítések, letiltás, néma, rezgés, alvó mód, munka, fókusz, hang, némítás, nap, hétköznap, hétvége, hétköznap este, esemény"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"képernyő, lezárási idő, időkorlát, lezárási képernyő"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Csengőhangok"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Egyéb hangok és rezgések"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Értesítések"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Beszélgetés"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nemrég küldött"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Az összes megtekintése az utolsó hét napból"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Speciális"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Általános"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Munkahelyi profil értesítései"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Alkalmazkodó értesítések"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptív értesítés prioritása"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Megjelenítés a lehúzható értesítések között, az állapotsoron és a lezárási képernyőn"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Az állapotsor néma értesítéseinek elrejtése"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Villogó fény"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Értesítések a lezárási képernyőn"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Adatvédelem"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Lezárási képernyő kihagyása"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Arcalapú feloldás után a legutóbbi képernyő megnyitása"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lezárási képernyő, Kihagyás, Megkerülés"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> értesítés hetente</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Soha"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Hozzáférés értesítésekhez"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Eszköz- és alkalmazásértesítések"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Vezérelheti, hogy mely értesítések jelenjenek meg alkalmazásaiban és eszközein"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"A munkaprofil értesítéseihez való hozzáférés letiltva"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Az alkalmazások nem tudják olvasni az értesítéseket"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Kikapcsolás"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Mégse"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Engedélyezett értesítéstípusok"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Fontos, aktuális értesítések"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Beszélgetésre vonatkozó értesítések"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Figyelemfelkeltő értesítések"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Néma értesítések"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Valós idejű"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Valós idejű kommunikáció a használatban lévő alkalmazásokkal (navigáció, telefonhívások stb.)"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Beszélgetések"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS-alapú és egyéb kommunikáció"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Alapértelmezett"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Olyan értesítések, amelyek a beállításoktól függően csörgetést vagy rezgést váltanak ki"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Néma"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Olyan értesítések, amelyek sosem aktiválnak valamilyen hangot vagy rezgést"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Összes alkalmazás megjelenítése"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Módosíthatja azoknak az egyes alkalmazásoknak az értesítési beállításait, amelyek küldhetnek értesítéseket"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Az eszközön megjelenő alkalmazások"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Virtuálisvalóság-segédszolgáltatás"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Egy telepített alkalmazás sem kérte, hogy virtuálisvalóság-segédszolgáltatásként legyen futtatva."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> számára a hozzáférést a virtuálisvalóság-szolgáltatáshoz?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Megnyitás alapértelmezés szerint"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Linkek megnyitása"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Támogatott linkek megnyitása"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"A támogatott linkek ebben az alkalmazásban nyílnak meg"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Az alkalmazásban megnyitható linkek"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Megnyitás rákérdezés nélkül"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Támogatott linkek"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Egyéb alapértelmezett értékek"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Egyéb alapértelmezett beállítások"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Link hozzáadása"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Az egyes alkalmazások ellenőrizhetik a linkeket, hogy automatikusan megnyílhassanak benne."<annotation id="url">"További információ."</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ellenőrzött link</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ellenőrzött link</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">A linkek ellenőrzése megtörtént, és automatikusan megnyílnak ebben az alkalmazásban.</item>
+      <item quantity="one">A link ellenőrzése megtörtént, így automatikusan megnyílik ebben az alkalmazásban.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"További támogatott linkek keresése…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Mégse"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> támogatott link</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> támogatott link</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Hozzáadás"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Itt nyílik meg: <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> felhasználva itt: <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"belső tárhely"</string>
     <string name="storage_type_external" msgid="125078274000280821">"külső tárhely"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"A kamera használata nem engedélyezett"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Képernyőkép készítése nem engedélyezett"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Nem lehet megnyitni az alkalmazást"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Ha kérdése van, forduljon a rendszergazdához"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"További részletek"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"A rendszergazda figyelheti és kezelheti a munkaprofilhoz társított alkalmazásokat és adatokat, beleértve a beállításokat, az engedélyeket, a vállalati hozzáférést, a hálózati tevékenységeket és az eszköz helyadatait is."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"A rendszergazda figyelheti és kezelheti a felhasználóval társított alkalmazásokat és adatokat, beleértve a beállításokat, az engedélyeket, a vállalati hozzáférést, a hálózati tevékenységeket és az eszköz helyadatait is."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 korlátozás</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"A szolgáltató adatszámlálási módja eltérhet az eszközétől"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Nem tartalmazza a szolgáltatói hálózatokon használt adatforgalmat"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Nem tartalmazza a szolgáltatói hálózatokon használt adatforgalmat"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> felhasználva"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Forgalmi figyelmeztetés beáll."</string>
     <string name="data_warning" msgid="2925054658166062884">"Adatforgalmi figyelmeztetés"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(eltávolítva <xliff:g id="USER">%s</xliff:g> esetében)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(letiltva <xliff:g id="USER">%s</xliff:g> számára)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Automatikus kitöltés"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automatikus kitöltés, automatikus, kitöltés"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Jelszavak"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automatikus, kitöltés, automatikus kitöltés, jelszó"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Győződjön meg arról, hogy az alkalmazás megbízható.&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; A(z) &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; az Ön képernyőjén szereplő információk alapján határozza meg, hogy mit lehet automatikusan kitölteni."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Automatikus kitöltés"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Naplózási szint"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"A hálózati üzemmód megváltoztatása"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Előnyben részesített hálózattípus"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Szolgáltató"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Beállítások verziója"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Szolgáltatói beállítások verziószáma"</string>
     <string name="call_category" msgid="641461844504128789">"Hívás"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Szolgáltatói videohívás"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Rendszer kiválasztása"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Távolítsa el a SIM-kártyát, majd helyezze be újra. Ha a probléma továbbra is fennáll, indítsa újra az eszközt."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Próbálkozzon meg újra a SIM bekapcsolásával. Ha a probléma továbbra is fennáll, indítsa újra az eszközt."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Hálózat aktiválása"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Szolgáltatóváltás"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>: aktív"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Koppintson a SIM-beállítások frissítéséhez."</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Átváltva erre: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Ki"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kártyák"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Repülős üzemmódban elérhető hálózatok megjelenítése"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Repülős üzemmódban elérhető hálózatok keresése és csatlakozás."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Wi‑Fi-hálózatok keresése és csatlakozás"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"repülőgép, repülőgépen használható"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Hívások és SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-hívás"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nem áll rendelkezésre"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Átmenetileg nem áll rendelkezésre"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM-kártya nélkül"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Beállítások"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Hálózati beállítások"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Csatlakozás nyilvános hálózatokhoz"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"hálózati kapcsolat, internet, vezeték nélküli, mobiladat, adat, wifi, wi-fi, mobil, mobiltelefon, szolgáltató, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Repülőn használható hálózatok mutatása"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Repülős üzemmódban használható hálózatok megtekintése"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Hálózatok bekapcsolása"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Hálózatok kikapcsolása"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Biztosan visszaállítja az internetkapcsolatot?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Ezzel befejezi a hívást"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Ezzel befejezi a hívást"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Internetkapcsolat visszaállítása…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Csatlakozás javítása"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Hozzáférhetők repülős üzemmódban használható hálózatok"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Hálózatváltáshoz válassza le az ethernetet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Csatlakozott állapotban nem lehet hálózatot váltani"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Repülős üzemmód hálózatok"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> (<xliff:g id="NETWORKMODE">%2$s</xliff:g>)"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Csatlakozva"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Az internetre történő csatlakozás nem automatikus"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Szín"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Egyéb"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Általános"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Összes alkalmazás megjelenítése"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Intelligens átirányítás"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Intelligens átirányítás engedélyezve"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefonszám megadása"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Hiányzik a telefonszám."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G engedélyezése"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G adatkapcsolat használata. Segélyhívások indítására a 2G mindig be van kapcsolva."</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 4034935..2b5ebd2 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Փոփոխեք տեքստի չափը։"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Փոքրացնել"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Մեծացնել"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Օգտագործել ինքնապտտումը"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Տեքստի նմուշ"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Օզի կախարդը"</string>
@@ -405,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> մատնահետք կարգավորված է</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Ապակողպում մատնահետքով"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Կարգավորեք ձեր մատնահետքը"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Օգտագործեք ձեր մատնահետքը"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Հեռախոսն ապակողպելու, գնումները թույլատրելու կամ հավելվածներ մուտք գործելու համար պարզապես մատը հպեք մատնահետքի սկաներին։ Եղեք ուշադիր մատնահետք ավելացնելիս։ Ցանկացած ավելացված մատնահետք կարող է կատարել այս բոլոր գործողությունները։"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Ապակողպման հուսալի նախշը կամ PIN կոդը կարող է մատնահետքից ավելի ապահով լինել։"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Ամեն ինչ դուք եք վերահսկում"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Հիշեք"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Մատնահետքի սկաների գրանցած տվյալները պահվում են միայն ձեր հեռախոսում։ Ձեր տվյալները կարող եք ցանկացած պահի ջնջել կարգավորումներում։"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Ապակողպման հուսալի նախշը կամ PIN կոդը կարող է մատնահետքից ավելի ապահով լինել։"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Մատնահետքի ավելի լավ նմուշ ստեղծելու համար երբեմն կարող են օգտագործվել ձեր մատնահետքի վերջին լուսանկարները։"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Օգտագործեք ձեր մատնահետքը՝ հեռախոսն ապակողպելու կամ գնումներ թույլատրելու համար:\n\nՆշում. այս սարքն ապակողպելու համար չեք կարող օգտագործել ձեր մատնահետքը: Լրացուցիչ տեղեկություններ ստանալու համար դիմեք ձեր կազմակերպության ադմինիստրատորին:"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Օգտագործեք ձեր մատնահետքը՝ հեռախոսն ապակողպելու կամ գնումներ թույլատրելու համար:\n\nՆշում. ապակողպման հուսալի նախշը կամ PIN կոդը կարող է մատնահետքից ավելի ապահով լինել:"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Չեղարկել"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ոչ, շնորհակալություն"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Բաց թողնել"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Շարունակել"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Ընդունել"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Բաց թողնել"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Հաջորդը"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Բաց թողնե՞լ"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Բաց թողնել"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Չեղարկել"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Հպեք սենսորին"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Հպեք մատնահետքի պատկերակին և պահեք"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Այն գտնվում է ձեր հեռախոսի հետևի մասում: Հպեք ցուցամատով:"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Գտնվում է էկրանի վրա։ Փնտրեք փայլող շրջանակով մատնահետքը։"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Մատնահետքի սկաները ձեր էկրանի վրա է։ Այն գտնելու համար մատը շարժեք էկրանի վրայով։"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Սարքի և մատնահետքի սենսորի տեղադրության պատկեր"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Անուն"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Հաստատել"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Ջնջել"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Հպեք սենսորին"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Մատը դրենք սենսորի վրա և բարձրացրեք թրթռոց զգալուց հետո"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Բարձրացրեք, ապա կրկին հպեք"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Փոքր-ինչ տեղաշարժեք մատը՝ մատնահետքի տարբեր հատվածներ ավելացնելու համար"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Մատնահետքն ավելացվեց"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Այս պատկերակը ցույց է տալիս, որ դուք կարող եք ձեր ինքնությունն ու գնումները հաստատել մատնահետքի միջոցով"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Ավելի ուշ"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Որոնել"</string>
     <string name="display_settings" msgid="7197750639709493852">"Էկրան"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Ավտոմատ պտտել էկրանը"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Անջատել"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Միացնել"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Միաց․ – Դիմաճանաչման հիման վրա"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Միացնել դիմաճանաչումը"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Գույներ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Բնական"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Պայծառ"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Միացված է – Եթե նայում եք էկրանին, այն չի անջատվի։"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Անջատված է"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Հասանելի դարձրեք տեսախցիկը"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Հպեք՝ սարքերի անհատականացման ծառայությունների թույլտվությունները կառավարելու համար"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Եթե նայում եք էկրանին, այն չի անջատվի"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Ադապտիվ քնի ռեժիմում սարքն առջևի տեսախցիկի միջոցով տեսնում է, երբ ինչ-որ մեկը նայում է էկրանին։ Այս գործառույթն աշխատում է միայն ձեր սարքում, պատկերները չեն պահվում և չեն ուղարկվում Google-ին։"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Միացնել «Ուշադիր էկրան» ռեժիմը"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Նոր ծանուցումներ ստանալու դեպքում էկրանը կմիանա"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Միշտ ցույց տալ ժամը/տվյալները"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Մարտկոցի ավելի արագ սպառում"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Թավ տառատեսակով տեքստ"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Թավ տառատեսակով տեքստ"</string>
     <string name="title_font_size" msgid="570613010306330622">"Տառաչափ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Տառաչափի մեծացում կամ փոքրացում"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM քարտի կողպման կարգավորումներ"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Այլ օգտատերեր"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Սարքի հիշողություն"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Դյուրակիր հիշողություն"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Զարթուցիչներ և հիշեցումներ"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Թույլատրել կարգավորել զարթուցիչներ և հիշեցումներ"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Զարթուցիչներ և հիշեցումներ"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Թույլատրեք այս հավելվածին կարգավորել զարթուցիչներ և ժամանակացույցների հետ կապված այլ իրադարձություններ։ Դա թույլ կտա հավելվածին միանալ և գործարկվել, նույնիսկ եթե չեք օգտագործում սարքը։ Նկատի ունեցեք, որ եթե չեղարկեք այս թույլտվությունը, հավելվածը կարող է աշխատել թերություններով, մասնավորապես, հավելվածի կողմից կարգավորված զարթուցիչներն այլևս չեն աշխատի։"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"ժամանակացույց, զարթուցիչ, հիշեցում, իրադարձություն"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Օգտագործվել է <xliff:g id="USED">%1$s</xliff:g>՝ <xliff:g id="TOTAL">%2$s</xliff:g>-ից"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Օգտագործված է <xliff:g id="TOTAL">%1$s</xliff:g>-ից"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Տեղորոշման ծառայություններ"</string>
     <string name="location_title" msgid="5819154746934945021">"Իմ տեղադրությունը"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Տեղ աշխատանքային պրոֆիլի համար"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Տեղադրության օգտագործում"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Տեղորոշումն անջատած է"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> Տեղադրության տվյալները հասանելի են <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> հավելվածից <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>-ին</item>
       <item quantity="other"> Տեղադրության տվյալները հասանելի են <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> հավելվածից <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>-ին</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Տեղադրության տվյալների վերջին օգտագործումը"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Մանրամասն"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Վերջին ժամանակաշրջանում հավելվածները տեղադրության հարցում չեն արել"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ոչ մի հավելված չի օգտագործել տեղադրությունը"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Մարտկոցի շատ օգտագործում"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Մարտկոցի ցածր սպառում"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi ցանցերի և Bluetooth ազդանշանի որոնում"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi ցանցերի որոնում"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Թույլ տալ հավելվածներին և ծառայություններին որոնել Wi‑Fi ցանցեր, նույնիսկ երբ Wi-Fi-ն անջատած է: Դա կարող է բարելավել տեղորոշում օգտագործող գործառույթների և ծառայությունների աշխատանքը։"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth սարքերի որոնում"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Թույլ տալ հավելվածներին և ծառայություններին որոնել մոտակայքում գտնվող սարքեր նույնիսկ երբ Bluetooth-ն անջատած է: Դա կարող է բարելավել տեղորոշում օգտագործող գործառույթների և ծառայությունների աշխատանքը:"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Տեղորոշման ծառայություններ"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Տեղորոշման ծառայություններ աշխատանքի համար"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Ժամային գոտու որոշում տեղադրության միջոցով"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Ժամային գոտու որոշում տեղադրության միջոցով"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Թույլ է տալիս օգտագործել սարքի տեղադրությունը՝ ընթացիկ ժամային գոտին որոշելու համար։ Տեղադրության մյուս կարգավորումները (օրինակ՝ Wi‑Fi ցանցերի որոնումը) կարող են ազդել ճշգրտության վրա։"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Միացված է"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Անջատված է"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Ժամային գոտու ավտոմատ որոշումն անջատված է"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Ժամային գոտու ավտոմատ որոշումն անջատված է"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Տեղադրության միջոցով ժամային գոտու որոշումն անջատված է"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Տեղադրության միջոցով ժամային գոտու որոշումը չի աջակցվում"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Դուք չեք կարող փոփոխել տեղադրության միջոցով ժամային գոտու որոշման կարգավորումները"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Միացնել"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Մաքրել հիշողությունը"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Ապատեղադրել թարմացումները"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Որոշ գործողությունների համար ընտրել եք լռելյայն գործարկել այս հավելվածը:"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Ձեր ընտրած որոշ գործողություններ ըստ կանխադրման բացվում են այս հավելվածում։"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Դուք ընտրել եք թույտարել այս ծրագրին ստեղծել վիջեթներ և մուտք գործել իրենց տվյալներ:"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Լռելյայները կարգավորված չեն:"</string>
-    <string name="clear_activities" msgid="341345438786077236">"Մաքրել լռելյայնները"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Մաքրել կանխադրված կարգավորումները"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Հնարավոր է՝ այս ծրագիրը մշակված չէ ձեր էկրանի համար: Դուք կարող եք վերահսկել դրա` ձեր էկրանին հարմարեցումը:"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Հարցնել մեկնարկելիս"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Աստիճանակարգել հավելվածները"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Օգտվեք հատուկ հնարավորություններից՝ հարմար աշխատանքի համար։ Այս գործառույթները կարող եք փոփոխել սարքի կարգավորումներում։"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Փոխեք տառաչափը"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Էկրանի ընթերցիչներ"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Աուդիո և էկրանի տեքստ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Ենթագրեր"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Աուդիո"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Ընդհանուր"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Էկրան"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Տեքստ և էկրան"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Էկրանի մգացում"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Կարմիր-կանաչ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Կարմիր-կանաչ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Կապույտ-դեղին"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Նվազեցնել պայծառությունը"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Պայծառության նվազեցում"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Ավելի մգացրեք հեռախոսի էկրանը, քան նվազագույն պայծառության դեպքում"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Ավելի մգացրեք պլանշետի էկրանը, քան նվազագույն պայծառության դեպքում"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Ավելի մգացրեք էկրանը՝ հարմար կարդալու համար։&lt;br/&gt;&lt;br/&gt; Դա կարող է օգնել, երբ. &lt;ol&gt; &lt;li&gt; Նվազագույն պայծառության ժամանակ հեռախոսի էկրանը դեռ շատ պայծառ է։t&lt;/li&gt; &lt;li&gt; Դուք օգտագործում եք հեռախոսը մթության մեջ, օրինակ, գիշերը կամ մութ սենյակում՝ քնելուց առաջ։&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3102,7 +3123,7 @@
     <string name="user_delete_button" msgid="3833498650182594653">"Ջնջել"</string>
     <string name="user_guest" msgid="4545590092001460388">"Հյուր"</string>
     <string name="user_exit_guest_title" msgid="2653103120908427236">"Հեռացնել հյուրին"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Հեռացնե՞լ հյուրին:"</string>
+    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Հեռացնե՞լ հյուրին"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Այս աշխատաշրջանի բոլոր ծրագրերն ու տվյալները կջնջվեն:"</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Հեռացնել"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Միացնել հեռախոսազանգերը"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"դեմք"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"մատնահետք, ավելացնել մատնահետք"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"խամրեցված էկրան, հպէկրան, մարտկոց, խելացի պայծառություն, դինամիկ պայծառություն, ավտոմատ պայծառություն"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"խամրած էկրան, քնի ռեժիմ, մարտկոց, ժամանակի սպառում, ուշադրություն, էկրան, ցուցադրել, անգործուն ռեժիմ"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"պտտել, շրջել, պտույտ, ուղղաձիգ, հորիզոնական, դիրք, դիմանկար, բնանկար"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"թարմացնել, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"չանհանգստացնել, ժամանակացույց, ծանուցումներ, արգելափակել, անձայն ռեժիմ, թրթռալ, քուն, աշխատանք, կենտրոնացում, ձայն, անջատել ձայնը, օր, աշխատանքային օր, հանգստյան օր, աշխատանքային օրվա երեկո, միջոցառում"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"էկրան, կողպման ժամանակը, անջատում, կողպէկրան"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Զանգերանգներ"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Այլ ձայներ և թրթռոցներ"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Ծանուցումներ"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Զրույց"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Վերջերս ուղարկված"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ցուցադրել վերջին 7 օրվա բոլոր հավելվածները"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Լրացուցիչ"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Ընդհանուր"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Աշխատանքային ծանուցումներ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Հարմարվող ծանուցումներ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Հարմարվող ծանուցումների առաջնահերթություն"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Ցուցադրել իջնող վահանակի վրա, կարգավիճակի գոտում և կողպէկրանին"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Թաքցնել անձայն ծանուցումները կարգավիճակի գոտում"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Թարթող լույս"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Ծանուցումներ կողպէկրանին"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Գաղտնիություն"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Բաց թողնել կողպէկրանը"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Դեմքով ապակողպելուց հետո անցնել վերջին օգտագործած էկրանին"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Էկրանի կողպում, կողպէկրան, բաց թողնել, շրջանցել"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="other">Շաբաթական ~<xliff:g id="NUMBER_1">%d</xliff:g> ծանուցում</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Երբեք"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Ծանուցումների օգտագործում"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Սարքերի և հավելվածների ծանուցումներ"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Կառավարեք ձեր հավելվածներում և սարքերում ծանուցումների ցուցադրման կարգավորումները"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Աշխատանքային պրոֆիլի ծանուցումների մուտքն արգելափակված է"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Ծրագրիը չի կարող կարդալ ծանուցումները"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Անջատել"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Չեղարկել"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Թույլատրված ծանուցումների տեսակներ"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Ընթացիկ կարևոր ծանուցումներ"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Զրույցների ծանուցումներ"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Նախազգուշացնող ծանուցումներ"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Անձայն ծանուցումներ"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Իրական ժամանակում"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Իրական ժամանակում հաղորդակցում օգտագործվող հավելվածներից, նավիգացիա, հեռախոսազանգեր և այլն"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Զրույցներ"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS և հաղորդակցման այլ միջոցներ"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Կանխադրված"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Ծանուցումներ, որոնց դեպքում հեռախոսը կարող է զնգալ կամ թրթռալ (կախված կարգավորումներից)"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Անձայն"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Ծանուցումներ, որոնք միշտ անձայն են կամ երբեք չեն թրթռում"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Դիտել բոլոր հավելվածները"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Փոխեք ծանուցումների կարգավորումները հավելվածների համար, որոնք կարող են ուղարկել ծանուցումներ"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Հավելվածներ, որոնք ցուցադրվում են սարքում"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR օգնության ծառայություններ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Տեղադրված հավելվածներից ոչ մեկը որպես VR օգնության ծառայություն գործարկվելու հարցում չի ուղարկել:"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Թույլատրե՞լ VR ծառայությանն օգտագործել <xliff:g id="SERVICE">%1$s</xliff:g> ծառայությունը:"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Բացել ըստ կանխադրման"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Հղումների բացում"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Բացել աջակցվող հղումները"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Աջակցվող հղումները բացվում են այս հավելվածում"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Հղումներ, որոնք պետք է բացվեն այս հավելվածում"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Բացել առանց հարցնելու"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Աջակցվող հղումներ"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Այլ կանխադրված կարգավորումներ"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Այլ կանխադրված կարգավորումներ"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Ավելացնել հղում"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Հավելվածը կարող է հաստատել հղումները՝ դրանք հավելվածում ավտոմատ բացելու համար։ "<annotation id="url">"Իմանալ ավելին"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> հաստատված հղում</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> հաստատված հղում</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Այս հղումները հաստատված են և ավտոմատ բացվում են այս հավելվածում։</item>
+      <item quantity="other">Այս հղումները հաստատված են և ավտոմատ բացվում են այս հավելվածում։</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Եղավ"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Ստուգվում է աջակցվող այլ հղումների առկայությունը…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Չեղարկել"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> աջակցվող հղում</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> աջակցվող հղում</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Ավելացնել"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Բացվում է <xliff:g id="APP_LABEL">%s</xliff:g> հավելվածում"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"Զբաղված է <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>ում՝ <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"ներքին հիշողություն"</string>
     <string name="storage_type_external" msgid="125078274000280821">"արտաքին հիշողություն"</string>
@@ -4019,7 +4065,7 @@
     <string name="filter_enabled_apps" msgid="8868356616126759124">"Տեղադրված հավելվածներ"</string>
     <string name="filter_instant_apps" msgid="2292108467020380068">"Ակնթարթային հավելվածները"</string>
     <string name="filter_notif_all_apps" msgid="2764590815789208306">"Հավելվածներ՝ բոլորը"</string>
-    <string name="filter_notif_blocked_apps" msgid="1065653868850012325">"Ծանուցումներն անջատած են"</string>
+    <string name="filter_notif_blocked_apps" msgid="1065653868850012325">"Ծանուցումներն անջատված են"</string>
     <string name="filter_notif_urgent_channels" msgid="875381675739324318">"Կատեգորիաներ՝ հրատապ կարևորություն"</string>
     <string name="filter_notif_low_channels" msgid="2163005243095264537">"Կատեգորիաներ՝ ցածր կարևորություն"</string>
     <string name="filter_notif_blocked_channels" msgid="1131444963543380495">"Կատեգորիաներ՝ անջատված"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Տեսախցիկի օգտագործումն արգելված է"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Էկրանի պատկերի պահպանումը արգելված է"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Հնարավոր չէ բացել հավելվածը"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Եթե հարցեր ունեք, դիմեք ձեր ադմինիստրատորին"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Մանրամասն"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Ձեր ադմինիստրատորը կարող է վերահսկել և կառավարել ձեր աշխատանքային պրոֆիլի հետ առնչվող հավելվածները և տվյալները, ներառյալ կարգավորումները, թույլտվությունները, կորպորատիվ մուտքը, ցանցային գործունեությունը և սարքի տեղադրության տվյալները:"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Ձեր ադմինիստրատորը կարող է վերահսկել և կառավարել այս օգտատիրոջ հետ առնչվող հավելվածները և տվյալները, ներառյալ կարգավորումները, թույլտվությունները, կորպորատիվ մուտքը, ցանցային գործունեությունը և սարքի տեղադրության տվյալները:"</string>
@@ -4348,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> սահմանափակում</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Օպերատորի վիճակագրությունը կարող է տարբերվել սարքի տվյալներից։"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Չեն հետագծվում այն ցանցերի տվյալները, որոնք սպասարկվում են օպերատորների կողմից"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Օպերատորների կողմից սպասարկվող ցանցերի տվյալները չեն հետագծվում"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Օգտագործվել է <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Նախազգուշացում դնել"</string>
     <string name="data_warning" msgid="2925054658166062884">"Նախազգուշացում"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(հեռացված է <xliff:g id="USER">%s</xliff:g> օգտատիրոջ համար)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(անջատված է <xliff:g id="USER">%s</xliff:g> օգտատիրոջ համար)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Ինքնալրացման ծառայություն"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"ավտոմատ, լրացնել, ինքնալրացում"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Գաղտնաբառեր"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"ավտոմատ, լրացում, ինքնալրացում, գաղտնաբառ"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Համոզվեք, որ վստահում եք այս հավելվածին&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt;-ն օգտագործում է էկրանի բովանդակությունը՝ որոշելու, թե ինչը կարող է ինքնալրացվել:"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Ինքնալրացում"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Գրանցման մակարդակ"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Ցանցի աշխատանքի ռեժիմի փոփոխություն"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Ցանցի նախընտրելի տեսակը"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Օպերատոր"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Կարգավորումների տարբերակ"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Օպերատորի կարգավորումների տարբերակը"</string>
     <string name="call_category" msgid="641461844504128789">"Զանգ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Տեսազանգեր բջջային ցանցի միջոցով"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Համակարգի ընտրությում"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Հանեք, այնուհետև նորից տեղադրեք SIM քարտը։ Եթե խնդիրը չվերանա, վերագործարկեք սարքը։"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Փորձեք նորից միացնել SIM քարտը։ Եթե խնդիրը չվերանա, վերագործարկեք սարքը։"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ցանցի ակտիվացում"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Անցում այլ օպերատորի"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ցանցն ակտիվ է"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Հպեք՝ SIM քարտի կարգավորումները թարմացնելու համար"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Միացել է <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ի ցանցին"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Անջատված է"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Ինտերնետ"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM քարտեր"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Ցանցեր, որոնք անվտանգ են ինքնաթիռում"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Գտնել ցանցեր, որոնք անվտանգ են ինքնաթիռում, և միանալ դրանց։"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Գտեք Wi‑Fi ցանցեր և միացեք դրանց"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ինքնաթիռ, ինքնաթիռում անվտանգ"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Զանգեր և SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Զանգեր Wi-Fi-ով"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"անհասանելի է"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Ժամանակավորապես անհասանելի է"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM քարտ չկա"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Կարգավորումներ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Ցանցի կարգավորումներ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Միանալ հանրային ցանցերին"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"կապ, համացանց, անլար, ինտերնետ, wifi, wi-fi, wi fi, բջջային, շարժական, բջջային օպերատոր, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ցանցեր, որոնք անվտանգ են ինքնաթիռում"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Ցուցադրվում են ցանցերը, որոնք անվտանգ են ինքնաթիռում"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Միացնել ցանցերը"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Անջատել ցանցերը"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Վերակայե՞լ ինտերնետ կապը"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Զանգը կավարտվի"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Զանգը կավարտվի"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Ինտերնետ կապը վերակայվում է…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Շտկել կապի խնդիրը"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Ավիառեժիմում հասանելի ցանցեր"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Այլ ցանցի անցնելու համար անջատեք Ethernet-ը"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Հնարավոր չէ անցնել այլ ցանցի, երբ կապ է հաստատված"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Ցանցեր, որոնք անվտանգ են ինքնաթիռում"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Միացած է"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Չհաջողվեց ավտոմատ միանալ համացանցին"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Գույն"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Այլ"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Ընդհանուր"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Դիտել բոլոր հավելվածները"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Խելացի վերահասցեավորում"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Խելացի վերահասցեավորումը միացված է"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Մուտքագրեք հեռախոսահամար"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Հեռախոսահամարը նշված չէ։"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Եղավ"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G ցանցը միացնելու թույլտվություն"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Օգտագործեք 2G բջջային կապը։ Շտապ կանչերի համար 2G-ն միշտ միացված է։"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 632fbb6..ede883f 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Buat teks di layar jadi lebih kecil atau lebih besar."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Buat lebih kecil"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Buat lebih besar"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Gunakan Putar Otomatis"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Teks contoh"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Penyihir Oz yang Menakjubkan"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> sidik jari disiapkan</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Membuka kunci dengan sidik jari"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Siapkan sidik jari Anda"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Menggunakan sidik jari"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Cukup sentuh sensor sidik jari untuk membuka kunci ponsel, memberi otorisasi untuk pembelian, atau login ke aplikasi. Berhati-hatilah dengan sidik jari yang Anda tambahkan. Satu sidik jari yang ditambahkan dapat melakukan semua hal ini."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Sidik jari Anda mungkin kurang aman dibandingkan dengan PIN atau pola yang rumit."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Anda memegang kendali"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Ingat"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Data yang direkam dengan Sidik Jari disimpan dengan aman dan hanya ada di ponsel Anda. Anda dapat menghapus data kapan saja di Setelan."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Sidik jari Anda mungkin kurang aman dibandingkan dengan PIN atau pola yang rumit."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Ponsel Anda terkadang akan menggunakan gambar sidik jari terbaru Anda untuk membuat model sidik jari yang disempurnakan."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Gunakan sidik jari untuk membuka ponsel atau menyetujui pembelian.\n\nCatatan: Anda tidak dapat menggunakan sidik jari untuk membuka perangkat ini. Untuk informasi selengkapnya, hubungi admin organisasi Anda."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Gunakan sidik jari untuk membuka kunci ponsel atau menyetujui pembelian.\n\nCatatan: Sidik jari Anda mungkin kurang aman daripada pola atau PIN yang rumit."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Batal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Lain kali"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Lewati"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Lanjutkan"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Setuju"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Lewati"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Berikutnya"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Lewati sidik jari?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Lewati"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Batal"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Sentuh sensor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Sentuh &amp; tahan ikon sidik jari"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Ada di bagian belakang ponsel. Gunakan jari telunjuk Anda."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Sensor berada di layar. Temukan ikon sidik jari dengan lingkaran bercahaya."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Sensor sidik jari ada di layar Anda. Gerakkan jari Anda di layar untuk menemukannya."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustrasi dengan perangkat dan lokasi sensor sidik jari"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nama"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Oke"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Hapus"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Sentuh sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Letakkan jari Anda di sensor dan angkat setelah merasakan getaran"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Angkat, kemudian sentuh lagi"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Angkat dan sentuhkan jari secara berulang untuk menambahkan bagian lain dari sidik jari Anda"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Sidik jari ditambahkan"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Saat melihat ikon ini, gunakan sidik jari untuk identifikasi atau menyetujui pembelian"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Lakukan nanti"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Telusuri"</string>
     <string name="display_settings" msgid="7197750639709493852">"Tampilan"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Rotasi layar otomatis"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Nonaktif"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Aktif"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Aktif - Berbasis deteksi wajah"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Aktifkan Deteksi Wajah"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Warna"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Alami"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Ditingkatkan"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aktif / Layar tidak akan mati jika Anda sedang melihatnya"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Nonaktif"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Perlu akses kamera"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Ketuk untuk mengelola izin untuk Layanan Personalisasi Perangkat"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Mencegah layar mati jika Anda sedang melihatnya"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Fitur fokus ke layar menggunakan kamera depan untuk mengetahui apakah seseorang sedang melihat layar. Fitur ini berjalan di perangkat, dan gambar tidak pernah disimpan atau dikirimkan ke Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Aktifkan fokus ke layar"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Dalam keadaan mati, layar akan menyala saat ada notifikasi baru"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Selalu tampilkan waktu dan info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Penggunaan baterai meningkat"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Tebalkan Teks"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Tebalkan teks"</string>
     <string name="title_font_size" msgid="570613010306330622">"Ukuran font"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Membuat teks menjadi lebih besar atau lebih kecil"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Setelan kunci kartu SIM"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Pengguna lainnya"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Penyimpanan perangkat"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Penyimpanan portabel"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarm dan pengingat"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Izinkan untuk menyetel alarm atau pengingat"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarm dan pengingat"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Izinkan aplikasi ini menjadwalkan alarm atau acara berbasis waktu lainnya. Tindakan ini akan mengizinkan aplikasi aktif dan berjalan, meski Anda tidak menggunakan perangkat. Perlu diketahui bahwa pembatalan izin ini dapat menyebabkan aplikasi gagal berfungsi, khususnya alarm yang telah dijadwalkan oleh aplikasi tidak akan berfungsi lagi."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"jadwal, alarm, pengingat, acara"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Terpakai <xliff:g id="USED">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Terpakai dari <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Layanan lokasi"</string>
     <string name="location_title" msgid="5819154746934945021">"Lokasiku"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokasi untuk profil kerja"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Akses aplikasi ke lokasi"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokasi nonaktif"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> dari <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplikasi memiliki akses ke lokasi</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> dari <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> aplikasi memiliki akses ke lokasi</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Akses lokasi terbaru"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Lihat detail"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Tidak ada aplikasi yang meminta lokasi baru-baru ini"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Tidak ada aplikasi yang baru-baru ini mengakses lokasi"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Penggunaan baterai tinggi"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Penggunaan baterai rendah"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Pemindaian Wi‑Fi dan Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Pemindaian Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Izinkan aplikasi dan layanan untuk memindai jaringan Wi-Fi kapan saja, meski Wi-Fi nonaktif. Ini dapat dilakukan, misalnya, untuk menyempurnakan fitur dan layanan berbasis lokasi."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Pemindaian Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Izinkan aplikasi dan layanan untuk memindai perangkat di sekitar kapan saja, meski Bluetooth nonaktif. Ini dapat dilakukan, misalnya, untuk menyempurnakan fitur dan layanan berbasis lokasi."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Layanan Lokasi"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Layanan lokasi untuk profil kerja"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Deteksi zona waktu lokasi"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Deteksi zona waktu lokasi"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Mengizinkan penggunaan lokasi perangkat untuk mendeteksi zona waktu saat ini. Setelan lokasi lainnya seperti pemindaian Wi-Fi dapat memengaruhi akurasi deteksi zona waktu."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Aktif"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Nonaktif"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Deteksi zona waktu otomatis dinonaktifkan"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Zona waktu otomatis nonaktif"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Deteksi zona waktu lokasi dinonaktifkan"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Deteksi zona waktu lokasi tidak didukung"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Perubahan deteksi zona waktu lokasi tidak diizinkan"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Aktifkan"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Hapus penyimpanan"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Uninstal pembaruan"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Anda telah memilih meluncurkan apl ini secara default untuk beberapa tindakan."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Beberapa aktivitas yang Anda pilih terbuka di aplikasi ini secara default."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Anda telah memilih untuk mengizinkan aplikasi ini untuk membuat widget dan mengakses data mereka."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Tidak ada setelan default."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Hapus default"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Hapus preferensi default"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Apl ini mungkin tidak didesain untuk layar Anda. Anda dapat mengontrol cara menyesuaikannya dengan layar di sini."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Tanyakan saat diluncurkan"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Sesuaikan skala apl"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Anda dapat menyesuaikan perangkat ini sesuai kebutuhan. Fitur aksesibilitas ini dapat diubah nanti di Setelan."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Ubah ukuran font"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Pembaca layar"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio &amp; teks di layar"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Teks"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Umum"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Tampilan"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Teks dan tampilan"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Buat layar lebih gelap"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Merah-hijau"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Merah-hijau"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Biru-kuning"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Kurangi Kecerahan"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Kurangi kecerahan"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Membuat layar lebih gelap daripada kecerahan minimum ponsel"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Membuat layar lebih gelap daripada kecerahan minimum tablet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Buat layar lebih gelap agar Anda lebih nyaman membaca.&lt;br/&gt;&lt;br/&gt; Ini berguna saat: &lt;ol&gt; &lt;li&gt; Kecerahan minimum default ponsel masih terlalu cerah&lt;/li&gt; &lt;li&gt; Anda menggunakan ponsel di lingkungan yang gelap, seperti saat malam hari atau di kamar yang gelap sebelum tidur&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3177,7 +3198,7 @@
     <string name="preferred_network_type_title" msgid="812509938714590857">"Jenis jaringan yang dipilih"</string>
     <string name="preferred_network_type_summary" msgid="8786291927331323061">"LTE (disarankan)"</string>
     <string name="mms_message_title" msgid="6624505196063391964">"Pesan MMS"</string>
-    <string name="mms_message_summary" msgid="2855847140141698341">"Kirim &amp; terima saat kuota nonaktif"</string>
+    <string name="mms_message_summary" msgid="2855847140141698341">"Kirim &amp; terima saat data seluler nonaktif"</string>
     <string name="data_during_calls_title" msgid="3940276893360429144">"Data selama panggilan telepon"</string>
     <string name="data_during_calls_summary" msgid="2289050189544214759">"Izinkan SIM ini digunakan hanya untuk koneksi internet seluler selama panggilan telepon"</string>
     <string name="work_sim_title" msgid="8999872928646924429">"SIM yang Bekerja"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"wajah"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"sidik jari, tambahkan sidik jari"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"layar redup, layar sentuh, baterai, kecerahan smart, kecerahan dinamis, Kecerahan otomatis"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"layar redup, tidur, baterai, waktu tunggu, perhatian, tampilan, layar, tidak aktif"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"putar, balik, rotasi, potret, lanskap, orientasi, vertikal, horizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, jadwal, notifikasi, blokir, matikan suara, getar, tidur, kerja, fokus, suara, nonaktifkan notifkasi, hari, hari kerja, akhir pekan, malam hari, acara"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"layar, waktu kunci, waktu tunggu, layar kunci"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Nada dering"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Suara dan getaran lain"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifikasi"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Percakapan"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Dikirim baru-baru ini"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Lihat semua dari 7 hari terakhir"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Lanjutan"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Umum"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notifikasi kerja"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notifikasi adaptif"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioritas notifikasi adaptif"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Ditampilkan di bayangan pull-down, status bar &amp; di layar kunci"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Sembunyikan notifikasi senyap di status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Cahaya kedip"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifikasi di layar kunci"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privasi"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Lewati layar kunci"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Setelah Face Unlock, langsung buka layar yang terakhir digunakan"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Layar kunci, Layar kunci, Lewati, Abaikan"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notifikasi per minggu</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Tidak pernah"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Akses notifikasi"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Notifikasi perangkat &amp; aplikasi"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Kontrol notifikasi mana yang ditampilkan di aplikasi dan perangkat Anda"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Akses ke notifikasi profil kerja diblokir"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Aplikasi tidak dapat membaca notifikasi"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Nonaktifkan"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Batalkan"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Jenis notifikasi yang diizinkan"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Notifikasi penting yang sedang berlangsung"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Notifikasi percakapan"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Notifikasi bersuara"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Notifikasi senyap"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Real-time"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Komunikasi real-time dari aplikasi yang sedang digunakan, navigasi, panggilan telepon, dan lainnya"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Percakapan"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS and komunikasi lainnya"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Default"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Notifikasi yang dapat berdering atau bergetar berdasarkan setelan"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Senyap"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Notifikasi yang tidak pernah mengeluarkan suara atau getaran"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Lihat semua aplikasi"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Ubah setelan notifikasi untuk setiap aplikasi yang dapat mengirim notifikasi"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Aplikasi yang ditampilkan di perangkat"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Layanan bantuan VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Tidak ada aplikasi terinstall yang meminta dijalankan sebagai layanan bantuan VR"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Izinkan akses layanan VR untuk <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Buka secara default"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Membuka link"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Buka link yang didukung"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Link yang didukung terbuka di aplikasi ini"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Link yang dapat dibuka di aplikasi ini"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Buka tanpa perlu bertanya"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Link yang didukung"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Default lainnya"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Preferensi default lainnya"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Tambahkan link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Aplikasi dapat memverifikasi link agar otomatis terbuka di aplikasi. "<annotation id="url">"Pelajari lebih lanjut"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> link terverifikasi</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link terverifikasi</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Link ini terverifikasi dan terbuka di aplikasi ini secara otomatis.</item>
+      <item quantity="one">Link ini terverifikasi dan terbuka di aplikasi ini secara otomatis.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Oke"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Memeriksa link lain yang didukung…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Batal"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> link yang didukung</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link yang didukung</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Tambahkan"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Buka di <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> digunakan di <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"penyimpanan internal"</string>
     <string name="storage_type_external" msgid="125078274000280821">"penyimpanan eksternal"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Kamera tidak diizinkan"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Screenshot tidak diizinkan"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Aplikasi ini tidak dapat dibuka"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Jika ada pertanyaan, hubungi admin IT"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Detail selengkapnya"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Admin dapat memantau serta mengelola aplikasi dan data yang terkait dengan profil kerja, termasuk setelan, izin, akses perusahaan, aktivitas jaringan, dan informasi lokasi perangkat."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Admin dapat memantau serta mengelola aplikasi dan data yang terkait dengan pengguna ini, termasuk setelan, izin, akses perusahaan, aktivitas jaringan, dan informasi lokasi perangkat."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 pembatasan</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Perhitungan data oleh operator dapat berbeda dengan perhitungan perangkat"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Mengecualikan data yang digunakan oleh jaringan operator"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Mengecualikan data yang digunakan oleh jaringan operator"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Setel peringatan penggunaan data"</string>
     <string name="data_warning" msgid="2925054658166062884">"Peringatan penggunaan data"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(di-uninstal untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(dinonaktifkan untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Layanan IsiOtomatis"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"otomatis, isi, isiotomatis"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Sandi"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"otomatis, isi, isi otomatis, sandi"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Pastikan Anda memercayai aplikasi ini&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google IsiOtomatis&gt;%1$s&lt;/xliff:g&gt; menggunakan item yang ada di layar untuk menentukan item apa saja yang dapat diisi otomatis."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"IsiOtomatis"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Level logging"</string>
@@ -4872,8 +4920,8 @@
     <string name="mobile_network_list_add_more" msgid="4478586073355236604">"Tambahkan lainnya"</string>
     <string name="mobile_network_active_sim" msgid="6397581267971410039">"Aktif / SIM"</string>
     <string name="mobile_network_inactive_sim" msgid="5829757490580409899">"Tidak aktif / SIM"</string>
-    <string name="mobile_network_active_esim" msgid="4673190244386572318">"Aktif / SIM yang didownload"</string>
-    <string name="mobile_network_inactive_esim" msgid="2901035056727849007">"Tidak Aktif / SIM yang Didownload"</string>
+    <string name="mobile_network_active_esim" msgid="4673190244386572318">"Aktif / SIM hasil download"</string>
+    <string name="mobile_network_inactive_esim" msgid="2901035056727849007">"Tidak Aktif / SIM hasil download"</string>
     <string name="mobile_network_sim_name" msgid="3187192894150386537">"Nama &amp; warna SIM"</string>
     <string name="mobile_network_sim_name_label" msgid="1452440641628369625">"Nama"</string>
     <string name="mobile_network_sim_color_label" msgid="5293944087609632340">"Warna (digunakan oleh apl kompatibel)"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Ubah mode pengoperasian jaringan"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Jenis jaringan pilihan"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versi setelan"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versi setelan operator"</string>
     <string name="call_category" msgid="641461844504128789">"Memanggil"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Panggilan video operator"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Pilih sistem"</string>
@@ -4914,12 +4962,12 @@
     <string name="see_less" msgid="2642392725363552793">"Lihat lebih sedikit"</string>
     <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Aktifkan <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Aktifkan SIM?"</string>
-    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Beralih ke <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Alihkan ke <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
     <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Beralih menggunakan kartu SIM?"</string>
-    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Hanya satu SIM yang dapat diaktifkan pada satu waktu.\n\nBeralih ke <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> tidak akan membatalkan layanan <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> Anda."</string>
-    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Hanya satu SIM hasil download yang dapat diaktifkan pada satu waktu.\n\nBeralih ke <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> tidak akan membatalkan layanan <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> Anda."</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Hanya satu SIM yang dapat diaktifkan pada satu waktu.\n\nBeralih ke <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> tidak akan membatalkan layanan <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Hanya satu SIM hasil download yang dapat diaktifkan pada satu waktu.\n\nBeralih ke <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> tidak akan membatalkan layanan <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
     <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Hanya satu SIM yang dapat diaktifkan pada satu waktu.\n\nPengalihan tidak akan membatalkan layanan <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
-    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Beralih ke <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Alihkan ke <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Menghubungkan ke jaringan…"</string>
     <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Mengalihkan ke <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Tidak dapat mengalihkan operator"</string>
@@ -4930,7 +4978,7 @@
     <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Tidak dapat menonaktifkan operator"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Terjadi error dan operator Anda tidak dapat dinonaktifkan."</string>
     <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Gunakan 2 SIM?"</string>
-    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Perangkat ini dapat memiliki 2 SIM aktif sekaligus. Untuk terus menggunakan 1 SIM dalam satu waktu, ketuk \"Lain kali\"."</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Perangkat ini dapat memiliki 2 SIM aktif sekaligus. Untuk terus menggunakan 1 SIM pada satu waktu, ketuk \"Lain kali\"."</string>
     <string name="sim_action_restart_title" msgid="7054617569121993825">"Mulai ulang perangkat?"</string>
     <string name="sim_action_restart_text" msgid="8019300474703571013">"Untuk memulai, mulai ulang perangkat. Lalu, Anda dapat menambahkan SIM lain."</string>
     <string name="sim_action_continue" msgid="1688813133152389943">"Lanjutkan"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Keluarkan SIM, lalu masukkan lagi. Jika masalah berlanjut, mulai ulang perangkat."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Coba aktifkan SIM lagi. Jika masalah berlanjut, mulai ulang perangkat."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivasi jaringan"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Beralih operator"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktif"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Ketuk untuk memperbarui setelan SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Dialihkan ke <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -4958,7 +5007,7 @@
     <string name="switch_sim_dialog_no_switch_title" msgid="809763410787744247">"Tidak ada SIM aktif yang tersedia"</string>
     <string name="switch_sim_dialog_no_switch_text" msgid="7053939850026876088">"Untuk menggunakan data seluler, fitur panggilan, dan SMS di lain waktu, buka setelan jaringan"</string>
     <string name="sim_card_label" msgid="5632157635124050923">"Kartu SIM"</string>
-    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Hapus SIM yang didownload ini?"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Hapus SIM hasil download ini?"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"Menghapus SIM ini akan menghapus layanan <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> dari perangkat ini.\n\nLayanan untuk <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> tidak akan dibatalkan."</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Hapus"</string>
     <string name="erasing_sim" msgid="7877703231075699139">"Menghapus SIM …"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Nonaktif"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Tampilkan jaringan yang tersedia dalam mode pesawat"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Temukan dan hubungkan ke jaringan yang tersedia dalam mode pesawat."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Temukan dan hubungkan ke jaringan Wi-Fi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"pesawat, aman di pesawat"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Panggilan Telepon dan SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Panggilan Wi-Fi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"tidak tersedia"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tidak tersedia untuk sementara"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Tidak ada SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferensi"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferensi jaringan"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Hubungkan ke jaringan publik"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"koneksi jaringan, internet, nirkabel, data, wifi, wi-fi, wi fi, seluler, (perangkat) seluler, operator seluler, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Tampilkan jaringan mode pesawat"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Menampilkan jaringan yang tersedia dalam mode pesawat"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Aktifkan jaringan"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Nonaktifkan jaringan"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Reset internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Tindakan ini akan mengakhiri panggilan telepon"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Tindakan ini akan mengakhiri panggilan telepon"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Mereset internet …"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Perbaiki konektivitas"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Jaringan dalam mode pesawat tersedia"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Untuk beralih jaringan, lepaskan kabel ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Tidak dapat beralih jaringan saat terhubung"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Jaringan dalam mode pesawat"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Terhubung"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet tidak akan terhubung secara otomatis"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Warna"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Lainnya"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Umum"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Lihat semua aplikasi"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart Forwarding"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart Forwarding Diaktifkan"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Masukkan Nomor telepon"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Tidak ada nomor telepon."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Oke"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Izinkan 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Gunakan koneksi seluler 2G. Koneksi 2G selalu diaktifkan untuk panggilan darurat."</string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index be7fa58..b5152d5 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Stækkaðu eða minnkaðu texta á skjá."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Minnka"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Stækka"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Nota sjálfvirkan snúning"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Textadæmi"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Galdrakarlinn í Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fingraför sett upp</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Opna með fingrafari"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Skráðu fingrafarið þitt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Nota fingrafarið þitt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Snertu fingrafaralesarann til að opna símann, heimila kaup eða skrá þig inn í forrit. Farðu varlega þegar þú leyfir öðrum að bæta við fingraförum. Eitt einasta fingrafar getur framkvæmt allar þessar aðgerðir."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Fingrafar kann að vera ótraustari aðferð en sterkt mynstur eða PIN-númer."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Þú ert við stjórnvölinn"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Hafðu í huga"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Gögnin sem Fingerprint skráir eru geymd á öruggan hátt og fara aldrei úr símanum þínum. Þú getur eytt gögnunum þínum hvenær sem er í stillingunum."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Fingrafar kann að vera ótraustari aðferð en sterkt mynstur eða PIN-númer."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Síminn notar stöku sinnum nýlegar fingrafaramyndir til að búa til endurbætt fingrafaralíkön."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Notaðu fingrafarið til að taka símann úr lás eða staðfesta kaup.\n\nAthugaðu: Þú getur ekki notað fingrafarið til að taka lásinn af þessu tæki. Hafðu samband við kerfisstjóra fyrirtækisins þíns til að fá frekari upplýsingar."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Notaðu fingrafarið til að taka símann úr lás eða staðfesta kaup.\n\nAthugaðu: Fingrafar kann að vera ótraustari aðferð en sterkt mynstur eða PIN-númer."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Hætta við"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nei, takk"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Sleppa"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Halda áfram"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Samþykkja"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Sleppa"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Áfram"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Viltu sleppa fingrafari?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Sleppa"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Hætta við"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Snertu lesarann"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Haltu inni fingrafarstákninu"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Hann er aftan á símanum. Notaðu vísifingurinn."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Skynjarinn er á skjánum. Leitaðu að fingrafarinu með ljómandi hring."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Fingrafaralesarinn er á skjánum. Renndu fingrinum yfir skjáinn til að finna hann."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Teikning af tæki og staðsetningu fingrafaraskynjara"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Heiti"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Í lagi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Eyða"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Snertu lesarann"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Settu fingurinn á skynjarann og lyftu honum þegar þú finnur titring"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Snertu aftur með fingrinum"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Lyftu fingrinum endurtekið til að bæta við mismunandi hlutum fingrafarsins"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingrafari bætt við"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Þegar þú sérð þetta tákn skaltu nota fingrafarið til að auðkenna þig eða samþykkja kaup"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Gera þetta seinna"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Leit"</string>
     <string name="display_settings" msgid="7197750639709493852">"Skjár"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Snúa skjá sjálfkrafa"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Slökkt"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Kveikt"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Kveikt – út frá andliti"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Kveikja á andlitsgreiningu"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Litir"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Náttúrulegir"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Efldir"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Kveikt / Það slokknar ekki á skjánum ef þú horfir á hann"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Slökkt"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Aðgangur að myndavél er nauðsynlegur"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Ýttu til að stjórna heimildum fyrir sérstillingaþjónustu tækisins"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Kemur í veg fyrir að það slokkni á skjánum ef þú ert að horfa á hann"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Skjáskynjun notar fremri myndavélina til að sjá hvort einhver sé að horfa á skjáinn. Skjáskynjun virkar í tækinu, en myndir eru aldrei geymdar eða sendar til Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Kveikja á skjáskynjun"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Skjárinn kveikir á sér ef nýjar tilkynningar berast"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Sýna alltaf klukku og uppl."</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Aukin rafhlöðunotkun"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Feitletra texta"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Feitletra texta"</string>
     <string name="title_font_size" msgid="570613010306330622">"Leturstærð"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Gera texta stærri eða minni"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Stillingar SIM-kortaláss"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Aðrir notendur"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Geymsla tækis"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Færanleg geymsla"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Vekjarar og áminningar"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Leyfa stillingu vekjara og áminninga"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Vekjarar og áminningar"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Leyfa þessu forriti að tímasetja vekjara eða aðra viðburði sem byggjast á tímasetningu. Með þessu móti getur forritið virkjast og keyrt jafnvel þótt þú sért ekki að nota tækið. Athugaðu að ef þú afturkallar þessa heimild gæti forritið hætt að virka, nánar tiltekið hætta vekjarar sem forritið hefur tímasett að virka."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"áætlun, vekjari, áminning, viðburður"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> notuð af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Notuð af <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1621,7 +1639,7 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Hægt er að endurstilla forrit"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Endurstilla Wi-Fi, farsímagögn og Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Þetta mun endurstilla allar netkerfisstillingar, þar á meðal:\n\n"<li>"Wi‑Fi"</li>\n<li>"Farsímagögn"</li>\n<li>"Bluetooth"</li></string>
-    <string name="erase_euicc_data_button" msgid="728078969563311737">"Eyða"</string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Hreinsa"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Eyða sóttum SIM-kortum"</string>
     <string name="reset_esim_desc" msgid="3662444090563399131">"Þetta segir ekki upp neinni áskrift hjá símafyrirtæki. Til að sækja ný SIM-kort þarftu að hafa samband við símafyrirtækið þitt."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Endurstilla"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Staðsetningarþjónustur"</string>
     <string name="location_title" msgid="5819154746934945021">"Staðsetningin mín"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Staðsetning vinnusniðs"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Staðsetningarheimildir forrita"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Slökkt á staðsetningu"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> af <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> forritum hefur aðgang að staðsetningu</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> af <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> forritum hafa aðgang að staðsetningu</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Nýlegur aðgangur að staðsetningu"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Skoða upplýsingar"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Engin forrit hafa óskað eftir staðsetningu nýlega"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Engin forrit hafa nýlega haft aðgang að staðsetningu"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Mikil rafhlöðunotkun"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Lítil rafhlöðunotkun"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi-Fi leit og Bluetooth-leit"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi leit"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Leyfa forritum og þjónustu að leita að Wi-Fi netum hvenær sem er, jafnvel þegar slökkt er á Wi-Fi. Sem dæmi er hægt að nota þetta til að bæta eiginleika og þjónustu sem byggja á staðsetningu."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-leit"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Leyfa forritum og þjónustu að leita að nálægum tækjum hvenær sem er, jafnvel þegar slökkt er á Bluetooth. Sem dæmi er hægt að nota þetta til að bæta eiginleika og þjónustu sem byggja á staðsetningu."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Staðsetningarþjónustur"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Staðsetningarþjónustur fyrir vinnuna"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Staðsetningargreining tímabeltis"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Staðsetningargreining tímabeltis"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Heimilar að staðsetning tækisins sé notuð til að greina hvaða tímabelti það er í. Aðrar staðsetningarstillingar, til dæmis Wi‑Fi leit, geta haft áhrif á nákvæmni tímabeltisgreiningar."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Kveikt"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Slökkt"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Slökkt er á sjálfvirkri greiningu tímabeltis"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Slökkt er á sjálfvirku tímabelti"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Slökkt er á staðsetningargreiningu tímabeltis"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Staðsetningargreining tímabeltis er ekki studd"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Breytingar á staðsetningargreiningu tímabeltis eru ekki leyfðar"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Gera virkt"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Hreinsa úr geymslu"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Fjarlægja uppfærslur"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Þú hefur valið að nota þetta forrit sem sjálfgefið fyrir sumar aðgerðir."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Tilteknar aðgerðir sem þú velur opnast sjálfgefið í þessu forriti."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Þú hefur valið að leyfa þessu forriti að búa til græjur og fá aðgang að gögnum þeirra."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Engin sjálfgefin forrit valin."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Hreinsa sjálfgildi"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Hreinsa sjálfgefnar kjörstillingar"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Ekki er víst að þetta forrit sé hannað fyrir skjáinn þinn. Hér getur þú stjórnað því hvernig það aðlagast skjánum."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Spyrja við keyrslu"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Breyta stærð forrits"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Þú getur sérsniðið þetta tæki eftir þínum þörfum. Þessum aðgengiseiginleikum má breyta síðar í stillingunum."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Breyta leturstærð"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Skjálesarar"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Hljóð og skjátexti"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Skjátextar"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Hljóð"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Almennt"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Skjár"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texti og birting"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Dekkja skjáinn"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rauðgræn"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rauðgræn"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blágul"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Draga úr birtu"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Minnka birtu"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Gera skjáinn dekkri en lágmarksbirtustillingu símans"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Gera skjáinn dekkri en lágmarksbirtustillingu spjaldtölvunnar"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Gerðu skjáinn dekkri svo það sé þægilegra að lesa.&lt;br/&gt;&lt;br/&gt; Þetta getur gagnast þegar: &lt;ol&gt; &lt;li&gt; Sjálfgefin lágmarksbirta símans er of mikil&lt;/li&gt; &lt;li&gt; Þú notar símann í myrkri, t.d. á nóttunni eða í dimmu herbergi áður en þú ferð að sofa&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"andlit"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"fingrafar, bæta við fingrafari"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"myrkva skjá, snertiskjár, rafhlaða, birtuaðlögun, kvikt birtustig, sjálfvirkt birtustig"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"myrkva skjá, biðstaða, rafhlaða, tímamörk, skjáskynjun, skjár, aðgerðaleysi"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"snúa, spegla, snúningur, skammsnið, langsnið, stefna, lárétt, lóðrétt"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"uppfæra, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"ónáðið ekki, dagskrá, tilkynningar, setja á bannlista, þagga, titringur, sofa, vinna, fókus, hljóð, slökkva á hljóði, dagur, vikudagur, helgi, virkt kvöld, viðburður"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"skjár, lástími, tímamörk, lásskjár"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Hringitónar"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Önnur hljóð og titringur"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Tilkynningar"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Samtal"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Sent nýlega"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Sjá allt frá síðustu 7 dögum"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Ítarlegt"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Almennt"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Vinnutilkynningar"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Breytilegar tilkynningar"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Breytilegur forgangur tilkynninga"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Birta á fellisvæði, stöðustiku og lásskjá"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Fela þöglar tilkynningar á stöðustiku"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blikkandi ljós"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Tilkynningar á lásskjá"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Persónuvernd"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Sleppa lásskjá"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Eftir andlitsopnun ferðu beint á síðasta skjá"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Læsa skjá, lásskjár, sleppa, sneiða hjá"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> tilkynningar á viku</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Aldrei"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Tilkynningaaðgangur"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Tækja- og forritatilkynningar"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Stjórna því hvaða tilkynningar birtast í forritum og tækjum"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Lokað er fyrir aðgang að tilkynningu vinnuprófíls"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Forrit geta ekki lesið tilkynningar"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Slökkva"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Hætta við"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Leyfðar tilkynningategundir"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Viðvarandi mikilvægar tilkynningar"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Samtalstilkynningar"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Viðvörunartilkynningar"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Þöglar tilkynningar"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Rauntími"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Rauntímasamskipti úr forritum í notkun, leiðarlýsing, símtöl og fleira"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Samtöl"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS og önnur samskipti"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Sjálfgefið"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Tilkynningar sem gætu hringt eða titrað, allt eftir stillingum"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Hljóðlaust"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Tilkynningar sem hvorki heyrist í né titra"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Sjá öll forrit"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Breyta tilkynningastillingum fyrir öll forrit sem geta sent tilkynningar"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Forrit sem birtast í tæki"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Hjálparþjónusta sýndarveruleika"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Engin uppsett forrit hafa óskað eftir að vera keyrð sem sýndarveruleikaþjónusta."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Leyfa sýndarveruleikaaðgang fyrir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Opna sjálfgefið"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Opnar tengla"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Opna studda tengla"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Studdir tenglar opnast í þessu forriti"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Tenglar til að opna í þessu forriti"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Opna án þess að spyrja"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Studdir tenglar"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Aðrar sjálfgefnar stillingar"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Aðrar sjálfgefnar kjörstillingar"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Bæta tengli við"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Forrit getur staðfest tengla svo þeir opnist sjálfkrafa í forritinu. "<annotation id="url">"Nánar"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> staðfestur tengill</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> staðfestir tenglar</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Þessir tenglar eru staðfestir og opnast sjálfkrafa í þessu forriti.</item>
+      <item quantity="other">Þessir tenglar eru staðfestir og opnast sjálfkrafa í þessu forriti.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Í lagi"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Leitar að fleiri studdum tenglum…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Hætta við"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> studdur tengill</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> studdir tenglar</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Bæta við"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Opnast í <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> í notkun í <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"innbyggð geymsla"</string>
     <string name="storage_type_external" msgid="125078274000280821">"ytri geymsla"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Myndavél ekki leyfð"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Skjámyndir ekki leyfðar"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Ekki er hægt að opna þetta forrit"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Hafðu samband við kerfisstjórann þinn ef spurningar vakna"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Frekari upplýsingar"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Kerfisstjórinn getur fylgst með og stjórnað forritum og gögnum sem tengjast vinnusniðinu þínu, meðal annars stillingum, heimildum, fyrirtækjaaðgangi, netnotkun og staðsetningarupplýsingum tækisins."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Kerfisstjórinn getur fylgst með og stjórnað forritum og gögnum sem tengjast þessum notanda, meðal annars stillingum, heimildum, fyrirtækjaaðgangi, netnotkun og staðsetningarupplýsingum tækisins."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> takmarkanir</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Gögn símafyrirtækisins kunna að vera önnur en tækið sýnir"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Tekur ekki með gögn sem eru notuð af netkerfum símafyrirtækja"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Tekur ekki með gögn sem eru notuð af netkerfum símafyrirtækja"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> notuð"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Stilla gagnaviðvörun"</string>
     <string name="data_warning" msgid="2925054658166062884">"Gagnaviðvörun"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(fjarlægt fyrir notandann <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(óvirkt fyrir notandann <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Sjálfvirk útfyllingarþjónusta"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"sjálfvirk, útfylling, sjálfvirk útfylling"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Aðgangsorð"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"sjálfvirk, útfylling, sjálfvirk útfylling, aðgangsorð"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Gakktu úr skugga um að þú treystir þessu forriti&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Sjálfvirk útfylling Google&gt;%1$s&lt;/xliff:g&gt; notar það sem er á skjánum til að ákvarða hvað er hægt að fylla sjálfkrafa út."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Sjálfvirk útfylling"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Skráningarstig"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Breyta virknihætti símkerfis"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Valin símkerfistegund"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Símafyrirtæki"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Stillingaútgáfa"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Útgáfa stillinga símafyrirtækis"</string>
     <string name="call_category" msgid="641461844504128789">"Hringir"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Myndsímtöl um símkerfi"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Kerfisval"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Fjarlægðu SIM-kortið og settu það inn aftur. Ef vandamálið leysist ekki skaltu endurræsa tækið."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prófaðu að kveikja aftur á SIM-kortinu. Ef vandamálið leysist ekki skaltu endurræsa tækið."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Virkjun símkerfis"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Skipt um símafyrirtæki"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> er virkt"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Ýttu til að uppfæra stillingar SIM-korts"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Skipt yfir í <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -4958,9 +5007,9 @@
     <string name="switch_sim_dialog_no_switch_title" msgid="809763410787744247">"Ekkert virkt SIM-kort í boði"</string>
     <string name="switch_sim_dialog_no_switch_text" msgid="7053939850026876088">"Til að nota farsímagögn, símtalseiginleika og SMS síðar skaltu fara í netstillingar"</string>
     <string name="sim_card_label" msgid="5632157635124050923">"SIM-kort"</string>
-    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Viltu eyða þessu sótta SIM-korti?"</string>
-    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Ef þessu SIM-korti er eytt verður þjónusta <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> fjarlægð úr þessu tæki.\n\nÞjónustu <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> verður ekki sagt upp."</string>
-    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Eyða"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Viltu hreinsa þetta sótta SIM-kort?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Ef þetta SIM-kort er hreinsað verður þjónusta <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> fjarlægð úr þessu tæki.\n\nÞjónustu <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> verður ekki sagt upp."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Hreinsa"</string>
     <string name="erasing_sim" msgid="7877703231075699139">"Eyðir SIM-korti…"</string>
     <string name="erase_sim_fail_title" msgid="2024446702985862427">"Ekki er hægt að eyða SIM-korti"</string>
     <string name="erase_sim_fail_text" msgid="7870804401227483131">"Ekki er hægt að eyða þessu SIM-korti vegna villu.\n\nEndurræstu tækið og reyndu aftur."</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Slökkt"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Sýna net í flugstillingu"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Finna og tengjast netum í flugstillingu"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Finna og tengjast Wi-Fi neti"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"flugnetkerfi, öruggt flugnet"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Símtöl og SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi símtöl"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ekki tiltækt"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Ekki tiltækt í augnablikinu"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ekkert SIM-kort"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Kjörstillingar"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Netstillingar"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Tengjast opnum netum"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"nettenging, internetið, þráðlaust, gögn, wifi, wi-fi, wi fi, farsímakerfi, farsími, símafyrirtæki, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Skoða örugg netkerfi fyrir flugstillingu"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Sýnir flugstillingarnetkerfi"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Kveikja á netkerfum"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Slökkva á netkerfum"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Endurstilla internetið?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Þetta mun ljúka símtalinu"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Þetta mun ljúka símtalinu"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Endurstillir internetið…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Laga tengigetu"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Net fyrir flugstillingu í boði"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Aftengdu ethernet til að skipta um net"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ekki er hægt að skipta um net á meðan tenging er virk"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Flugnet"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Tengt"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internetið tengist ekki sjálfkrafa"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Litur"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Annað"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Almennt"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Sjá öll forrit"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Snjöll framsending"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Kveikt á snjallri framsendingu"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Slá inn símanúmer"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Símanúmer vantar."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Í lagi"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Leyfa 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Nota 2G tengingu um farsímakerfi. Alltaf er kveikt á 2G fyrir neyðarsímtöl."</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c338f20..303af27 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Ingrandisci o riduci il testo sullo schermo."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Rimpicciolisci"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Ingrandisci"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Usa la rotazione automatica"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Testo di esempio"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Il meraviglioso mago di Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> impronta configurata</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Sblocca con l\'impronta"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Imposta la tua impronta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Usa la tua impronta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Tocca il sensore di impronte digitali per sbloccare il telefono, autorizzare gli acquisti o accedere alle app. Scegli con attenzione le impronte che aggiungi: le operazioni sopra elencate possono essere svolte con qualsiasi impronta aggiunta."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"La tua impronta potrebbe essere meno sicura di una sequenza o un PIN efficaci."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Sei tu ad avere il controllo"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Ricorda"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"I dati registrati da Impronta digitale vengono memorizzati in modo sicuro sul tuo telefono e non possono essere trasferiti. Puoi eliminare i dati in qualsiasi momento in Impostazioni."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"La tua impronta potrebbe essere meno sicura di una sequenza o un PIN efficaci."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Il tuo telefono userà occasionalmente le tue immagini recenti dell\'impronta per ottimizzare la creazione dei modelli dell\'impronta."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utilizza la tua impronta per sbloccare il telefono o approvare un acquisto.\n\nNota: non puoi utilizzare la tua impronta per sbloccare questo dispositivo. Per ulteriori informazioni, contatta l\'amministratore dell\'organizzazione."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utilizza la tua impronta per sbloccare il telefono o approvare un acquisto.\n\nNota: la tua impronta potrebbe essere meno sicura di una sequenza o un codice PIN complessi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Annulla"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No grazie"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Salta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continua"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Accetto"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ignora"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Avanti"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Saltare la configurazione?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Ignora"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Annulla"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Tocca il sensore"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Tocca e tieni premuta l\'icona dell\'impronta"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Si trova sulla parte posteriore del telefono. Utilizza il dito indice."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"È sullo schermo. Cerca l\'impronta con un cerchio luminoso."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Il sensore di impronte digitali è sullo schermo. Puoi trovarlo spostando il dito sullo schermo."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustrazione con il dispositivo e la posizione del sensore di impronte"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Elimina"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Tocca il sensore"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Appoggia il dito sul sensore e sollevalo quando senti una vibrazione."</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Solleva, quindi tocca di nuovo"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Solleva ripetutamente il dito per aggiungere le varie parti dell\'impronta."</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Impronta aggiunta"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Quando vedi questa icona, usa l\'impronta per identificarti o autorizzare gli acquisti."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Più tardi"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Ricerca"</string>
     <string name="display_settings" msgid="7197750639709493852">"Display"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Rotazione automatica"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Off"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"On"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"On - Rotazione basata sul viso"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Attiva riconoscimento facciale"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Colori"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturali"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Migliorati"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Lo schermo non si spegne se lo stai guardando"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Off"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Accesso alla fotocamera necessario"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Tocca per gestire le autorizzazioni dei Servizi di personalizzazione del dispositivo"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Consente di impedire lo spegnimento dello schermo se lo stai guardando"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"La funzionalità Schermo vigile usa la fotocamera anteriore per controllare se qualcuno sta guardando lo schermo. Funziona sul dispositivo e le immagini non vengono mai memorizzate o inviate a Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Attiva Schermo vigile"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Quando lo schermo è scuro, si attiva per le nuove notifiche"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Mostra sempre ora e informazioni"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Maggiore utilizzo della batteria"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Testo in grassetto"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Testo in grassetto"</string>
     <string name="title_font_size" msgid="570613010306330622">"Dimensioni carattere"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Ingrandisci o riduci il testo"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Impostazioni blocco SIM"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Altri utenti"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Memoria dispositivo"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Memoria portatile"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Sveglie e promemoria"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Consenti di impostare sveglie o promemoria"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Sveglie e promemoria"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Consenti a questa app di programmare sveglie o altri eventi basati sull\'orario. In questo modo sarà possibile riattivare ed eseguire l\'app anche quando non usi il dispositivo. Tieni presente che la revoca di questa autorizzazione potrebbe causare il malfunzionamento dell\'app; in particolare, le eventuali sveglie programmate nell\'app non funzioneranno più."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"programmare, sveglia, promemoria, evento"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> usati di <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"utilizzati di <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Servizi di geolocalizzazione"</string>
     <string name="location_title" msgid="5819154746934945021">"La mia posizione"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Posizione per profilo di lavoro"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Accesso app a posizione"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"La geolocalizzazione non è attiva"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> app su <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> hanno accesso alla posizione</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> app su <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> ha accesso alla posizione</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Accesso recente alla posizione"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Vedi dettagli"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Nessuna app ha richiesto la posizione di recente"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nessuna app ha effettuato di recente l\'accesso alla posizone"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Elevato utilizzo della batteria"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Basso utilizzo della batteria"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Scansione Wi‑Fi e Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Ricerca di reti Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Consenti ad app e servizi di cercare reti Wi-Fi in qualsiasi momento, anche quando il Wi-Fi non è attivo. Questa funzione è utile, ad esempio, per migliorare funzioni e servizi basati sulla posizione."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Scansione di dispositivi Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Consenti ad app e servizi di cercare dispositivi nelle vicinanze in qualsiasi momento, anche quando il Bluetooth non è attivo. Questa funzione è utile, ad esempio, per migliorare funzioni e servizi basati sulla posizione."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Servizi di geolocalizzazione"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Rilevamento del fuso orario in base alla posizione"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Rilevamento del fuso orario in base alla posizione"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Consenti l\'utilizzo della posizione di questo dispositivo per rilevare il fuso orario attuale. Altre impostazioni di geolocalizzazione, come la ricerca di reti Wi-Fi, possono influire sulla precisione del rilevamento del fuso orario."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"On"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Off"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Il rilevamento automatico del fuso orario è disattivato"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Opzione Fuso orario automatico non attiva"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Il rilevamento del fuso orario in base alla posizione è disattivato"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Il rilevamento del fuso orario in base alla posizione non è supportato"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Non sono consentite modifiche relative al rilevamento del fuso orario in base alla posizione"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Attiva"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Cancella spazio di archiviazione"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Disinstalla aggiornamenti"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Hai scelto di avviare questa applicazione per impostazione predefinita per alcune azioni."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Alcune attività selezionate vengono aperte in questa app per impostazione predefinita."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Hai scelto di consentire a questa applicazione di creare widget e di accedere ai relativi dati."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Nessuna impostazione predefinita."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Cancella opzioni predefinite"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Cancella preferenze predefinite"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Questa applicazione potrebbe non essere stata ideata per il tuo schermo. Puoi stabilire come adattarla al tuo schermo qui."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Chiedi all\'avvio"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Scala applicazione"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Puoi personalizzare questo dispositivo in base alle tue esigenze. Queste funzioni di accessibilità possono essere modificate in un secondo momento nelle Impostazioni."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Cambia dimensioni carattere"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Screen reader"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio e testo su schermo"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Sottotitoli"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Generali"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Testo e display"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Scurisci lo schermo"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rosso-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rosso-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blu-giallo"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Riduci la luminosità"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Riduci la luminosità"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Rendi lo schermo più scuro della luminosità minima del telefono"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Rendi lo schermo più scuro della luminosità minima del tablet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Scurisci lo schermo per facilitare la lettura.&lt;br/&gt;&lt;br/&gt; Può essere utile quando: &lt;ol&gt; &lt;li&gt; La luminosità minima predefinita del telefono è ancora troppo chiara.&lt;/li&gt; &lt;li&gt; Usi il telefono al buio, ad esempio di notte o in una stanza buia prima di andare a letto.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"volto"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"impronta, aggiungere impronta"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"attenuazione schermo, touchscreen, batteria, luminosità intelligente, luminosità dinamica, luminosità automatica"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"oscurare lo schermo, sospensione, batteria, spegnimento, attenzione, display, schermo, inattività"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"ruotare, capovolgere, rotazione, verticale, orizzontale, orientamento"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"non disturbare, pianificare, notifiche, bloccare, silenziare, vibrazione, sospensione, lavoro, concentrazione, suono, audio disattivato, giorno, giorno feriale, fine settimana, notte di giorno feriale, evento"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"schermo, tempo blocco, spegnimento, schermata di blocco"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Suonerie"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Altri suoni e vibrazioni"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notifiche"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversazione"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Inviate di recente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Mostra tutte le app degli ultimi 7 giorni"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avanzate"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Generali"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notifiche di lavoro"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notifiche adattive"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Priorità per le notifiche adattive"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Verranno visualizzate nell\'area a discesa, nella barra di stato e nella schermata di blocco"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Nascondi le notifiche silenziose nella barra di stato"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Luce lampeggiante"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notifiche su schermata di blocco"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacy"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Ignora schermata di blocco"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Dopo lo sblocco con il volto, vai all\'ultima schermata usata"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Schermata di blocco, Schermata blocco, Salta, Ignora"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notifica alla settimana</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Mai"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Accesso alle notifiche"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Notifiche app e dispositivi"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Stabilisci quali notifiche visualizzare nelle tue app e sui tuoi dispositivi"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Accosso bloccato alle notifiche del profilo di lavoro"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Le app non possono leggere le notifiche"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Disattiva"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Annulla"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Tipi di notifiche consentiti"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Notifiche costanti importanti"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Notifiche delle conversazioni"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Notifiche di avviso"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Notifiche silenziose"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"In tempo reale"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Comunicazione in tempo reale da app in uso, navigazione, telefonate e tanto altro"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Conversazioni"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS e altre comunicazioni"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Predefinito"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Notifiche che potrebbero far squillare o vibrare il dispositivo in base alle impostazioni"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Silenzioso"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Notifiche che non emettono mai suoni o vibrazioni"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Mostra tutte le app"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Cambia le impostazioni di notifica di ogni app che può inviare notifiche"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"App mostrate sul dispositivo"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Servizi helper VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nessuna delle app installate ha richiesto di essere eseguita come servizio helper VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Consentire l\'accesso a <xliff:g id="SERVICE">%1$s</xliff:g> al servizio VR?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Apri come predefinita"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Apertura link"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Apri link supportati"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"I link supportati vengono aperti in questa app"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Link da aprire in questa app"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Apri senza chiedere conferma"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Link supportati"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Altri valori predefiniti"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Altre preferenze predefinite"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Aggiungi link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Un\'app può verificare i link da aprire automaticamente nell\'app. "<annotation id="url">"Scopri di più"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> link verificati</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link verificato</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Questi link sono stati verificati e vengono aperti automaticamente in questa app.</item>
+      <item quantity="one">Questo link è stato verificato e viene aperto automaticamente in questa app.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Controllo di altri link supportati in corso…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Annulla"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> link supportati</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link supportato</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Aggiungi"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Si apre nell\'app <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> in uso nella <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"memoria interna"</string>
     <string name="storage_type_external" msgid="125078274000280821">"memoria esterna"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Fotocamera non consentita"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Screenshot non consentiti"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Impossibile aprire questa app"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Se hai domande, contatta l\'amministratore IT"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Altri dettagli"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"L\'amministratore può monitorare e gestire le app e i dati associati al profilo di lavoro, inclusi accesso aziendale, impostazioni, autorizzazioni, attività di rete e informazioni sulla posizione del dispositivo."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"L\'amministratore può monitorare e gestire le app e i dati associati all\'utente, inclusi accesso aziendale, impostazioni, autorizzazioni, attività di rete e informazioni sulla posizione del dispositivo."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 restrizione</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"I dati dell\'operatore potrebbero differire da quelli del dispositivo"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Vengono esclusi i dati usati dalle reti dell\'operatore"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Vengono esclusi i dati usati dalle reti dell\'operatore"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Dati utilizzati: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Imposta avviso sui dati"</string>
     <string name="data_warning" msgid="2925054658166062884">"Avviso sui dati"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(disinstallato per l\'utente <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(disattivato per l\'utente <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Compilazione automatica"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automatico, compilazione, compilazione automatica"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Password"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automatica, compilazione, compilazione automatica, password"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Verifica che questa app sia attendibile&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=La Compilazione Automatica di Google&gt;%1$s&lt;/xliff:g&gt; usa ciò che è presente nella schermata per stabilire quali contenuti possono essere compilati automaticamente."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Compilazione automatica"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Livello di logging"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Cambia la modalità di funzionamento della rete"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipo di rete preferito"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operatore"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versione impostazioni"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versione delle impostazioni dell\'operatore"</string>
     <string name="call_category" msgid="641461844504128789">"Chiamata"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videochiamata dell\'operatore"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Selezione sistema"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Rimuovi la SIM e inseriscila di nuovo. Se il problema persiste, riavvia il dispositivo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Riprova ad attivare la SIM. Se il problema persiste, riavvia il dispositivo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Attivazione della rete"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Cambio di operatore in corso…"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"L\'operatore <xliff:g id="CARRIER_NAME">%1$s</xliff:g> è attivo"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tocca per aggiornare le impostazioni della SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Passaggio a <xliff:g id="CARRIER_NAME">%1$s</xliff:g> effettuato"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Mostra reti con modalità aereo"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Cerca e collegati a reti in modalità aereo."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Cerca e collegati a reti Wi-Fi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aereo, utilizzabile in aereo"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Chiamate e SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Chiamate Wi‑Fi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"Non disponibili"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Momentaneamente non disponibile"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nessuna SIM rilevata"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferenze"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferenze di rete"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connetti a reti pubbliche"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"connessione rete, internet, wireless, dati, wifi, wi-fi, wi fi, cellulare, dispositivo mobile, operatore cellulare, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Visualizza reti con modalità aereo"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Visualizzazione delle reti disponibili in modalità aereo"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Attiva reti"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Disattiva reti"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Vuoi reimpostare la connessione a Internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"La telefonata verrà terminata"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"La telefonata verrà terminata"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Reimpostazione della connessione a Internet in corso…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Risolvi problema di connettività"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Reti con modalità aereo disponibili"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Per cambiare rete, scollega il cavo Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Impossibile cambiare rete con la connessione attiva"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Reti con modalità aereo"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Connessione attiva"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"La connessione a Internet non sarà automatica"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Colore"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Altre"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Generali"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Mostra tutte le app"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Deviazione intelligente"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Funzionalità Deviazione intelligente attiva"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Inserisci numero di telefono"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Manca il numero di telefono."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Consenti 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Usa le reti cellulari 2G. Per le chiamate di emergenze, la rete 2G è sempre attiva."</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b99f446..3f43fe2 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -54,9 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"שינוי גודל הטקסט שמופיע במסך."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"הקטנה"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"הגדלה"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"שימוש בסיבוב אוטומטית"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"טקסט לדוגמה"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"הקוסם המופלא מארץ עוץ"</string>
@@ -413,15 +412,21 @@
       <item quantity="one">טביעת אצבע אחת (<xliff:g id="COUNT_0">%1$d</xliff:g>) הוגדרה</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"פתיחה עם טביעת אצבע"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"הגדרת טביעת האצבע"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"שימוש בטביעת האצבע"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"נגיעה בחיישן טביעות האצבע תבטל את נעילת הטלפון, תאשר רכישות או תאפשר כניסה לאפליקציות. יש לפעול בזהירות בהוספת טביעות אצבע. גם בעזרת טביעת אצבע אחת שמוסיפים אפשר לבצע את הפעולות האלה."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"שימוש בטביעת אצבע יכול להיות פחות מאובטח משימוש בקו ביטול נעילה או בקוד אימות."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"השליטה בידיך"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"חשוב לזכור"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"הנתונים שמתועדים ב\'טביעת אצבע\' מאוחסנים באופן מאובטח ואף פעם לא יוצאים מהטלפון. אפשר למחוק את הנתונים בכל שלב בהגדרות."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"שימוש בטביעת האצבע יכול להיות פחות מאובטח משימוש בקו ביטול נעילה או בקוד אימות חזקים."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"מדי פעם הטלפון ישתמש בתמונות האחרונות של טביעת האצבע שלך כדי ליצור מודלים משופרים של טביעת אצבע."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"שימוש בטביעת אצבע כדי לבטל את הנעילה של הטלפון או לאשר רכישות.\n\nהערה: לא ניתן להשתמש בטביעת אצבע כדי לבטל את הנעילה של המכשיר הזה. לקבלת מידע נוסף, אפשר לפנות למנהל המערכת של הארגון."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"שימוש בטביעת אצבע כדי לבטל את הנעילה של הטלפון או לאשר רכישות.\n\nהערה: שימוש בטביעת אצבע יכול להיות פחות מאובטח משימוש בקו ביטול נעילה או בקוד גישה."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ביטול"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"לא תודה"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"דילוג"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"המשך"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"אישור"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"דילוג"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"הבא"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"לא להגדיר טביעת אצבע עכשיו?"</string>
@@ -438,16 +443,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"דילוג"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"ביטול"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"נגיעה בחיישן"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"יש ללחוץ לחיצה ארוכה על סמל טביעת האצבע"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"החיישן נמצא בגב הטלפון. יש להשתמש באצבע המורה."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"הוא נמצא על המסך. יש לאתר את טביעת האצבע עם העיגול הזוהר."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"חיישן טביעות האצבע מופיע במסך. יש להזיז את האצבע על פני המסך כדי למצוא אותו."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"איור המציג את המיקום של חיישן טביעת האצבע במכשיר"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"שם"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"אישור"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"מחיקה"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"נגיעה בחיישן"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"יש להניח את האצבע על החיישן ולהרים אותה לאחר שמרגישים רטט"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"להרים ולגעת בחיישן שוב"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"יש להרים את האצבע ולגעת בחיישן עם חלקים שונים של האצבע כדי להוסיף טביעת אצבע מלאה"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"טביעת האצבע שלך נקלטה"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"כשיוצג לך הסמל הזה, משמעות הדבר היא שאפשר להשתמש בטביעת אצבע לצורכי זיהוי או לאישור רכישה"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"מאוחר יותר"</string>
@@ -1216,14 +1230,10 @@
     <string name="search_settings" msgid="7573686516434589771">"חיפוש"</string>
     <string name="display_settings" msgid="7197750639709493852">"תצוגה"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"סיבוב אוטומטי של המסך"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"כבוי"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"פועל"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"פועל – מבוסס על זיהוי פנים"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"הפעלת זיהוי פנים"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"צבעים"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"טבעי"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"מוגבר"</string>
@@ -1268,7 +1278,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"התכונה פועלת / המסך לא נכבה כשמביטים בו"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"כבוי"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"נדרשת גישה למצלמה"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"יש להקיש כדי לנהל הרשאות לשירותי התאמה אישית של מכשירים"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"התכונה מונעת מהמסך להיכבות אם מביטים בו"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"‏בעזרת התכונה \'המסך נשאר דלוק\', המכשיר מגלה באמצעות המצלמה הקדמית אם מישהו מביט במסך. התכונה פועלת במכשיר, והתמונות אף פעם לא נשמרות ולא נשלחות אל Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"המסך יישאר דלוק בזמן צפייה"</string>
@@ -1349,7 +1362,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"כשהמסך מוחשך, הוא יופעל כשיהיו התראות חדשות"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"הצגה תמידית של השעה והפרטים"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"שימוש מוגבר בסוללה"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"הדגשת הטקסט"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"הדגשת הטקסט"</string>
     <string name="title_font_size" msgid="570613010306330622">"גודל גופן"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"הגדלה או הקטנה של גודל הטקסט"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"‏הגדרות נעילת כרטיס SIM"</string>
@@ -1520,6 +1533,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"משתמשים אחרים"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"אחסון במכשיר"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"אחסון נייד"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"השכמות ותזכורות"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"הגדרה זו מתירה להגדיר השכמות ותזכורות"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"השכמות ותזכורות"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"הגדרה זו מתירה לאפליקציה לתזמן השכמות או אירועים אחרים הניתנים לתזמון. ההגדרה תאפשר לאפליקציה לצאת ממצב שינה ולפעול אפילו כאשר המכשיר לא בשימוש. לתשומת ליבך, ביטול ההרשאה הזאת עלול לגרום לתקלה באפליקציה. בייחוד כאשר מדובר בהשכמות מתוזמנות, שלא יפעלו כתוצאה מביטול ההרשאה."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"תזמון, השכמה, תזכורת, אירוע"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"נעשה שימוש ב-<xliff:g id="USED">%1$s</xliff:g> מתוך <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"בשימוש מתוך <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1769,7 +1787,8 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"שירותי מיקום"</string>
     <string name="location_title" msgid="5819154746934945021">"המיקום שלי"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"מיקום עבור פרופיל עבודה"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"גישה של האפליקציות למיקום"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"תכונת המיקום כבויה"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="two"> ל-<xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> מתוך <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> אפליקציות יש גישה למיקום</item>
@@ -1777,24 +1796,24 @@
       <item quantity="other"> ל-<xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> מתוך <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> אפליקציות יש גישה למיקום</item>
       <item quantity="one"> לאחת (<xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g>) מתוך <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> אפליקציות יש גישה למיקום</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"גישה למיקום אחרון"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"הצגת פרטים"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"אין אפליקציות שביקשו מיקום לאחרונה"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"אין אפליקציות שניגשו לאחרונה למיקום"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"שימוש בסוללה מלאה"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"שימוש בסוללה חלשה"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"‏חיפוש נקודות Wi‑Fi ו-Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"‏חיפוש נקודות Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"‏אפליקציות ושירותים יוכלו לסרוק רשתות Wi‑Fi בכל עת, גם כאשר ה-Wi‑Fi כבוי. ניתן להשתמש בכך, למשל, כדי לשפר תכונות ושירותים מבוססי מיקום."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"‏סריקת Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"‏אפליקציות ושירותים יוכלו לסרוק מכשירים בקרבת מקום בכל עת, גם כאשר ה-Bluetooth כבוי. ניתן להשתמש בכך, למשל, כדי לשפר תכונות ושירותים מבוססי מיקום."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"שירותי מיקום"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"שירותי מיקום לעבודה"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"זיהוי אזור הזמן של המיקום"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"זיהוי אזור הזמן של המיקום"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"‏מתן אישור לשימוש במיקום המכשיר כדי לזהות את אזור הזמן הנוכחי. הגדרות מיקום אחרות, כמו חיפוש נקודות Wi-Fi, יכולות להשפיע על הדיוק של זיהוי אזור הזמן."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"התכונה פועלת"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"התכונה כבויה"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"הזיהוי האוטומטי של אזור הזמן מושבת"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ההגדרה \'אזור זמן אוטומטי\' כבויה"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"זיהוי אזור הזמן של המיקום מושבת"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"אין תמיכה בזיהוי אזור הזמן של המיקום"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"אין לבצע שינויים בזיהוי אזור הזמן של המיקום"</string>
@@ -1977,10 +1996,10 @@
     <string name="enable_text" msgid="8570798764647110430">"הפעלה"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"פינוי שטח אחסון"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"להסרת התקנה של עדכונים"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"בחרת להפעיל אפליקציה זו כברירת מחדל עבור פעולות מסוימות."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"פעילויות מסוימות שבחרת נפתחות באפליקציה הזו כברירת מחדל."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"בחרת לאפשר לאפליקציה ליצור ווידג\'טים ולגשת לנתונים שלהם."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"לא הוגדרו ברירות מחדל."</string>
-    <string name="clear_activities" msgid="341345438786077236">"ניקוי ברירות מחדל"</string>
+    <string name="clear_activities" msgid="488089228657585700">"ניקוי העדפות שמוגדרות כברירת מחדל"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"ייתכן שאפליקציה זו אינה מיועדת למסך שלך. תוכל לשלוט באופן שבה היא מותאמת למסך שלך כאן."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"שאל בעת הפעלה"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"שנה קנה מידה של אפליקציה"</string>
@@ -2192,7 +2211,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ניתן להתאים אישית את המכשיר הזה כדי שיתאים לצרכיך. ניתן לשנות את תכונות הנגישות מאוחר יותר ב\'הגדרות\'."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"שינוי גודל הגופן"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"קוראי מסך"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"הקראת טקסט שמופיע במסך"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"כתוביות"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"אודיו"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"הגדרות כלליות"</string>
     <string name="display_category_title" msgid="6638191682294461408">"תצוגה"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"טקסט ותצוגה"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"הכהיית המסך"</string>
@@ -2347,7 +2368,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"אדום-ירוק"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"אדום-ירוק"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"כחול-צהוב"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"הפחתה של עוצמת הבהירות"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"הפחתה של עוצמת הבהירות"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"הפיכת המסך לכהה יותר מעוצמת הבהירות המינימלית של הטלפון"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"הפיכת המסך לכהה יותר מעוצמת הבהירות המינימלית של הטאבלט"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"‏מסך כהה יותר מקל על הקריאה.&lt;br/&gt;&lt;br/&gt; הגדרה זו עשויה להיות שימושית במקרים הבאים: &lt;ol&gt; &lt;li&gt; כשעוצמת הבהירות המינימלית של הטלפון עדיין בהירה מדי&lt;/li&gt; &lt;li&gt; כשמשתמשים בטלפון במצבים כהים, למשל בלילה או בחדר חשוך לפני השינה&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3422,8 +3443,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"פנים"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"טביעת אצבע, הוספת טביעת אצבע"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"עמעום מסך, מסך מגע, סוללה, בהירות חכמה, בהירות דינמית, בהירות אוטומטית"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"עמעום מסך, שינה, סוללה, זמן קצוב לכיבוי, המסך נשאר דלוק, תצוגה, מסך, חוסר פעילות"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"לסובב, להפוך, סיבוב, לאורך, לרוחב, כיוון, אנכי, אופקי"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"‏שדרוג, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"‏dnd, לוח זמנים, התראות חסימה, השתקה, רטט, שינה, עבודה, הדגשה, צליל, יום, יום בשבוע, סוף שבוע, לילה באמצע שבוע, אירוע"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"מסך, זמן נעילה, זמן קצוב לכיבוי, נעילת מסך"</string>
@@ -3592,9 +3615,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"רינגטונים"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"צלילים אחרים ורטט"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"התראות"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"שיחה"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"נשלחו לאחרונה"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"הצגת כל האפליקציות מ-7 הימים האחרונים"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"אפשרויות מתקדמות"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"כללי"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"התראות עבודה"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"התראות מותאמות"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"עדיפות מותאמת להתראות"</string>
@@ -3656,7 +3680,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"מוצגות בלוח ההתראות הנפתח, בשורת הסטטוס ובמסך הנעילה"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"הסתרה של התראות שקטות בשורת הסטטוס"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"אור מהבהב"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"התראות במסך הנעילה"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"פרטיות"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"דילוג על מסך הנעילה"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"מעבר למסך האחרון שהיה בשימוש לאחר שחרור נעילה בזיהוי פנים"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"מסך נעילה, דילוג, מעקף"</string>
@@ -3751,7 +3775,8 @@
       <item quantity="one">כהתראה אחת (<xliff:g id="NUMBER_0">%d</xliff:g>) לשבוע</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"אף פעם"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"גישה אל התראות"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"התראות במכשירים ובאפליקציות"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"אפשר לקבוע אילו התראות יוצגו באפליקציות ובמכשירים שלך"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"הגישה חסומה להתראות של פרופיל העבודה"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"לאפליקציות אין אפשרות לקרוא התראות"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3772,17 +3797,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"כיבוי"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"ביטול"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"סוגים מורשים של התראות"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"התראות פעילות חשובות"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"התראות על שיחות"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"התראות עם צלילים או רטט"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"התראות שקטות"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"זמן אמת"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"תקשורת בזמן אמת מאפליקציות שנמצאות בשימוש, מתוכנות ניווט, משיחות טלפון ועוד"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"שיחות"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"‏SMS ואמצעי תקשורת אחרים"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"ברירת מחדל"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"התראות שעשויות להשמיע צלצול או להפעיל רטט על סמך ההגדרות"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"שקטות"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"התראות שאף פעם לא משמיעות צלילים ולא מפעילות רטט"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"הצגת כל האפליקציות"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"שינוי של הגדרת התראות לכל אפליקציה שיכולה לשלוח התראות"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"אפליקציות שמוצגות במכשיר"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"‏שירותי מסייע של VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"‏אין אפליקציות מותקנות שביקשו הפעלה כשירותי מסייע של VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"‏האם לאפשר לשירות VR גישה אל <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4082,9 +4107,36 @@
     <string name="launch_by_default" msgid="892824422067985734">"ברירת מחדל"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"פתיחת קישורים"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"פתח קישורים נתמכים"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"קישורים נתמכים נפתחים באפליקציה הזו"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"קישורים שייפתחו באפליקציה הזו"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"פתח בלי לשאול"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"קישורים נתמכים"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"ברירות מחדל אחרות"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"העדפות אחרות שמוגדרות כברירת מחדל"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"הוספת קישור"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"אפליקציה יכולה לאמת קישורים כך שייפתחו באופן אוטומטי באפליקציה. "<annotation id="url">"מידע נוסף"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> קישורים מאומתים</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> קישורים מאומתים</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> קישורים מאומתים</item>
+      <item quantity="one">קישור מאומת אחד (<xliff:g id="COUNT_0">%d</xliff:g>)</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="two">הקישורים האלה מאומתים ונפתחים באופן אוטומטי באפליקציה הזו.</item>
+      <item quantity="many">הקישורים האלה מאומתים ונפתחים באופן אוטומטי באפליקציה הזו.</item>
+      <item quantity="other">הקישורים האלה מאומתים ונפתחים באופן אוטומטי באפליקציה הזו.</item>
+      <item quantity="one">הקישור הזה מאומת ונפתח באופן אוטומטי באפליקציה הזו.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"אישור"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"מתבצע חיפוש של קישורים נתמכים אחרים…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"ביטול"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> קישורים נתמכים</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> קישורים נתמכים</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> קישורים נתמכים</item>
+      <item quantity="one">קישור נתמך אחד (<xliff:g id="COUNT_0">%d</xliff:g>)</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"הוספה"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"נפתח באפליקציה <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"נעשה שימוש ב-<xliff:g id="SIZE">%1$s</xliff:g> ב<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"אחסון פנימי"</string>
     <string name="storage_type_external" msgid="125078274000280821">"אחסון חיצוני"</string>
@@ -4399,7 +4451,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"לא ניתן להשתמש במצלמה"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"לא ניתן לצלם צילומי מסך"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"לא ניתן לפתוח את האפליקציה הזו"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"‏יש לך שאלות נוספות? כדאי ליצור קשר עם מנהל ה-IT"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"פרטים נוספים"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"מנהל המכשיר יכול לפקח על אפליקציות ונתונים המשויכים לפרופיל העבודה שלך ולנהל אותם, כולל הגדרות, הרשאות, גישה ארגונית, פעילות הרשת ומידע על מיקום המכשיר."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"מנהל המכשיר יכול לפקח על אפליקציות ונתונים המשויכים למשתמש זה ולנהל אותם, כולל הגדרות, הרשאות, גישה ארגונית, פעילות הרשת ומידע על מיקום המכשיר."</string>
@@ -4482,7 +4535,7 @@
       <item quantity="one">הגבלה אחת</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ייתכן שחישוב השימוש בנתונים אצל הספק יהיה שונה מזה שבמכשיר"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"לא כולל נתונים שמשמשים את רשתות הספק"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"לא כולל נתונים שמשמשים את רשתות הספק"</string>
     <string name="data_used_template" msgid="8229342096562327646">"נעשה שימוש ב-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"מתי תופיע אזהרת שימוש בנתונים"</string>
     <string name="data_warning" msgid="2925054658166062884">"אזהרה לגבי שימוש בנתונים"</string>
@@ -4845,7 +4898,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(ההתקנה הוסרה אצל <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"‏(WebView מושבתת אצל <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"שירות מילוי אוטומטי"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"‏אוטומטי, אוטומטית, מילוי, מילוי אוטומטי, autofill"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"סיסמאות"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"אוטומטי, מילוי, מילוי אוטומטי, סיסמה"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"‏&lt;b&gt;ודא שאתה סומך על האפליקציה הזו&lt;/b&gt;‏ ‏&lt;br/&gt; &lt;br/&gt;‏ ‏&lt;xliff:g id=app_name example=Google Autofill&gt;‏%1$s‏&lt;/xliff:g&gt; ניגשת למידע המופיע במסך כדי לזהות אילו שדות אפשר למלא באופן אוטומטי."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"מילוי אוטומטי"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"רמת רישום ביומן"</string>
@@ -5054,7 +5108,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"שינוי מצב ההפעלה של הרשת"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"סוג רשת מועדפת"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ספק"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"גרסת הגדרות"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"גרסה של הגדרות ספקים"</string>
     <string name="call_category" msgid="641461844504128789">"שיחות"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"שיחות וידאו באמצעות הספק הסלולרי"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"בחירת מערכת"</string>
@@ -5103,6 +5157,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‏יש להוציא את ה-SIM ולהכניס אותו חזרה. אם הבעיה נמשכת, יש להפעיל מחדש את המכשיר."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"‏יש להפעיל שוב את ה-SIM. אם הבעיה נמשכת, יש להפעיל מחדש את המכשיר."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"הפעלת רשת"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"החלפת ספק"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> פעיל"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"‏יש להקיש כדי לעדכן את ההגדרות של כרטיס ה-SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"עברת אל <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5267,8 +5322,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"התכונה כבויה"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"אינטרנט"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"‏כרטיסי SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"הצגת רשתות הזמינות במצב טיסה"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"חיפוש רשתות הזמינות במצב טיסה והתחברות אליהן."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"‏איתור של רשתות Wi-Fi וחיבור אליהן"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"טיסה, בטוח לטיסה"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"‏שיחות והודעות SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"‏שיחות Wi-Fi"</string>
@@ -5282,22 +5336,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"לא זמין"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"לא זמין באופן זמני"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"‏אין כרטיס SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"העדפות"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"העדפות רשת"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"חיבור לרשתות ציבוריות"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏חיבור לרשת, אינטרנט, אלחוטי, נתונים, Wi-Fi, wi-fi, wi fi, סלולרי, נייד, ספק סלולרי, 4g,‏ 3g,‏ 2g,‏ lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"הצגת רשתות בטוחות למצב טיסה"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"מוצגות רשתות הזמינות למצב טיסה"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"הפעלת רשתות"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"כיבוי רשתות"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"לאפס את החיבור לאינטרנט?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"הפעולה תגרום לסיום שיחת הטלפון"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"הפעולה תגרום לסיום שיחת הטלפון"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"מתבצע איפוס של החיבור לאינטרנט…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"תיקון קישוריות"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"רשתות מצב טיסה זמינות"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"כדי לעבור בין רשתות, יש לנתק את האתרנט"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"לא ניתן להחליף רשתות כשיש חיבור לרשת אתרנט"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"רשתות הזמינות במצב טיסה"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"מחובר"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"לא ניתן להתחבר לאינטרנט באופן אוטומטי"</string>
@@ -5318,6 +5371,10 @@
     <string name="category_name_color" msgid="937514550918977151">"צבע"</string>
     <string name="category_name_others" msgid="2366006298768550310">"אחרות"</string>
     <string name="category_name_general" msgid="7737273712848115886">"כללי"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"הצגת כל האפליקציות"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"העברת שיחות חכמה"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"העברת השיחות החכמה פועלת"</string>
@@ -5331,4 +5388,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"הזנת מספר הטלפון"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"חסר מספר טלפון."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"אישור"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"‏אישור שימוש ב-2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"‏שימוש בחיבור לרשת סלולרית של 2G. נתוני 2G תמיד פועלים כדי שניתן יהיה לבצע שיחות חירום."</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ad94147..7ecdb3e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"縮小"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"拡大"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"自動回転を使用する"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"顔ベースの自動回転は前面カメラを使用して、ユーザーが画面を見ているかどうか、どのように見ているかを検出します。横になった状態でも読み取りが可能です。画像が保存されたり、Google に送信されたりすることはありません。&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;詳細&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"サンプル テキスト"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"オズの魔法使い"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"第 11 章: オズの不思議なエメラルド シティ"</string>
@@ -403,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g>個の指紋を登録済み</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"指紋によるロック解除"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"指紋の設定"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"指紋の使用"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"指紋認証センサーに触れるだけで、スマートフォンのロック解除、購入の承認、アプリへのログインを行うことができます。こうした操作は、登録したどの指紋でも行えるため、誰の指紋を登録するかについては十分にご注意ください。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"指紋は複雑なパターンや PIN よりも安全面で劣る場合があります。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"自分で管理"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"注意事項"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"指紋によって記録されたデータはスマートフォンにのみ、安全に保存されます。データは [設定] でいつでも削除できます。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"指紋は複雑なパターンや PIN よりも安全面で劣る場合があります。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"スマートフォンに保存された最近の指紋画像は、指紋モデルの改善のために使用されることがあります。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"指紋を使って、スマートフォンのロック解除や購入の承認を行います。\n\n注: 指紋を使ってこのデバイスのロックを解除することはできません。詳しくは、組織の管理者にお問い合わせください。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"指紋を使って、スマートフォンのロック解除や購入の承認を行います。\n\n注: 指紋は複雑なパターンや PIN よりも安全面で劣る場合があります。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"キャンセル"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"利用しない"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"スキップ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"次へ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"同意する"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"スキップ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"次へ"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"指紋の設定をスキップしますか？"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"スキップ"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"キャンセル"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"センサーに触れる"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"指紋アイコンを長押し"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"スマートフォンの背面にあります。人差し指を使用します。"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"センサーは画面上にあります。光る円で指紋が表示されています。"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"指紋認証センサーは画面上にあります。画面上で指を移動すると、見つかります。"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"デバイスの指紋認証センサーの位置を示した図"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"名前"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"削除"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"センサーに触れる"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"指をセンサーに当て、振動したら離します。"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"指をタッチして離す"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"指を何度か離して、あらゆる角度から指紋を登録します。"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"指紋の登録完了"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"このアイコンが表示されているときは、本人確認や購入の承認に指紋認証を使用できます"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"後で行う"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ON / 見ている間は画面が OFF になりません"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"OFF"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"カメラへのアクセス権限が必要です"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"タップすると、デバイス パーソナライズ サービスのアクセス権限を管理できます"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"見ている間は画面が OFF になりません"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"スクリーン アテンションは前面カメラを使用して、ユーザーが画面を見ているかどうかを検出します。この検出はデバイスのみで行われます。画像が保存されたり、Google に送信されたりすることはありません。"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"スクリーン アテンションを ON にする"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"画面が暗いときに新着の通知が届いた場合、画面を ON にします"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"時間と情報を常に表示"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"電池使用量が増えます"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"テキストを太字にする"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"テキストを太字にする"</string>
     <string name="title_font_size" msgid="570613010306330622">"フォントサイズ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"テキストのサイズを変更します"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM カードロック設定"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"その他のユーザー"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"デバイスのストレージ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"外部ストレージ"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"アラームとリマインダー"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"アラームやリマインダーの設定を許可"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"アラームとリマインダー"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"このアプリに、アラームやその他のタイミング ベースのイベントをスケジュールすることを許可します。これにより、ユーザーがデバイスを使用していないときでも、アプリが復帰して実行できるようになります。この権限を取り消すと、アプリの動作不良が発生することがあります。特に、アプリがスケジュールしたアラームはすべて動作しなくなります。"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"スケジュール, アラーム, リマインダー, イベント"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>"<xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"/ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"位置情報サービス"</string>
     <string name="location_title" msgid="5819154746934945021">"現在地"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"仕事用プロファイルで位置情報を使用"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"位置情報へのアプリのアクセス"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"位置情報は OFF です"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> 個中 <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> 個のアプリに位置情報へのアクセスを許可しています</item>
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> 個中 <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> 個のアプリに位置情報へのアクセスを許可しています</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"位置情報への最近のアクセス"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"詳細を表示"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"位置情報を最近リクエストしたアプリはありません"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"位置情報に最近アクセスしたアプリはありません"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"電池使用量: 高"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"電池使用量: 低"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi のスキャンと Bluetooth のスキャン"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi スキャン"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"アプリやサービスに対し、Wi‑Fi が OFF の場合でも、常に Wi-Fi ネットワークをスキャンすることを許可します。この設定は、位置情報を使用する機能やサービスの改善などに役立ちます。"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetoothのスキャン"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"アプリやサービスに対し、Bluetooth が OFF の場合でも、常に付近のデバイスをスキャンすることを許可します。この設定は、位置情報を使用する機能やサービスの改善などに役立ちます。"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"位置情報サービス"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"仕事用プロファイル向けの位置情報サービス"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"位置情報によるタイムゾーン検出"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"位置情報によるタイムゾーン検出"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"デバイスの位置情報を使用して、現在のタイムゾーンを検出できるようにします。タイムゾーンの検出精度は、Wi-Fi スキャンなどの位置情報の設定によって異なります。"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ON"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"OFF"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"タイムゾーンの自動検出が無効です"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"タイムゾーンの自動設定は OFF です"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"位置情報によるタイムゾーン検出は無効です"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"位置情報によるタイムゾーン検出はサポートされていません"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"位置情報によるタイムゾーン検出は変更できません"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"有効にする"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"ストレージを消去"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"アップデートのアンインストール"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"特定の操作で使用するデフォルトのアプリとして設定されています。"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"デフォルトでは、選択した一部のアクティビティがこのアプリ内で開きます。"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"このアプリによるウィジェットの作成とデータへのアクセスを許可しました。"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"設定されていません。"</string>
-    <string name="clear_activities" msgid="341345438786077236">"設定を消去"</string>
+    <string name="clear_activities" msgid="488089228657585700">"デフォルトの設定をクリア"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"このアプリはお使いの画面用に設計されていない可能性があります。ここでお使いの画面に合わせて設定できます。"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"起動時に確認する"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"アプリを拡大/縮小"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"このデバイスを必要に応じてカスタマイズできます。このユーザー補助機能は後から [設定] で変更できます。"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"フォントサイズを変更する"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"スクリーン リーダー"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"音声と画面上のテキスト"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"字幕"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"音声"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"全般"</string>
     <string name="display_category_title" msgid="6638191682294461408">"表示"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"テキストとディスプレイ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"画面を暗くする"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"赤 / 緑"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"赤 / 緑"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"青 / 黄"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"明るさを下げる"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"明るさを下げる"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"スマートフォンで設定できる最低限の明るさよりも画面を暗くします"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"タブレットで設定できる最低限の明るさよりも画面を暗くします"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"画面を暗くして表示を見やすくします。&lt;br/&gt;&lt;br/&gt; 次のような場合に便利です。&lt;ol&gt; &lt;li&gt; デフォルトの最低限の明るさでも、スマートフォンの画面が明るすぎる&lt;/li&gt; &lt;li&gt; 夜の時間帯や就寝前の照明を消した部屋など、暗い場所でスマートフォンを使用している&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"顔"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"指紋, 指紋の追加"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"画面を暗くする, タッチスクリーン, 電池, スマート ブライトネス, ダイナミック ブライトネス, 明るさの自動調整"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"画面を暗くする, スリープ, 電池, 消灯, アテンション, ディスプレイ, 画面, 操作が行われていない"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"回転, 切り替え, ローテーション, 縦向き, 横向き, 画面の向き, 縦, 横"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"アップグレード, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"マナーモード, スケジュール, 通知, ブロック, 消音, バイブレーション, スリープ, 仕事, 集中, 通知音, ミュート, 日, 平日, 週末, 平日の夜, イベント"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"画面, ロック時間, 消灯, ロック画面"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"着信音"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"その他の音やバイブレーション"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"通知"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"会話"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"通知を最近送信したアプリ"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"過去 7 日間をすべて表示"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"詳細設定"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"全般"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"仕事用プロファイルの通知"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"通知の自動調整"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"通知の自動調整の優先度"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"プルダウン シェード、ステータスバー、ロック画面に表示されます"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ステータスバーにサイレント通知を表示しない"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"点滅"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"ロック画面上の通知"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"プライバシー"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ロック画面をスキップ"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"顔認証後、最後に使用していた画面に直接移動する"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ロック 画面, ロック画面, スキップ, バイパス"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="one">週に約 <xliff:g id="NUMBER_0">%d</xliff:g> 件の通知</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"なし"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"通知へのアクセス"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"デバイスとアプリの通知"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"アプリやデバイスで表示する通知を管理します"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"仕事用プロファイルの通知へのアクセスがブロックされています"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"アプリは通知を読み取ることができません"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3663,24 +3694,24 @@
     <string name="no_notification_listeners" msgid="2839354157349636000">"通知へのアクセスをリクエストしたインストール済みアプリはありません。"</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"通知へのアクセスを許可"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"通知へのアクセスを<xliff:g id="SERVICE">%1$s</xliff:g>に許可しますか？"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> はすべての通知を読み取ることができます。通知には、連絡先名などの個人情報や受信したメッセージの本文も含まれます。また、通知を非表示にしたり、電話に出るなどの通知内のボタン操作を実行したりすることもできます。\n\nこれにより、アプリがサイレント モード設定を切り替えたり、関連する設定を変更したりすることも可能になります。"</string>
-    <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"<xliff:g id="SERVICE">%1$s</xliff:g>での通知へのアクセスを許可しますか？"</string>
-    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> はすべての通知を読み取ることができます。通知には、連絡先名などの個人情報や受信したメッセージの本文も含まれます。また、通知を非表示にしたり、電話に出るなどの通知内のボタン操作を実行したりすることもできます。\n\nこれにより、アプリがサイレント モード設定を切り替えたり、関連する設定を変更したりすることも可能になります。"</string>
+    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> がすべての通知を読み取れるようになります。通知には、連絡先名などの個人情報や受信したメッセージの本文も含まれます。また、通知を非表示にしたり、電話に出るなど、通知内の操作ボタンをタップしたりすることも許可されます。\n\nこれにより、アプリがサイレント モード設定を切り替えたり、関連する設定を変更したりすることも可能になります。"</string>
+    <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"<xliff:g id="SERVICE">%1$s</xliff:g> による通知へのアクセスを許可しますか？"</string>
+    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> がすべての通知を読み取れるようになります。通知には、連絡先名などの個人情報や受信したメッセージの本文も含まれます。また、通知を非表示にしたり、電話に出るなど、通知内の操作ボタンをタップしたりすることも許可されます。\n\nこれにより、アプリがサイレント モード設定を切り替えたり、関連する設定を変更したりすることも可能になります。"</string>
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> の通知アクセスを OFF にすると、サイレント モードのアクセスも OFF になります。"</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"OFF にする"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"キャンセル"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"許可されている通知の種類"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"重要な継続的通知"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"会話の通知"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"アラート通知"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"サイレント通知"</string>
-    <string name="notif_listener_excluded_title" msgid="639103158747320529">"このリスナーにブリッジされないアプリ"</string>
-    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"すべてのアプリがブリッジされます"</string>
-    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
-      <item quantity="other">ブリッジされないアプリ: %d 個</item>
-      <item quantity="one">ブリッジされないアプリ: %d 個</item>
-    </plurals>
-    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"ブリッジされるアプリ"</string>
+    <string name="notif_type_ongoing" msgid="135675014223627555">"リアルタイム"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"使用中のアプリ、ナビ、着信などからのリアルタイム通信"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"会話"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS とその他の通信"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"デフォルト"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"設定に応じて、通知を着信音またはバイブレーションで知らせます"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"消音"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"通知があっても、着信音やバイブレーションは発生しません"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"アプリをすべて表示"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"通知を送信できる各アプリの通知設定を変更します"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"デバイスに表示されるアプリ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR ヘルパー サービス"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"VR ヘルパー サービスとして実行されるようにリクエストしたインストール済みアプリはありません。"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR サービスから <xliff:g id="SERVICE">%1$s</xliff:g> へのアクセスの許可"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"デフォルトで開く"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"リンクを開く"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"対応リンクを開く"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"サポートされているリンクをこのアプリ内で開く"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"このアプリ内で開くリンク"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"確認なしで開く"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"対応リンク"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"その他のデフォルト"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"その他のデフォルトの設定"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"リンクを追加"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"リンクが安全かどうかをアプリが確認し、確認できたらアプリ内で自動的に開くことができます。"<annotation id="url">"詳細"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other">確認されたリンク: <xliff:g id="COUNT_1">%d</xliff:g> 件</item>
+      <item quantity="one">確認されたリンク: <xliff:g id="COUNT_0">%d</xliff:g> 件</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">これらのリンクは、このアプリ内で確認されて自動的に開きます。</item>
+      <item quantity="one">このリンクは、このアプリ内で確認されて自動的に開きます。</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"他のサポートされているリンクを確認しています…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"キャンセル"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other">サポートされているリンク: <xliff:g id="COUNT_1">%d</xliff:g> 件</item>
+      <item quantity="one">サポートされているリンク: <xliff:g id="COUNT_0">%d</xliff:g> 件</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"追加"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> 内で開きます"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g>使用（<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>）"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"内部ストレージ"</string>
     <string name="storage_type_external" msgid="125078274000280821">"外部ストレージ"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"カメラは許可されていません"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"スクリーンショットは許可されていません"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"このアプリを開くことはできません"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"ご不明な点がある場合は、IT 管理者にお問い合わせください"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"詳細"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"管理者は、設定、権限、コーポレート アクセス、ネットワーク アクティビティ、デバイスの位置情報など、ユーザーの仕事用プロファイルに関連付けられたアプリやデータの監視、管理を行えます。"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"管理者は、設定、権限、コーポレート アクセス、ネットワーク アクティビティ、デバイスの位置情報など、このユーザーに関連付けられたアプリやデータの監視、管理を行えます。"</string>
@@ -4342,7 +4395,7 @@
       <item quantity="one">1 個の制限</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"デバイスで記録されるデータ使用量と携帯通信会社のデータ使用量は異なる場合があります"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"携帯通信会社のネットワークで使用したデータ使用量は除外しています"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"携帯通信会社のネットワークで使用したデータ使用量は除外しています"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> 使用"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"データ使用量を警告"</string>
     <string name="data_warning" msgid="2925054658166062884">"警告するデータ使用量"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"（<xliff:g id="USER">%s</xliff:g> からアンインストール）"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"（<xliff:g id="USER">%s</xliff:g> では無効）"</string>
     <string name="autofill_app" msgid="7595308061826307921">"自動入力サービス"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"自動, 入力, 自動入力"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"パスワード"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"自動, 入力, 自動入力, パスワード"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;このアプリが信頼できることを確認してください&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; は画面上の内容に基づいて、入力可能な情報を判別します。"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"自動入力"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"ロギングレベル"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ネットワーク動作モードの変更"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"優先ネットワークの種類"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"携帯通信会社"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"設定のバージョン"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"携帯通信会社の設定のバージョン"</string>
     <string name="call_category" msgid="641461844504128789">"通話"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"携帯通信会社のビデオ通話"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"システムの選択"</string>
@@ -4923,8 +4977,8 @@
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM を OFF にしています<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
     <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"携帯通信会社の無効化エラー"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"エラーが発生したため、携帯通信会社を無効にできませんでした。"</string>
-    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 枚の SIM を使用しますか？"</string>
-    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"このデバイスでは同時に 2 枚の SIM を使用できます。引き続き 1 枚のみを使用するには、[いいえ] をタップしてください。"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 つの SIM を使用しますか？"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"このデバイスでは同時に 2 つの SIM を使用できます。引き続き 1 つのみを使用するには、[いいえ] をタップしてください。"</string>
     <string name="sim_action_restart_title" msgid="7054617569121993825">"デバイスを再起動しますか？"</string>
     <string name="sim_action_restart_text" msgid="8019300474703571013">"まず、デバイスを再起動します。これで、別の SIM を追加できます。"</string>
     <string name="sim_action_continue" msgid="1688813133152389943">"続行"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM カードを取り出して、もう一度挿入してください。問題が解決しない場合は、デバイスを再起動してください。"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM をもう一度 ON にしてみてください。問題が解決しない場合は、デバイスを再起動してください。"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ネットワークの有効化"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"携帯通信会社の切り替え"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> は有効です"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM の設定を更新するにはタップしてください"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> に切り替えました"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"OFF"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"インターネット"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"機内モードのネットワークを表示"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"機内モードのネットワークを検出して接続します。"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Wi-Fi ネットワークを探して接続する"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"機内、機内で利用できる"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"通話と SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi 通話"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"使用不可"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"一時的に利用できません"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM なし"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"設定"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ネットワーク設定"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"パブリック ネットワークに接続する"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ネットワーク接続, インターネット, ワイヤレス, データ, wifi, Wi-Fi, ワイファイ, 携帯, モバイル, 携帯通信会社, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"機内モードのネットワークを表示"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"機内モードのネットワークを表示"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"ネットワークを ON にします"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"ネットワークを OFF にします"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"インターネットを再設定しますか？"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"通話を終了します"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"通話を終了します"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"インターネットを再設定しています…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"接続を修正"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"機内モード ネットワークを利用できます"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ネットワークを切り替えるには、イーサネット接続を解除してください"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"接続中はネットワークを切り替えられません"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"機内モード ネットワーク"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"接続済み"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"インターネットに自動的に接続されません"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"カラー"</string>
     <string name="category_name_others" msgid="2366006298768550310">"その他"</string>
     <string name="category_name_general" msgid="7737273712848115886">"全般"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"アプリをすべて表示"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"スマート転送"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"スマート転送が有効です"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"電話番号を入力"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"電話番号が指定されていません。"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G の許可"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G モバイル接続を使用します。緊急通報では 2G が常に ON になります。"</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index a6bb375..e8abcfa 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"დაპატარავება"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"გადიდება"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ავტომატური შეტრიალების გამოყენება"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"სახის მიხედვით ავტომატური შეტრიალება იყენებს წინა კამერას იმისთვის, რომ გაიგოს, უყურებს თუ არა ვინმე ეკრანს და როგორ. ის იძლევა დაწოლილ მდგომარეობაში წაკითხვის საშუალებას და სურათები არასოდეს ინახება და არ ეგზავნება Google-ს.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;შეიტყვეთ მეტი&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"ტექსტის ნიმუში"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"ოზის საოცარი ჯადოქარი"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"თავი 11: ოზის ზურმუხტის ქალაქი"</string>
@@ -403,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> თითის ანაბეჭდის დაყენება</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"თითის ანაბეჭდით განბლოკვა"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"თითის ანაბეჭდის დაყენება"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"თითის ანაბეჭდის გამოყენება"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"თქვენი ტელეფონის განსაბლოკად, შენაძენების ავტორიზაციისთვის ან აპებში შესასვლელად, უბრალოდ, შეეხეთ თითის ანაბეჭდის სენსორს. ყურადღება მიაქციეთ, ვის თითის ანაბეჭდებს დაამატებთ. ამ მოქმედებების შესრულება ერთ დამატებულ ანაბეჭდსაც კი შეუძლია."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"თითის ანაბეჭდი შესაძლოა ნაკლებად უსაფრთხო იყოს, ვიდრე მძლავრი განმბლოკავი ნიმუში ან PIN-კოდი."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"ამას თქვენ აკონტროლებთ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"გაითვალისწინეთ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"თითის ანაბეჭდის მიერ ჩაწერილი მონაცემები უსაფრთხოდ ინახება და არასოდეს ტოვებს თქვენს ტელეფონს. თქვენი მონაცემების წაშლა ნებისმიერ დროს შეგიძლიათ პარამეტრებიდან."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"თითის ანაბეჭდი შესაძლოა ნაკლებად უსაფრთხო იყოს, ვიდრე მძლავრი განმბლოკავი ნიმუში ან PIN-კოდი."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"თქვენი ტელეფონი დროდადრო გამოიყენებს თქვენს ბოლოდროინდელ თითის ანაბეჭდების გამოსახულებებს, რათა თითის ანაბეჭდების გაუმჯობესებული მოდელები შექმნას."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"გამოიყენეთ თქვენი თითის ანაბეჭდი ტელეფონის განსაბლოკად ან შენაძენების დასადასტურებლად.\n\nგაითვალისწინეთ: თითის ანაბეჭდს ამ მოწყობილობის განსაბლოკად ვერ გამოიყენებთ. დამატებითი ინფორმაციისთვის დაუკავშირდით თქვენი ორგანიზაციის ადმინისტრატორს."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"გამოიყენეთ თქვენი თითის ანაბეჭდი ტელეფონის განსაბლოკად ან შენაძენების დასადასტურებლად.\n\nგაითვალისწინეთ: თითის ანაბეჭდი შესაძლოა ნაკლებად უსაფრთხო იყოს, ვიდრე მძლავრი განმბლოკავი ნიმუში ან PIN-კოდი."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"გაუქმება"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"არა, გმადლობთ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"გამოტოვება"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"გაგრძელება"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"ვეთანხმები"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"გამოტოვება"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"შემდეგი"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"გსურთ თითის ანაბეჭდის დაყენების გამოტოვება?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"გამოტოვება"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"გაუქმება"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"შეეხეთ სენსორს"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"ხანგრძლივად შეეხეთ თითის ანაბეჭდის ხატულას"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"ის თქვენი ტელეფონის უკანა მხარეს მდებარეობს. მისაგნებად, გამოიყენეთ საჩვენებელი თითი."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"ეკრანზეა. მოძებნეთ თითის ანაბეჭდი მბზინავი წრით."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"თითის ანაბეჭდის სენსორი თქვენს ეკრანზეა. მის საპოვნელად გადაატარეთ თითი ეკრანს."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"ილუსტრაცია მოწყობილობისა და თითის ანაბეჭდის სენსორის ადგილმდებარეობით"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"სახელი"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"კარგი"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"წაშლა"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"შეეხეთ სენსორს"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"დაადეთ თითი სენსორს და ვიბრაციის შეგრძნების შემდეგ აიღეთ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"აიღეთ თითი, შემდეგ კი ხელახლა შეეხეთ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"რამდენჯერმე აიღეთ და ისევ შეახეთ თითი სენსორს, რათა თქვენი თითის ანაბეჭდის ყველა ნაწილის დამატება შეძლოთ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"თითის ანაბეჭდი დამატებულია"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"როდესაც ამ ხატულას დაინახავთ, იდენტიფიცირების ან შეძენის დადასტურებისთვის შეგიძლიათ გამოიყენოთ თქვენი თითის ანაბეჭდი"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"მოგვიანებით გაკეთება"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ჩართულია / ეკრანი არ გამოირთვება, თუ მას უყურებთ"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"გამორთულია"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"საჭიროა კამერაზე წვდომა"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"შეეხეთ მოწყობილობის პერსონალიზაციის სერვისების ნებართვების სამართავად"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"არ დაუშვებს ეკრანის გამორთვას, თუ მას უყურებთ"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"ეკრანისკენ მიმართული ყურადღება იყენებს წინა კამერას იმისთვის, რომ გაიგოს, უყურებს თუ არა ვინმე ეკრანს. ის მოწყობილობის დონეზე მუშაობს, სურათები არასოდეს ინახება და არც Google-ს ეგზავნება."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"ეკრანისკენ მიმართული ყურადღების ჩართვა"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"როცა ეკრანი მუქია, ის ჩაირთვება ახალი შეტყობინებებისთვის"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"ყოველთვის ჩანდეს დრო და ინფო"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ბატარეის მოხმარება გაიზრდება"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"მუქი ტექსტი"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"მუქი ტექსტი"</string>
     <string name="title_font_size" msgid="570613010306330622">"შრიფტის ზომა"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ტექსტის გადიდება ან დაპატარავება"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM ბარათის დაბლოკვის პარამეტრები"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"სხვა მომხმარებლები"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"მოწყობილობის მეხსიერება"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"პორტატული მეხსიერება"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"მაღვიძარები და შეხსენებები"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"მაღვიძარებისა და შეხსენებების დაყენების დაშვება"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"მაღვიძარები და შეხსენებები"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"ამ აპს საშუალებას მისცემს, შეიტანოს განრიგში მაღვიძარები ან დროზე დაფუძნებული სხვა მოვლენები. ეს აპს საშუალებას მისცემს, გაიღვიძოს და გაიშვას, თუნდაც იმ მომენტში მოწყობილობით არ სარგებლობდეთ. გაითვალისწინეთ, რომ ამ ნებართვის გაუქმებამ შეიძლება აპის გაუმართაობა გამოიწვიოს, კონკრეტულად, აპის მიერ განრიგში შეტანილი არცერთი მაღვიძარა აღარ იმუშავებს."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"განრიგი, მაღვიძარა, შეხსენება, მოვლენა"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"გამოყენებულია <xliff:g id="USED">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>-დან"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"გამოყენებულია <xliff:g id="TOTAL">%1$s</xliff:g>-დან"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"მდებარეობის სერვისები"</string>
     <string name="location_title" msgid="5819154746934945021">"ჩემი მდებარეობა"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ადგილმდებარეობა სამუშაო პროფილისათვის"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"აპის წვდომა მდებარეობაზე"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"მდებარეობა გამორთულია"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> მდებარეობაზე წვდომა აქვს <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> აპს <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g>-დან</item>
       <item quantity="one"> მდებარეობაზე წვდომა აქვს <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> აპს <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g>-დან</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"ბოლოდროინდელი წვდომა მდებარეობაზე"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"დეტალების ნახვა"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"ბოლო დროს აპებს მდებარეობის ინფორმაცია არ მოუთხოვია"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"ბოლო ხანებში არცერთ აპს არ ჰქონია წვდომა მდებარეობაზე"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"მძლავრი ბატარეა"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"სუსტი ბატარეა"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi და Bluetooth კავშირების სკანირება"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi სკანირება"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"აპების და სერვისებისთვის Wi‑Fi ქსელების ნებისმიერ დროს სკანირების ნებართვის მინიჭება, მაშინაც კი, როცა Wi‑Fi გამორთულია. მაგალითისთვის, ამის გამოყენება შესაძლებელია მდებარეობაზე დაფუძნებული ფუნქციების და სხვა სერვისების გასაუმჯობესებლად."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth სკანირება"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"აპებისა და სერვისებისთვის სკანირების ნებართვის მინიჭება ახლომდებარე მოწყობილობების ნებისმიერ დროს აღმოსაჩენად, მაშინაც კი, როცა Bluetooth გამორთულია. მაგალითისთვის, ამის გამოყენება შესაძლებელია მდებარეობაზე დაფუძნებული ფუნქციების და სხვა სერვისების გასაუმჯობესებლად."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"მდებარეობის სერვისები"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"მდებარეობის სერვისები სამსახურისთვის"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"მდებარეობის სასაათო სარტყლის განსაზღვრა"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"მდებარეობის სასაათო სარტყლის განსაზღვრა"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"საშუალებას იძლევა, მოწყობილობის მდებარეობის მეშვეობით განისაზღვროს მიმდინარე სასაათო სარტყელი. მდებარეობის სხვა პარამეტრებმა, მაგალითად, Wi-Fi სკანირებამ, შეიძლება იმოქმედოს სასაათო სარტყლის განსაზღვრის სიზუსტეზე."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ჩართულია"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"გამორთულია"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"სასაათო სარტყლის ავტომატური ამოცნობა გათიშულია"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ავტომატური სასაათო სარტყელი გამორთულია"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"მდებარეობის სასაათო სარტყლის განსაზღვრა გათიშულია"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"მდებარეობის სასაათო სარტყლის განსაზღვრა მხარდაუჭერელია"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"მდებარეობის სასაათო სარტყლის განსაზღვრის ცვლილებები არ არის დაშვებული"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"ჩართვა"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"მონაცემთა საცავის გასუფთავება"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"განახლებების ამოშლა"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"თქვენ გარკვეული ქმედებების შესასრულებლად აირჩიეთ ამ აპლიკაციის ნაგულისხმევად გაშვება."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"თქვენ მიერ არჩეულ აქტივობათაგან ზოგიერთი ნაგულისხმევად ამ აპში იხსნება."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"თქვენ მიეცით ამ აპს ვიჯეტების შექმნისა და მონაცემებზე წვდომის უფლება."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"არ არის დაყენებული ნაგულისხმევი პარამეტრები."</string>
-    <string name="clear_activities" msgid="341345438786077236">"ნაგულისხმევი პარამეტრების გაწმენდა"</string>
+    <string name="clear_activities" msgid="488089228657585700">"ნაგულისხმევი პარამეტრების გასუფთავება"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"შეიძლება ეს აპი არ არის შექმნილი თქვენი ეკრანისთვის; აქედან შეგიძლიათ გააკონტროლოთ, თუ როგორ მოერგება თქვენ ეკრანს."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"შეკითხვა გაშვების დროს"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"აპის მასშტაბირება"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ამ მოწყობილობის მორგება თქვენი საჭიროებების შესაბამისად შეგიძლიათ. მარტივი წვდომის ამ პარამეტრების მოგვიანებით შეცვლა პარამეტრებიდან არის შესაძლებელი."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"შრიფტის ზომის შეცვლა"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"ეკრანის წამკითხველები"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"აუდიო და ეკრანზე გამოტანილი ტექსტი"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"სუბტიტრები"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"აუდიო"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"ზოგადი"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ეკრანი"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ტექსტი და ჩვენება"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ეკრანის მუქი რეჟიმის ჩართვა"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"წითელი-მწვანე"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"წითელი-მწვანე"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ლურჯი-ყვითელი"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"სიკაშკაშის შემცირება"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"სიკაშკაშის შემცირება"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"დააყენეთ ტელეფონის ეკრანის მინიმალურ სიკაშკაშეზე უფრო მუქი რეჟიმი"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"დააყენეთ ტაბლეტის ეკრანის მინიმალურ სიკაშკაშეზე უფრო მუქი რეჟიმი"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"დააყენეთ მუქი რეჟიმი და გაიმარტივეთ კითხვა.&lt;br/&gt;&lt;br/&gt; ეს დაგეხმარებათ, როცა: &lt;ol&gt; &lt;li&gt; თქვენი ეკრანის ნაგულისხმევი მინიმალური სიკაშკაშე მაინც ძალიან მაღალია&lt;/li&gt; &lt;li&gt; თქვენ თქვენს ტელეფონს ბნელ გარემოში იყენებთ, მაგალითად, ღამით ან ბნელ ოთახში ძილის წინ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"სახე"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"თითის ანაბეჭდი, თითის ანაბეჭდის დამატება"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"ეკრანის ჩაბნელება, სენსორული ეკრანი, ბატარეა, გონიერი სიკაშკაშე, დინამიკური სიკაშკაშე, ავტომატური სიკაშკაშე"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"ეკრანის ჩაბნელება, ძილი, ბატარეა, დროის ლიმიტი, ყურადღება, დისპლეი, ეკრანი, უმოქმედობა"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"შეტრიალება, ამობრუნება, შეტრიალება, პორტრეტი, ლანდშაფტი, ორიენტაცია, ვერტიკალური, ჰორიზონტალური"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"განახლება, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"DND, განრიგი, შეტყობინებები, დაბლოკვა, სიჩუმე, ვიბრაცია, ძილი, მუშაობა, კონცენტრირება, ხმა, დადუმება, დღე, სამუშაო დღე, შაბათ-კვირა, სამუშაო კვირის საღამო, მოვლენა"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ეკრანი, ჩაკეტვის დრო, დროის ლიმიტი, ჩაკეტილი ეკრანი"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ზარები"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"სხვა ხმები და ვიბრაცია"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"შეტყობინებები"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"საუბარი"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"ახლახან გაგზავნილი"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ყველაფრის ნახვა ბოლო 7 დღიდან"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"გაფართოებული"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ზოგადი"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"სამსახურის შეტყობინებები"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"ადაპტაციური შეტყობინებები"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ადაპტაციური შეტყობინების პრიორიტეტულობა"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"გამოჩნდება ჩამოსაწევ ფარდაში, სტატუსის ზოლში და ჩაკეტილ ეკრანზე"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ჩუმი შეტყობინებების დამალვა სტატუსის ზოლში"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"სინათლის ციმციმი"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"შეტყობინებები ჩაკეტილ ეკრანზე"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"კონფიდენციალურობა"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ჩაკეტილი ეკრანის გამოტოვება"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"სახით განბლოკვის შემდეგ ბოლოს გამოყენებულ ეკრანზე გადასვლა"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ჩაკეტილი ეკრანი, დაბლოკილი ეკრანი, გამოტოვება, გვერდის ავლა"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> შეტყობინება კვირაში</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"არასოდეს"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"შეტყობინებებზე წვდომა"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"მოწყობილობისა და აპის შეტყობინებები"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"მართეთ, რომელ შეტყობინებათა ჩვენება არის დაშვებული თქვენს აპებსა და მოწყობილობებზე"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"სამსახურის პროფილის შეტყობინებებზე წვდომა დაბლოკილია"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"აპები ვერ კითხულობს შეტყობინებებს"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"გამორთვა"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"გაუქმება"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"შეტყობინების ნებადართული ტიპები"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"მნიშვნელოვანი მიმდინარე შეტყობინებები"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"მიმოწერის შეტყობინებები"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"გამაფრთხილებელი შეტყობინებები"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"ჩუმი შეტყობინებები"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"რეალურ დროში"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"რეალურ დროში კომუნიკაცია აპებიდან მათი მოხმარებისას, ნავიგაცია, სატელეფონო ზარები და სხვა"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"მიმოწერები"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS და სხვა კომუნიკაციები"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"ნაგულისხმევი"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"პარამეტრებით განსაზღვრული მკრეკავი ან ვიბრირებადი შეტყობინებები"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"ჩუმი"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"შეტყობინებები მუდმივად ხმისა და ვიბრაციის გარეშე"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"ყველა აპის ნახვა"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"შეტყობინებათა პარამეტრების შეცვლა თითოეული აპისთვის, რომელსაც შეტყობინებების გამოგზავნა შეუძლია"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"მოწყობილობაზე ნაჩვენები აპები"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"ვირტუალური რეალობის დამხმარე სერვისები"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ვირტუალური სერვისის დამხმარე სერვისად გაშვება არცერთ დაინსტალირებულ აპს არ მოუთხოვია."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"გსურთ ვირტუალური რეალობის სერვისისთვის <xliff:g id="SERVICE">%1$s</xliff:g>-ზე წვდომის დაშვება?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"გახსნა ნაგულისხმევად"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"ბმულების გახსნა"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"მხარდაჭერილი ბმულების გახსნა"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"მხარდაჭერის ბმულები ამ აპში იხსნება"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"აპში გასახსნელი ბმულები"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"მოთხოვნის გარეშე გახსნა"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"მხარდაჭერილი ბმულები"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"სხვა საგულისხმევები"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"სხვა ნაგულისხმევი პარამეტრები"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"ბმულის დამატება"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"აპს შეუძლია, შეამოწმოს აპში ავტომატურად გასახსნელი ბმულები. "<annotation id="url">"შეიტყვეთ მეტი"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> დადასტურებული ბმული</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> დადასტურებული ბმული</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">ეს ბმულები დადასტურებულია და ავტომატურად იხსნება ამ აპში.</item>
+      <item quantity="one">ეს ბმული დადასტურებულია და ავტომატურად იხსნება ამ აპში.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"კარგი"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"მიმდინარეობს სხვა მხარდაჭერილი ბმულების შემოწმება…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"გაუქმება"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> მხარდაჭერილი ბმული</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> მხარდაჭერილი ბმული</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"დამატება"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"იხსნება <xliff:g id="APP_LABEL">%s</xliff:g>-ში"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> გამოყენებულია <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>ში"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"შიდა მეხსიერება"</string>
     <string name="storage_type_external" msgid="125078274000280821">"გარე მეხსიერება"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"კამერა არ არის დაშვებული"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"ეკრანის ანაბეჭდები არ არის დაშვებული"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"ამ აპის გახსნა ვერ ხერხდება"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"თუ შეკითხვები გაქვთ, დაუკავშირდით თქვენს IT ადმინისტრატორს"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"დაწვრილებით"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"თქვენს ადმინისტრატორს შეუძლია სამსახურის პროფილთან დაკავშირებული აპებისა და მონაცემების (მათ შორის, პარამეტრების, ნებართვების, კორპორაციული წვდომის, ქსელის აქტივობისა და თქვენი მოწყობილობის მდებარეობის ინფორმაციის) მონიტორინგი და მართვა."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"თქვენს ადმინისტრატორს შეუძლია ამ მომხმარებელთან დაკავშირებული აპებისა და მონაცემების (მათ შორის, პარამეტრების, ნებართვების, კორპორაციული წვდომის, ქსელის აქტივობისა და თქვენი მოწყობილობის მდებარეობის ინფორმაციის) მონიტორინგი და მართვა."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="one">1 შეზღუდვა</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ოპერატორი თქვენ მიერ მოხმარებულ ინტერნეტს შეიძლება მოწყობილობისგან განსხვავებულად ითვლიდეს"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"გამორიცხავს მონაცემებს, რომლებსაც ოპერატორის ქსელები იყენებს"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"გამორიცხავს მონაცემებს, რომლებსაც ოპერატორის ქსელები იყენებს"</string>
     <string name="data_used_template" msgid="8229342096562327646">"გამოყენებულია <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"მონაც. გაფრთხილების დაყენება"</string>
     <string name="data_warning" msgid="2925054658166062884">"მოხმარების შესახებ გაფრთხილება"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(დეინსტალირებულია მომხმარებლისთვის: <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(გათიშულია მომხმარებლისთვის: <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"ავტომატური შევსების სერვისი"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"ავტომატური, შევსება, ავტოშევსება"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"პაროლები"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"ავტომატური, შევსება, ავტომატური შევსება, პაროლი"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;დარწმუნდით, რომ ენდობით ამ აპს&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google-ის ავტომატური შევსება&gt;%1$s&lt;/xliff:g&gt; იყენებს თქვენს ეკრანზე არსებულ კონტენტს, რათა გაარკვიოს, რა შეიძლება შეივსოს ავტომატურად."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"ავტომატური შევსება"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"აღრიცხვის დონე"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ქსელის მუშაობის რეჟიმის შეცვლა"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ქსელის სასურველი ტიპი"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ოპერატორი"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"პარამეტრების ვერსია"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"ოპერატორის პარამეტრების ვერსია"</string>
     <string name="call_category" msgid="641461844504128789">"დარეკვა"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"ვიდეო დარეკვა ოპერატორით"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"სისტემის არჩევა"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ამოიღეთ SIM ბარათი და მოათავსეთ ის ხელახლა. თუ პრობლემა არ მოგვარდა, გადატვირთეთ მოწყობილობა."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ცადეთ, ხელახლა ჩართოთ SIM ბარათი. თუ პრობლემა არ მოგვარდა, გადატვირთეთ მოწყობილობა."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ქსელის გააქტიურება"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"ოპერატორის გადართვა"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> აქტიურია"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"შეეხეთ SIM-ბარათის პარამეტრების გასაახლებლად"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"გადართულია <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ზე"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"გამორთულია"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"ინტერნეტი"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-ები"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"თვითმფრინავის რეჟიმის ქსელების ჩვენება"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"იპოვეთ და დაუკავშირდით ქსელებს თვითმფრინავის რეჟიმში."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Wi‑Fi-ქსელების პოვნა და მათთან დაკავშირება"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"თვითმფრინავი, თვითმფრინავისთვის უსაფრთხო"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"ზარები და SMS-ები"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi დარეკვა"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"მიუწვდომელი"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"დროებით მიუწვდომელია"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM არ არის"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"პრიორიტეტები"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ქსელის პარამეტრები"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"საჯარო ქსელებთან დაკავშირება"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ქსელთან კავშირი, ინტერნეტი, უსადენო, მონაცემები, wifi, wi-fi, wi fi, ფიჭური, მობილური, ფიჭური ოპერატორი, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"თვითმფრინავის რეჟიმის ქსელების ნახვა"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"თვითმფრინავის რეჟიმის ქსელების ნახვა"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"ქსელების ჩართვა"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"ქსელების გამორთვა"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"გსურთ ინტერნეტის გადაყენება?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"ეს თქვენი ზარის შეწყვეტას გამოიწვევს"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ეს თქვენი ზარის შეწყვეტას გამოიწვევს"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"მიმდინარეობს ინტერნეტის გადაყენება…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"კავშირის გასწორება"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"თვითმფრინავის რეჟიმის ქსელები ხელმისაწვდომია"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ქსელების გადასართავად, გაწყვიტეთ ethernet-თან კავშირი"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"აქტიური კავშირის დროს ქსელების გადართვა შეუძლებელია"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"თვითმფრინავის რეჟიმის ქსელები"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"დაკავშირებული"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"ინტერნეტს ავტომატურად არ დაუკავშირდება"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"ფერი"</string>
     <string name="category_name_others" msgid="2366006298768550310">"სხვა"</string>
     <string name="category_name_general" msgid="7737273712848115886">"ზოგადი"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"ყველა აპის ნახვა"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"გონიერი გადამისამართება"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"გონიერი გადამისამართება ჩართულია"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"შეიყვანეთ ტელეფონის ნომერი"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ტელეფონის ნომერი აკლია."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"კარგი"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G-ის დაშვება"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"ისარგებლეთ 2G ფიჭური კავშირით. გადაუდებელი ზარებისთვის 2G ყოველთვის ჩართულია."</string>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 2d20f1e..6d600d2 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Экрандағы мәтінді кішірейтеді немесе үлкейтеді."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Кішірек ету"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Үлкенірек ету"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Автоматты бұруды пайдалану"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Мәтін үлгісі"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Оз қаласының ғажап сиқыршысы"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> саусақ ізі реттелді</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Саусақ ізімен құлыпты ашу"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Саусақ ізін реттеңіз"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Саусақ ізін пайдалану"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Телефон құлпын ашу, сатып алу транзакцияларына рұқсат беру немесе қолданбаларға кіру үшін саусақ ізін оқу сканерін түртсеңіз болды. Басқалардың саусақ іздерін енгізгенде, сақ болыңыз. Бір рет енгізілсе болғаны, олар осы әрекеттердің кез келгенін орындай алады."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Қауіпсіздік тұрғысынан саусақ ізі күрделі өрнекке немесе PIN кодына қарағанда әлсіздеу болуы мүмкін."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Барлығы өз қолыңызда"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Есте сақтаңыз"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Саусақ ізі арқылы жазылған деректер қорғалады және ешкімге жіберілмейді. Деректерді кез келген уақытта \"Параметрлер\" бөлімінен жоя аласыз."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Қауіпсіздік тұрғысынан саусақ ізі күрделі өрнекке немесе PIN кодына қарағанда әлсіздеу болуы мүмкін."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Телефоныңыз саусақ ізі үлгілерін жақсарту үшін саусақ ізіңіздің соңғы суреттерін пайдаланады."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Саусақ ізімен телефон құлпын ашыңыз не сатып алған нәрсені мақұлдаңыз.\n\nЕскертпе: бұл құрылғының құлпын саусақ ізімен ашу мүмкін емес. Қосымша ақпарат алу үшін ұйым әкімшісіне хабарласыңыз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Саусақ ізімен телефон құлпын ашыңыз не сатып алған нәрсені мақұлдаңыз.\n\nЕскертпе: қауіпсіздік тұрғысынан саусақ ізі күрделі өрнекке не PIN кодына қарағанда әлсіздеу болуы мүмкін."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Бас тарту"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Жоқ, рақмет"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Өткізіп жіберу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Жалғастыру"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Келісемін"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Өткізіп жіберу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Келесі"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Саусақ ізі өткізіп жіберілсін бе?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Өткізіп жіберу"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Бас тарту"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Сканерді түртіңіз"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Саусақ ізі белгішесін басып ұстап тұрыңыз"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Ол телефонның артында. Сұқ саусағыңызды пайдаланыңыз."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Экранға қараңыз. Жарқырап тұрған шеңбері бар саусақ ізін іздеңіз."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Саусақ ізін оқу сканері экраныңызда орналасқан. Оны табу үшін саусағыңызды экран бойымен жылжытыңыз."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Құрылғы мен саусақ таңбасы сенсорының орны бар сурет"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Аты"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Жарайды"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Жою"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Сканерді түртіңіз"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Саусақты сканерге қойып, дірілді сезгеннен кейін көтеріңіз"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Саусағыңызды алып, қайта түртіңіз"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Саусақ ізінің басқа бөліктерін енгізу үшін саусағыңызды бір тигізіп, бір көтеріп тұрыңыз"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Саусақ ізі енгізілді"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Бұл белгіше шыққан кезде, саусақ ізі арқылы жеке басыңызды растаңыз не сатып алған нәрсені мақұлдаңыз"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Кейінірек"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Іздеу"</string>
     <string name="display_settings" msgid="7197750639709493852">"Дисплей"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Экранды автоматты бұру"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Өшіру"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Қосу"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Қосулы – Бет негізінде"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Бетті анықтауды қосу"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Түстер"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Табиғи"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Жарқын"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Қосулы кезде экранға қарап тұрсаңыз, ол өшпейді."</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Өшірулі"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Камераны пайдалану рұқсаты керек"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Құрылғыны жекелендіру қызметтеріне арналған рұқсаттарды басқару үшін түртіңіз."</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Экранға қарап тұрған кезде, оның өшуіне жол бермейді."</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"\"Зейінді экран\" функциясы алдыңғы камера арқылы адамның экранға қарап тұрғанын тани алады. Ол құрылғыда ғана жұмыс істейді. Суреттер Google жүйесінде сақталмайды және оған жіберілмейді."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"\"Зейінді экран\" функциясын қосу"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Жаңа хабарландырулар келгенде, экран қосылады."</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Уақыт пен ақпаратты көрсету"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Батарея заряды тезірек таусылады"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Қалың шртифтілі мәтін"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Қалың қаріпті мәтін"</string>
     <string name="title_font_size" msgid="570613010306330622">"Қаріп өлшемі"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Мәтінді үлкейтеді немесе кішірейтеді"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM картасын құлыптау параметрлері"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Басқа пайдаланушылар"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Құрылғы жады"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Портативті жад"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Дабылдар мен еске салғыштар"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Дабылдар не еске салғыштар орнатуға рұқсат беру"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Дабылдар мен еске салғыштар"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Қолданбаға дабылдарды немесе уақытқа негізделген басқа да іс-шараларды жоспарлауға рұқсат береді. Сіз құрылғыны пайдаланып жатпасаңыз да қолданбаның іске қосылып, жұмыс істеуіне мүмкіндік береді. Рұқсатты жойсаңыз, қолданба дұрыс жұмыс істемейтінін, әсіресе қолданба жоспарлаған дабылдардың шықпайтынын ескеріңіз."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"кесте, дабыл, еске салғыш, іс-шара"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> ішінен <xliff:g id="USED">%1$s</xliff:g> қолданылған"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> ішінен қолданылған"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Орын қызметтері"</string>
     <string name="location_title" msgid="5819154746934945021">"Mенің аймағым"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Жұмыс профилі үшін орналасу дерегі"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Қолданбаның геодерек пайдалануы"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"\"Орналасу\" функциясы өшірулі"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>/<xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> қолданба орналасу туралы ақпаратты пайдалана алады.</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g>/<xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> қолданба орналасу туралы ақпаратты пайдалана алады.</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Геодеректерге соңғы кіру"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Мәліметтерді көру"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Жуырда ешбір қолданба орналасу дерегін сұрамаған"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Геодеректерді жақын арада ешқандай қолданба пайдаланбаған."</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Жоғары деңгейде батарея қолдану"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Батарея шығыны аз"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi желілері мен Bluetooth сигналын іздеу"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi іздеу"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Қолданбаларға және қызметтерге Wi-Fi өшірулі кезде де Wi-Fi желілерін кез келген уақытта іздеуге рұқсат ету. Бұл параметрді, мысалы, орналасуды анықтау функциялары мен қызметтерін жақсарту үшін пайдалануға болады."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth іздеу"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth өшірулі болса да, қолданбалар мен қызметтерге маңайдағы құрылғыларды іздеуге рұқсат беру. Бұл параметрді, мысалы, орналасуды анықтау функциялары мен қызметтерін жақсарту үшін пайдалануға болады."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Орынды анықтау қызметтері"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Жұмыс профиліне арналған орынды анықтау қызметтері"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Орынның уақыт белдеуін анықтау"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Орынның уақыт белдеуін анықтау"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Ағымдағы уақыт белдеуін анықтау үшін құрылғының орнын қолдануға мүмкіндік береді. Wi‑Fi желісін іздеу сияқты басқа орналасу параметрлері уақыт белдеуінің дәл анықталуына әсер етуі мүмкін."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Қосулы"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Өшірулі"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Уақыт белдеуін автоматты түрде анықтау функциясы өшірулі."</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Автоматты уақыт белдеуі өшірулі."</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Орынның уақыт белдеуін анықтау функциясы өшірулі."</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Орынның уақыт белдеуін анықтау функциясына қолдау көрсетілмейді."</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Орынның уақыт белдеуін анықтау функциясына өзгеріс енгізуге болмайды."</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Қосу"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Жадты тазалау"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Жаңартуларды алу"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Бұл қолданбаны бастапқы параметр бойынша қандайда бір әрекеттер үшін таңдадыңыз."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Сіз таңдаған кейбір әрекеттер осы қолданбада әдепкісінше ашылады."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Сіз бұл қолданбаның виджеттер жасау және дерекқорға кіру мүмкіндігін таңдағансыз."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Әдепкі мәндер орнатылмаған."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Әдепкі мәндерді өшіру"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Әдепкі параметрлерді өшіру"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Бұл қолданба сіздің экраныңызға арналып жасалмаған болуы мүмкін. Оның экранға бейімделуін мына жерден көріңіз."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Қосылғанда сұраңыз"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Қолданбаны өлшеу"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Бұл құрылғыны қажеттіліктерге сай реттей аласыз. Бұл арнайы мүмкіндіктерді кейінірек \"Параметрлер\" тармағында өзгертуге болады."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Қаріп өлшемін өзгерту"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Экранды оқу құралдары"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио және экранға шығатын мәтін"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Жазулар"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аудио"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Жалпы"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Дисплей"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Мәтін және көрсету"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Экранды қараңғылау"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Қызыл – жасыл"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Қызыл – жасыл"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Көк – сары"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Жарықтығын азайту"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Жарықтығын азайту"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Экран жарықтығын телефондағы минималды жарықтықтан да азайту"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Экран жарықтығын планшеттегі минималды жарықтықтан да азайту"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Экранды қараңғыласаңыз, оқу да ыңғайлы болады.&lt;br/&gt;&lt;br/&gt; Мұның пайдалы болатын кездері: &lt;ol&gt; &lt;li&gt; телефонның әдепкі минималды жарықтығы әлі жоғары деңгейде болса;&lt;/li&gt; &lt;li&gt; телефонды түнде немесе ұйықтар алдында қараңғы бөлмеде пайдалансаңыз.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"бет"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"саусақ ізі, саусақ ізін енгізу"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"күңгірт экран, сенсорлық экран, батарея, смарт жарықтық, динамикалық жарықтық, автоматты жарықтық"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"экранды күңгірттеу, ұйқы режимі, батарея, күту уақыты, сезімталдығы, дисплей, экран, әрекетсіздік"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"бұру, аудару, айналдыру, портреттік, альбомдық, бағыт, тік, көлденең"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"жаңа нұсқа орнату, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"мазаламау, кесте, хабарландырулар, бөгеу, дыбыссыз режим, діріл, ұйқы, жұмыс, ерекшелеу, дыбыс, дыбысын өшіру, күн, жұмыс күні, демалыс күндері, жұмыс күнгі кеш, оқиға"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"экран, құлыптау уақыты, күту уақыты, құлыптау экраны"</string>
@@ -3357,7 +3380,7 @@
     <string name="keywords_font_size" msgid="336803136451166298">"мәтін өлшемі"</string>
     <string name="default_sound" msgid="6604374495015245195">"Әдепкі дыбыс"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Қоңыраулар мен хабарландырулардың дыбыс деңгейі: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="6574444810552643312">"Дыбыс деңгейі, діріл, \"Мазаламау\" режимі"</string>
+    <string name="sound_dashboard_summary" msgid="6574444810552643312">"Дыбыс деңгейі, діріл, Мазаламау режимі"</string>
     <string name="sound_settings_summary_vibrate" msgid="7192223433295988890">"Қоңырау дірілдеу режиміне қойылған"</string>
     <string name="sound_settings_summary_silent" msgid="746662794579344761">"Қоңырау үнсіз режимге қойылған"</string>
     <string name="sound_settings_example_summary" msgid="8125110691864707925">"Қоңыраулар мен хабарландырулардың дыбыс деңгейі: 80%"</string>
@@ -3398,7 +3421,7 @@
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Мазаламау"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Хабарландыруды маңызды адамдардан және қолданбалардан ғана алу"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Хабарландыруларды шектеу"</string>
-    <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"\"Мазаламау\" режимін қосу"</string>
+    <string name="zen_mode_settings_turn_on_dialog_title" msgid="7500702838426404527">"Мазаламау режимін қосу"</string>
     <string name="zen_mode_behavior_alarms_only" msgid="2956938533859578315">"Оятқыштар мен мультимедиа дыбыстары тоқтата алады"</string>
     <string name="zen_mode_automation_settings_title" msgid="3709324184191870926">"Кестелер"</string>
     <string name="zen_mode_delete_automatic_rules" msgid="5020468289267191765">"Кестелерді жою"</string>
@@ -3408,7 +3431,7 @@
     <string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Кесте"</string>
     <string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Кесте"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Телефонды дыбыссыз режимге қою"</string>
-    <string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"\"Мазаламау\" ережесін орнату"</string>
+    <string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Мазаламау ережесін орнату"</string>
     <string name="zen_mode_schedule_title" msgid="7064866561892906613">"Кесте"</string>
     <string name="zen_mode_use_automatic_rule" msgid="733850322530002484">"Кестені пайдалану"</string>
     <string name="zen_mode_summary_combination" msgid="5944689309915947828">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
@@ -3416,13 +3439,13 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="7806181124566937214">"Көрнекі мазалағыштарды бөгеу"</string>
     <string name="zen_mode_visual_signals_settings_subtitle" msgid="7433077540895876672">"Визуалды сигналдарды қосу"</string>
     <string name="zen_mode_restrict_notifications_title" msgid="4169952466106040297">"Жасырын хабарландыруларды көрсету"</string>
-    <string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"\"Мазаламау\" режимі қосулы кезде"</string>
+    <string name="zen_mode_restrict_notifications_category" msgid="5870944770935394566">"Мазаламау режимі қосулы кезде"</string>
     <string name="zen_mode_restrict_notifications_mute" msgid="6692072837485018287">"Хабарландырулар дыбыстық сигналсыз беріледі"</string>
     <string name="zen_mode_restrict_notifications_mute_summary" msgid="966597459849580949">"Хабарландырулар экранға шығады"</string>
     <string name="zen_mode_restrict_notifications_mute_footer" msgid="2152115038156049608">"Хабарландырулар келіп түскенде, телефон дыбыс шығармайды не дірілдемейді."</string>
     <string name="zen_mode_restrict_notifications_hide" msgid="5997930361607752541">"Хабарландырулар визуалды не дыбыстық сигналсыз беріледі"</string>
     <string name="zen_mode_restrict_notifications_hide_summary" msgid="6005445725686969583">"Хабарландырулар көрсетілмейді не естілмейді"</string>
-    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4314772315731485747">"Жаңа немесе бұрыннан бар хабарландыруларды телефон көрсетпейді, дірілдемейді немесе дыбыс шығармайды. Бірақ телефон әрекетіне және күйіне қатысты маңызды хабарландырулар шыға береді.\n\n\"Мазаламау\" режимін өшірген соң, әлі ашылмаған хабарландыруларды көру үшін экранды жоғарыдан төмен қарай сипап өтіңіз."</string>
+    <string name="zen_mode_restrict_notifications_hide_footer" msgid="4314772315731485747">"Жаңа немесе бұрыннан бар хабарландыруларды телефон көрсетпейді, дірілдемейді немесе дыбыс шығармайды. Бірақ телефон әрекетіне және күйіне қатысты маңызды хабарландырулар шыға береді.\n\nМазаламау режимін өшірген соң, әлі ашылмаған хабарландыруларды көру үшін экранды жоғарыдан төмен қарай сипап өтіңіз."</string>
     <string name="zen_mode_restrict_notifications_custom" msgid="5469078057954463796">"Басқа"</string>
     <string name="zen_mode_restrict_notifications_enable_custom" msgid="4303255634151330401">"Арнаулы параметрді қосу"</string>
     <string name="zen_mode_restrict_notifications_disable_custom" msgid="5062332754972217218">"Арнаулы параметрді өшіру"</string>
@@ -3453,11 +3476,11 @@
     <string name="zen_mode_enable_dialog_turn_on" msgid="1971034397501675078">"Қосу"</string>
     <string name="zen_mode_button_turn_on" msgid="6583862599681052347">"Қазір қосу"</string>
     <string name="zen_mode_button_turn_off" msgid="2060862413234857296">"Қазір өшіру"</string>
-    <string name="zen_mode_settings_dnd_manual_end_time" msgid="8251503918238985549">"\"Мазаламау\" режимі <xliff:g id="FORMATTED_TIME">%s</xliff:g> дейін қосулы болады"</string>
-    <string name="zen_mode_settings_dnd_manual_indefinite" msgid="1436568478062106132">"\"Мазаламау\" режимі өшірілгенше қосулы болады"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule" msgid="1958092329238152236">"\"Мазаламау\" режимі <xliff:g id="RULE_NAME">%s</xliff:g> ережесі арқылы автоматты түрде қосылды"</string>
-    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="3401685760954156067">"\"Мазаламау\" режимі <xliff:g id="APP_NAME">%s</xliff:g> қолданбасы арқылы автоматты түрде қосылды"</string>
-    <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6566115866660865385">"<xliff:g id="RULE_NAMES">%s</xliff:g> үшін арнаулы параметрлер орнатылған \"Мазаламау\" режимі қосулы."</string>
+    <string name="zen_mode_settings_dnd_manual_end_time" msgid="8251503918238985549">"Мазаламау режимі <xliff:g id="FORMATTED_TIME">%s</xliff:g> дейін қосулы болады"</string>
+    <string name="zen_mode_settings_dnd_manual_indefinite" msgid="1436568478062106132">"Мазаламау режимі өшірілгенше қосулы болады"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule" msgid="1958092329238152236">"Мазаламау режимі <xliff:g id="RULE_NAME">%s</xliff:g> ережесі арқылы автоматты түрде қосылды"</string>
+    <string name="zen_mode_settings_dnd_automatic_rule_app" msgid="3401685760954156067">"Мазаламау режимі <xliff:g id="APP_NAME">%s</xliff:g> қолданбасы арқылы автоматты түрде қосылды"</string>
+    <string name="zen_mode_settings_dnd_custom_settings_footer" msgid="6566115866660865385">"<xliff:g id="RULE_NAMES">%s</xliff:g> үшін арнаулы параметрлер орнатылған Мазаламау режимі қосулы."</string>
     <string name="zen_mode_settings_dnd_custom_settings_footer_link" msgid="2310353944697868606"><annotation id="link">" Арнаулы параметрлерді көру"</annotation></string>
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Маңыздылары ғана"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
@@ -3468,27 +3491,27 @@
     <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 сағат}other{# сағат}}"</string>
     <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 минут}other{# минут}}"</string>
     <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Өшірулі}=1{Өшірулі/1 кесте автоматты түрде қосылады‎‎‎‎‎‎}other{Өшірулі/# кесте автоматты түрде қосылады‎‎‎‎‎‎}}"</string>
-    <string name="zen_category_behavior" msgid="3214056473947178507">"\"Мазаламау\" режимін тоқтата алатындар"</string>
+    <string name="zen_category_behavior" msgid="3214056473947178507">"Мазаламау режимін тоқтата алатындар"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Адамдар"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Қолданбалар"</string>
     <string name="zen_category_exceptions" msgid="1316097981052752811">"Оятқыштар және басқа хабарландырулар"</string>
     <string name="zen_category_schedule" msgid="2003707171924226212">"Кестелер"</string>
     <string name="zen_category_duration" msgid="7515850842082631460">"Жылдам параметрлер ұзақтығы"</string>
-    <string name="zen_sound_footer" msgid="4090291351903631977">"\"Мазаламау\" режимі қосулы кезде, дыбыс және діріл өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда)."</string>
+    <string name="zen_sound_footer" msgid="4090291351903631977">"Мазаламау режимі қосулы кезде, дыбыс және діріл өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда)."</string>
     <string name="zen_custom_settings_dialog_title" msgid="4613603772432720380">"Арнаулы параметрлер"</string>
     <string name="zen_custom_settings_dialog_review_schedule" msgid="4674671820584759928">"Кестені қарап шығу"</string>
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"Түсінікті"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Хабарландырулар"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Ұзақтығы"</string>
     <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Хабарлар, іс-шаралар және еске салғыштар"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"\"Мазаламау\" режимі қосулы кезде, хабарлардың, еске салғыштардың және іс-шаралардың дыбысы өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда). Достарыңыз, отбасы мүшелері не басқа контактілер сізге хабарласа алуы үшін, хабарлардың параметрлерін реттей аласыз."</string>
+    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Мазаламау режимі қосулы кезде, хабарлардың, еске салғыштардың және іс-шаралардың дыбысы өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда). Достарыңыз, отбасы мүшелері не басқа контактілер сізге хабарласа алуы үшін, хабарлардың параметрлерін реттей аласыз."</string>
     <string name="zen_onboarding_ok" msgid="8764248406533833392">"Дайын"</string>
     <string name="zen_onboarding_settings" msgid="2815839576245114342">"Параметрлер"</string>
     <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Хабарландырулар визуалды не дыбыстық сигналсыз беріледі"</string>
     <string name="zen_onboarding_current_setting_title" msgid="5024603685220407195">"Хабарландырулар дыбыссыз беріледі"</string>
     <string name="zen_onboarding_new_setting_summary" msgid="7695808354942143707">"Хабарландырулар көрсетілмейді не естілмейді. Жұлдызшалы және тұрақты контактілерден келетін қоңырауларға рұқсат етілген."</string>
     <string name="zen_onboarding_current_setting_summary" msgid="8864567406905990095">"(ағымдағы параметр)"</string>
-    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"\"Мазаламау\" режиміндегі хабарландыру параметрлері өзгертілсін бе?"</string>
+    <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="8639698336231314609">"Мазаламау режиміндегі хабарландыру параметрлері өзгертілсін бе?"</string>
     <string name="sound_work_settings" msgid="752627453846309092">"Жұмыс профилінің дыбыстары"</string>
     <string name="work_use_personal_sounds_title" msgid="7729428677919173609">"Жеке профиль дыбыстарын пайдалану"</string>
     <string name="work_use_personal_sounds_summary" msgid="4482832555278975008">"Жұмыс профилі мен жеке профиль дыбыстары бірдей"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Рингтондар"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Басқа дыбыстар мен дірілдер"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Хабарландырулар"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Әңгіме"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Жақында жіберілді"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Соңғы 7 күндегі барлық қолданбаларды көру"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Қосымша"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Жалпы"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Жұмыс хабарландырулары"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Бейімделетін хабарландырулар"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Бейімделетін хабарландырулар басымдығы"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Ашылмалы панельге, күй жолағына және құлыптаулы экранға шығады."</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Күй жолағындағы дыбыссыз хабарландыруларды жасыру"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Жыпылықтаған жарық"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Құлыптаулы экрандағы хабарландырулар"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Құпиялылық"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Құлыптаулы экранды өткізу"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Face Unlock-тан кейін бірден соңғы ашылған экранға өту"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Құлып экраны, құлыптаулы экран, өткізіп жіберу, өткізу"</string>
@@ -3620,7 +3644,7 @@
     <string name="conversation_settings_clear_recents" msgid="4246342656145488662">"Соңғыларын өшіру"</string>
     <string name="clear" msgid="5092178335409471100">"Өшіру"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Маңызды чаттарды қалқымалы ету"</string>
-    <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Маңызды әңгімелер ашылмалы панельдің жоғарғы жағында көрсетіледі. Оларды қалқыма хабар ретінде және \"Мазаламау\" режимі қосулы болса да шығатындай етіп реттеуіңізге болады."</string>
+    <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Маңызды әңгімелер ашылмалы панельдің жоғарғы жағында көрсетіледі. Оларды қалқыма хабар ретінде және Мазаламау режимі қосулы болса да шығатындай етіп реттеуіңізге болады."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Маңызды және өзгертілген әңгімелер осы жерде көрсетіледі"</string>
     <string name="conversation_onboarding_summary" msgid="2484845363368486941">"Әңгімені маңызды деп белгілесеңіз немесе оған қандай да бір өзгерістер енгізсеңіз, ол осы жерде көрсетіледі. \n\nӘңгіме параметрлерін өзгерту үшін: \nЭкранның жоғарғы жағынан төмен қарай саусақпен сипап өтіп, ашылмалы панельді шығарыңыз да, әңгімені басып тұрыңыз."</string>
     <string name="notification_importance_min" msgid="4609688642942787774">"Дыбыссыз және кішірейтіп көрсету"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">Аптасына ~<xliff:g id="NUMBER_0">%d</xliff:g> хабарландыру</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Ешқашан"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Хабарландыруларды пайдалану"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Құрылғы мен қолданба хабарландырулары"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Қолданбаларыңыз бен құрылғыларыңызда қандай хабарландыруларды көрсету керегін басқарыңыз."</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Жұмыс профилінің хабарландыруларына кіру бөгелген"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Қолданбалар хабарларды оқи алмайды."</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3669,24 +3694,24 @@
     <string name="no_notification_listeners" msgid="2839354157349636000">"Орнатылған қолданбалардың ешбірі хабарландыруға кіруге рұқсат сұрамады."</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"Хабарландыру пайдалануға рұқсат беру"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"<xliff:g id="SERVICE">%1$s</xliff:g> қызметіне хабарландыруға кіру рұқсатын беру қажет пе?"</string>
-    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> барлық хабарландыруды, соның ішінде контакт аттары, сізге келген хабарлардың мәтіні сияқты жеке ақпаратты оқи алатын болады. Бұл қолданба хабарландыруларды жаба алатын немесе хабарландырулардағы түймелер баса алатын мүмкіндігі бар. Келген қоңырауларға жауап беруі де мүмкін. \n\nСондай-ақ бұл – қолданбаға \"Мазаламау\" режимін қосуға немесе өшіруге және ұқсас параметрлерді өзгертуге мүмкіндік береді."</string>
+    <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> барлық хабарландыруды, соның ішінде контакт аттары, сізге келген хабарлардың мәтіні сияқты жеке ақпаратты оқи алатын болады. Бұл қолданба хабарландыруларды жаба алатын немесе хабарландырулардағы түймелер баса алатын мүмкіндігі бар. Келген қоңырауларға жауап беруі де мүмкін. \n\nСондай-ақ бұл – қолданбаға Мазаламау режимін қосуға немесе өшіруге және ұқсас параметрлерді өзгертуге мүмкіндік береді."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"<xliff:g id="SERVICE">%1$s</xliff:g> үшін хабарландыруға кіру рұқсатын беру қажет пе?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> барлық хабарландыруды, соның ішінде контакт аттары, сізге келген хабарлардың мәтіні сияқты жеке ақпаратты оқи алатын болады. Бұл қолданба хабарландыруларды жаба алатын немесе хабарландырулардағы түймелер баса алатын мүмкіндігі бар. Келген қоңырауларға жауап беруі де мүмкін. \n\nСондай-ақ бұл – қолданбаға \"Мазаламау\" режимін қосуға немесе өшіруге және ұқсас параметрлерді өзгертуге мүмкіндік береді."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Егер <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> үшін хабарландыру параметрін өшірсеңіз, \"Мазаламау\" параметрі де өшуі мүмкін."</string>
+    <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> барлық хабарландыруды, соның ішінде контакт аттары, сізге келген хабарлардың мәтіні сияқты жеке ақпаратты оқи алатын болады. Бұл қолданба хабарландыруларды жаба алатын немесе хабарландырулардағы түймелер баса алатын мүмкіндігі бар. Келген қоңырауларға жауап беруі де мүмкін. \n\nСондай-ақ бұл – қолданбаға Мазаламау режимін қосуға немесе өшіруге және ұқсас параметрлерді өзгертуге мүмкіндік береді."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Егер <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> үшін хабарландыру параметрін өшірсеңіз, Мазаламау параметрі де өшуі мүмкін."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Өшіру"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Бас тарту"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Рұқсат етілген хабарландыру түрлері"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Қазіргі маңызды хабарландырулар"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Әңгіме хабарландырулары"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Ескертуші хабарландырулар"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Дыбыссыз хабарландырулар"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Нақты уақыт"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Қолданыстағы қолданбалар арқылы нақты уақыттағы байланыс, навигация, қоңыраулар және т.б."</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Әңгімелер"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS және басқа да байланыс құралдары"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Әдепкі"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Параметрлерге байланысты шылдырлауы не дірілдеуі мүмкін хабарландырулар"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Дыбыссыз"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Ешқашан дыбыс шығармайтын не дірілдемейтін хабарландырулар"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Барлық қолданбаны қарау"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Хабарландыру жібере алатын әр қолданбаның хабарландыру параметрлерін өзгертіңіз."</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Құрылғыда көрсетілген қолданбалар"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Виртуалды шынайылық көмекші қызметтері"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Орнатылған қолданбалар виртуалды шынайылық көмекші қызметтері ретінде іске қосуды сұрамады."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Виртуалды шынайылық қызметінің <xliff:g id="SERVICE">%1$s</xliff:g> қызметіне кіруіне рұқсат ету керек пе?"</string>
@@ -3725,8 +3750,8 @@
     <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"Осы қолданбаларды байланыстыру үшін жұмыс профиліңізге <xliff:g id="NAME">%1$s</xliff:g> қолданбасын орнатыңыз"</string>
     <string name="interact_across_profiles_install_personal_app_title" msgid="4790651223324866344">"Осы қолданбаларды байланыстыру үшін жеке профиліңізге <xliff:g id="NAME">%1$s</xliff:g> қолданбасын орнатыңыз"</string>
     <string name="interact_across_profiles_install_app_summary" msgid="7715324358034968657">"Қолданбаны алу үшін түртіңіз."</string>
-    <string name="manage_zen_access_title" msgid="1562322900340107269">"\"Мазаламау\" режимін пайдалану"</string>
-    <string name="zen_access_detail_switch" msgid="4183681772666138993">"\"Мазаламау\" режимін пайдалануға рұқсат ету"</string>
+    <string name="manage_zen_access_title" msgid="1562322900340107269">"Мазаламау режимін пайдалану"</string>
+    <string name="zen_access_detail_switch" msgid="4183681772666138993">"Мазаламау режимін пайдалануға рұқсат ету"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Орнатылған қолданбалардың ешбірі Мазаламау режиміне кіруге рұқсат сұрамады"</string>
     <string name="loading_notification_apps" msgid="5139471829295287945">"Қолданбалар жүктелуде…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Сұрауыңыз бойынша Android бұл қолданбаның хабарландыруларын көрсетпейді"</string>
@@ -3758,8 +3783,8 @@
     <string name="notification_content_block_summary" msgid="329171999992248925">"Тақтада немесе перифериялық құрылғыларда хабарландыруларды ешқашан көрсетпеу"</string>
     <string name="notification_badge_title" msgid="6854537463548411313">"Хабарландыру белгісіне рұқсат беру"</string>
     <string name="notification_channel_badge_title" msgid="6505542437385640049">"Хабарландыру белгісін көрсету"</string>
-    <string name="app_notification_override_dnd_title" msgid="3769539356442226691">"\"Мазаламау\" режимін елемеу"</string>
-    <string name="app_notification_override_dnd_summary" msgid="4894641191397562920">"\"Мазаламау\" режимі қосулы болса да, хабарландырулардың шығуына рұқсат ету"</string>
+    <string name="app_notification_override_dnd_title" msgid="3769539356442226691">"Мазаламау режимін елемеу"</string>
+    <string name="app_notification_override_dnd_summary" msgid="4894641191397562920">"Мазаламау режимі қосулы болса да, хабарландырулардың шығуына рұқсат ету"</string>
     <string name="app_notification_visibility_override_title" msgid="7778628150022065920">"Құлыптаулы экран"</string>
     <string name="app_notification_row_banned" msgid="4513523107019706924">"Бөгелген"</string>
     <string name="app_notification_row_priority" msgid="8100777138078316446">"Маңызды"</string>
@@ -3784,9 +3809,9 @@
     <string name="zen_mode_delete_rule_confirmation" msgid="6195069346439736688">"\"<xliff:g id="RULE">%1$s</xliff:g>\" ережесін жою керек пе?"</string>
     <string name="zen_mode_delete_rule_button" msgid="8328729110756882244">"Жою"</string>
     <string name="zen_mode_rule_type_unknown" msgid="7819162569994282316">"Белгісіз"</string>
-    <string name="zen_mode_app_set_behavior" msgid="4319517270279704677">"Бұл параметрлер қазір өзгертілмейді. Қолданба (<xliff:g id="APP_NAME">%1$s</xliff:g>) \"Мазаламау\" режиміне автоматты түрде қосылды."</string>
-    <string name="zen_mode_unknown_app_set_behavior" msgid="8544413884273894104">"Бұл параметрлер қазір өзгертілмейді. Қолданба \"Мазаламау\" режиміне автоматты түрде қосылды."</string>
-    <string name="zen_mode_qs_set_behavior" msgid="3805244555649172848">"Бұл параметрлер қазір өзгертілмейді. Қолданба \"Мазаламау\" режиміне қолмен қосылды."</string>
+    <string name="zen_mode_app_set_behavior" msgid="4319517270279704677">"Бұл параметрлер қазір өзгертілмейді. Қолданба (<xliff:g id="APP_NAME">%1$s</xliff:g>) Мазаламау режиміне автоматты түрде қосылды."</string>
+    <string name="zen_mode_unknown_app_set_behavior" msgid="8544413884273894104">"Бұл параметрлер қазір өзгертілмейді. Қолданба Мазаламау режиміне автоматты түрде қосылды."</string>
+    <string name="zen_mode_qs_set_behavior" msgid="3805244555649172848">"Бұл параметрлер қазір өзгертілмейді. Қолданба Мазаламау режиміне қолмен қосылды."</string>
     <string name="zen_schedule_rule_type_name" msgid="8071428540221112090">"Уақыт"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="6534402316741678208">"Көрсетілген уақыттарда «Мазаламау» режимін қосу туралы автоматты ереже орнатылған"</string>
     <string name="zen_event_rule_type_name" msgid="1921166617081971754">"Іс-шара"</string>
@@ -3808,7 +3833,7 @@
     <string name="zen_mode_schedule_rule_days_all" msgid="1583884351893245169">"Күн сайын"</string>
     <string name="zen_mode_schedule_alarm_title" msgid="305237266064819345">"Оятқыш аяқталу уақытын өзгерте алады"</string>
     <string name="zen_mode_schedule_alarm_summary" msgid="9162760856136645133">"Оятқыш қосылған кезде, кесте өшеді"</string>
-    <string name="zen_mode_custom_behavior_title" msgid="92525364576358085">"\"Мазаламау\" режимі"</string>
+    <string name="zen_mode_custom_behavior_title" msgid="92525364576358085">"Мазаламау режимі"</string>
     <string name="zen_mode_custom_behavior_summary_default" msgid="3259312823717839148">"Әдепкі параметрлерді пайдалану"</string>
     <string name="zen_mode_custom_behavior_summary" msgid="5390522750884328843">"Осы кесте үшін ерекше параметрлер орнату"</string>
     <string name="zen_mode_custom_behavior_category_title" msgid="7815612569425733764">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" үшін"</string>
@@ -3905,7 +3930,7 @@
     <string name="zen_mode_when_weeknights" msgid="531342225633264368">"Жұмыс күн-гі түндер"</string>
     <string name="zen_mode_start_time" msgid="1252665038977523332">"Басталу уақыты"</string>
     <string name="zen_mode_end_time" msgid="223502560367331706">"Аяқталу уақыты"</string>
-    <string name="zen_mode_end_time_next_day_summary_format" msgid="419683704068360804">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> келесі күні"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="419683704068360804">"Келесі күні <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="910047326128154945">"Мерзімсіз \"дабылдар ғана\" режиміне өзгерту"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="1900512966361163390">
       <item quantity="other">Дабылдарды (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> дейін) <xliff:g id="DURATION">%1$d</xliff:g> минутқа ғана өзгерту</item>
@@ -3918,10 +3943,10 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> дейін \"дабылдар ғана\" режиміне өзгерту"</string>
     <string name="zen_mode_summary_always" msgid="722093064250082317">"Әрқашан тоқтатуға өзгерту"</string>
     <string name="zen_mode_screen_on" msgid="7312758100468915319">"Экран қосулы болғанда"</string>
-    <string name="zen_mode_screen_on_summary" msgid="510055058460316698">"\"Мазаламау\" режиміне орнатылған хабарландыруларға экранға шығып, күй жолағына белгіше шығаруға рұқсат ету"</string>
+    <string name="zen_mode_screen_on_summary" msgid="510055058460316698">"Мазаламау режиміне орнатылған хабарландыруларға экранға шығып, күй жолағына белгіше шығаруға рұқсат ету"</string>
     <string name="zen_mode_screen_off" msgid="7069798697669366075">"Экран өшірулі болғанда"</string>
-    <string name="zen_mode_screen_off_summary" msgid="4698018253505406152">"\"Мазаламау\" режимі арқылы хабарландырулардың дыбысы шықпайтындай, экран қосылып, шам жыпылықтайтындай ету"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="1958271859408992636">"\"Мазаламау\" режимі арқылы хабарландырулардың дыбысы шықпайтындай, экран қосылатындай ету"</string>
+    <string name="zen_mode_screen_off_summary" msgid="4698018253505406152">"Мазаламау режимі арқылы хабарландырулардың дыбысы шықпайтындай, экран қосылып, шам жыпылықтайтындай ету"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="1958271859408992636">"Мазаламау режимі арқылы хабарландырулардың дыбысы шықпайтындай, экран қосылатындай ету"</string>
     <string name="notification_app_settings_button" msgid="4692549882609342128">"Хабарландыру параметрлері"</string>
     <string name="suggestion_button_text" msgid="4370673818678692873">"Жарайды"</string>
     <string name="suggestion_button_close" msgid="6865170855573283759">"Жабу"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Әдепкідей ашу"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Сілтемелерді ашу"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Қолдау көрсетілетін сілтемелерді ашу"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Қолдау көрсетілетін сілтемелер осы қолданбада ашылады"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Осы қолданбада ашылатын сілтемелер"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Сұрамастан ашу"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Қолдау көрсетілетін сілтемелер"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Басқа әдепкі мәндер"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Басқа да әдепкі параметрлер"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Сілтеме қосу"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Қолданба сілтемелерді растап, кейін автоматты түрде аша алады. "<annotation id="url">"Толығырақ"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> расталған сілтеме</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> расталған сілтеме</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Бұл сілтемелер расталған және бұл қолданбада автоматты түрде ашылады.</item>
+      <item quantity="one">Бұл сілтеме расталған және бұл қолданбада автоматты түрде ашылады.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Жарайды"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Басқа қолдау көрсетілетін сілтемелер тексерілуде…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Бас тарту"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> қолдау көрсетілетін сілтеме</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> қолдау көрсетілетін сілтеме</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Қосу"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> қолданбасында ашылады."</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>: <xliff:g id="SIZE">%1$s</xliff:g> пайдаланылған"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"ішкі жад"</string>
     <string name="storage_type_external" msgid="125078274000280821">"сыртқы жад"</string>
@@ -3992,7 +4038,7 @@
     <string name="notifications_silenced" msgid="2673798575466545098">"Үнсіз етілген"</string>
     <string name="notifications_redacted" msgid="8820993927920208612">"Құлыпталған экранда құпия мазмұн жоқ"</string>
     <string name="notifications_hidden" msgid="2415415452913806859">"Құлыпталған экранда емес"</string>
-    <string name="notifications_priority" msgid="9068574646650663837">"\"Мазаламау\" режимі қайта анықталды"</string>
+    <string name="notifications_priority" msgid="9068574646650663837">"Мазаламау режимі қайта анықталды"</string>
     <string name="notifications_summary_divider" msgid="6877149909390030983">" / "</string>
     <string name="notification_summary_level" msgid="4074326972839105652">"%d-деңгейі"</string>
     <string name="notification_summary_channel" msgid="8459033623057872803">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
@@ -4023,7 +4069,7 @@
     <string name="filter_notif_urgent_channels" msgid="875381675739324318">"Санаттар: аса маңызды"</string>
     <string name="filter_notif_low_channels" msgid="2163005243095264537">"Санаттар: маңыздылығы төмен"</string>
     <string name="filter_notif_blocked_channels" msgid="1131444963543380495">"Санаттар: өшірілген"</string>
-    <string name="filter_notif_dnd_channels" msgid="13445325087914932">"Санаттар: \"Мазаламау\" режимін қайта анықтайды"</string>
+    <string name="filter_notif_dnd_channels" msgid="13445325087914932">"Санаттар: Мазаламау режимін қайта анықтайды"</string>
     <string name="advanced_apps" msgid="7643010673326578815">"Қосымша"</string>
     <string name="configure_apps" msgid="5468359087126598115">"Қолданбаларды конфигурациялау"</string>
     <string name="unknown_app" msgid="2027248925719898714">"Белгісіз қолданба"</string>
@@ -4180,8 +4226,8 @@
     <string name="zen_access_warning_dialog_title" msgid="6323325813123130154">"<xliff:g id="APP">%1$s</xliff:g> қолданбасына «Мазаламау» режиміне кіруге бола ма?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="8468714854067428987">"Қолданба «Мазаламау» режимін қосуы/өшіруі және қатысты параметрлерге өзгерістер енгізуі мүмкін."</string>
     <string name="zen_access_disabled_package_warning" msgid="6565908224294537889">"Хабарландыру параметрі қосулы болғандықтан, міндетті түрде қосулы болуы тиіс"</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g> үшін \"Мазаламау\" режиміне қатынасты қайтару керек пе?"</string>
-    <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"Осы қолданба жасаған барлық \"Мазаламау\" ережелері жойылады."</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"<xliff:g id="APP">%1$s</xliff:g> үшін Мазаламау режиміне қатынасты қайтару керек пе?"</string>
+    <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"Осы қолданба жасаған барлық Мазаламау ережелері жойылады."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"Оңтайландырмау"</string>
     <string name="ignore_optimizations_off" msgid="9186557038453586295">"Оңтайландыру"</string>
     <string name="ignore_optimizations_on_desc" msgid="1280043916460939932">"Батарея тезірек отыруы мүмкін: қолданбаларға енді фондық режимде батареяны пайдалануға шектеу қойылмайды"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Камераны пайдалануға рұқсат берілмеген"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Скриншот жасауға рұқсат берілмеген"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Бұл қолданба ашылмайды"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Сұрақтарыңыз болса, әкімшіге хабарласыңыз"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Қосымша мәліметтер"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Әкімші қолданбаларды және жұмыс профиліңізбен байланысты деректерді, соның ішінде, параметрлерді, рұқсаттарды, корпоративтік кіру рұқсаттарын, желілік белсенділікті және құрылғының орны туралы ақпаратты бақылай және басқара алады."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Әкімші қолданбаларды және осы пайдаланушымен байланысты деректерді, соның ішінде, параметрлерді, рұқсаттарды, корпоративтік кіру рұқсаттарын, желілік белсенділікті және құрылғының орны туралы ақпаратты бақылай және басқара алады."</string>
@@ -4283,7 +4330,7 @@
     <string name="condition_hotspot_title" msgid="7903918338790641071">"Хотспот қосулы"</string>
     <string name="condition_airplane_title" msgid="5847967403687381705">"Ұшақ режимі қосулы"</string>
     <string name="condition_airplane_summary" msgid="1964500689287879888">"Желілер қолжетімді емес."</string>
-    <string name="condition_zen_title" msgid="7674761111934567490">"\"Мазаламау\" режимі қосулы"</string>
+    <string name="condition_zen_title" msgid="7674761111934567490">"Мазаламау режимі қосулы"</string>
     <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"Телефон дыбысы өшірулі"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="9019937492602199663">"Ерекше жағдайлар қарастырылған"</string>
     <string name="condition_battery_title" msgid="6395113995454385248">"Батарея үнемдегіш қосулы"</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 шектеу</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Оператордың деректер есебі құрылғының есебінен өзгеше болуы мүмкін."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Оператор желілері пайдаланған деректерді қамтымайды."</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Оператор желілері пайдаланған деректерді қамтымайды."</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> пайдаланылған"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Дерек шығыны туралы ескерту"</string>
     <string name="data_warning" msgid="2925054658166062884">"Дерек шығыны туралы ескерту"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g> деген пайдаланушы үшін жойылған)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g> деген пайдаланушы үшін өшірілген)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Автотолтыру қызметі"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"авто, толтыру, автотолтыру"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Құпия сөздер"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"автоматты, толтыру, автотолтыру, құпия сөз"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Осы қолданбаның қауіпсіз екеніне көз жеткізіңіз&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; экранда көрсетілгенді пайдаланып, нені автоматты түрде толтыруға болатынын анықтайды."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Aвтотолтыру"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Тіркеу деңгейі"</string>
@@ -4710,7 +4758,7 @@
     <string name="storage_movies_tv" msgid="7897612625450668593">"Фильм және телебағдарлама қолданбалары"</string>
     <string name="carrier_provisioning" msgid="7217868336140325816">"Операторды инициализациялау туралы ақпарат"</string>
     <string name="trigger_carrier_provisioning" msgid="3288805742683538597">"Операторды инциализациялауды іске қосу"</string>
-    <string name="zen_suggestion_title" msgid="4555260320474465668">"\"Мазаламау\" режимін жаңарту"</string>
+    <string name="zen_suggestion_title" msgid="4555260320474465668">"Мазаламау режимін жаңарту"</string>
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Алаңдататын хабарландыруларды кідірту"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Функция қолжетімді емес."</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Бұл функция өшірілді, себебі телефоныңыздың жұмысына кедергі келтіреді."</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Желі жұмысының режимін өзгерту"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Оңтайлы желі түрі"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Оператор"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Параметрлер нұсқасы"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Оператор параметрлерінің нұсқасы"</string>
     <string name="call_category" msgid="641461844504128789">"Қоңырау"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Оператор желісімен жасалатын бейне қоңыраулар"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Жүйе таңдау"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM картасын шығарып, қайта салыңыз. Егер ақау жойылмаса, құрылғыны өшіріп қосыңыз."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM картасын қайтадан қосып көріңіз. Егер ақау жойылмаса, құрылғыны өшіріп қосыңыз."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Желіні іске қосу"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Операторды ауыстыру"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> қосулы"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM параметрлерін жаңарту үшін түртіңіз."</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> операторына ауысты"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Өшірулі"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM карталары"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Ұшақ режиміндегі желілерді көрсету"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Ұшақ режимінде желілерді тауып, қосылыңыз."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Wi‑Fi желілерін тауып, қосылыңыз."</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ұшақ, ұшақта қолдануға болатын желі"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Қоңыраулар мен SMS хабарлары"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi қоңыраулары"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"қолжетімді емес"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Уақытша қолжетімді емес"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM картасы жоқ"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Параметрлер"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Желі параметрлері"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Қоғамдық жерлердегі желілерге қосылу"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"желі байланысы, интернет, сымсыз байланыс, деректер, wifi, Wi-Fi, Wi Fi, ұялы, мобильдік, ұялы байланыс операторы, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ұшақта қолдануға болатын желілерді көру"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Ұшақ режиміндегі желілерді көру"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Желілерді қосу"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Желілерді өшіру"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Интернет байланысы бастапқы күйге қайтарылсын ба?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Бұл әрекет қоңырауды тоқтатады."</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Бұл әрекет қоңырауды тоқтатады."</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Интернет байланысы бастапқы күйге қайтарылуда…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Қосылу мүмкіндігін түзету"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Ұшақ режиміндегі желілер қолжетімді."</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Желілерді ауыстыру үшін ethernet кабелін ажыратыңыз."</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Қосулы болса, желілерді ауыстыру мүмкін емес."</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Ұшақ режимі желілері"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Қосылды"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Интернет автоматты түрде қосылмайды"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Түсі"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Басқалар"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Жалпы"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Барлық қолданбаны қарау"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Қоңырауды басқа нөмірге бағыттау"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Қоңырауды басқа нөмірге бағыттау қосылды."</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Телефон нөмірін енгізіңіз"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Телефон нөмірі енгізілмеген."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Жарайды"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G қолдануға рұқсат беру"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G ұялы байланыстарын пайдаланыңыз. Құтқару қызметіне қоңырау шалу үшін, 2G байланысы үнемі қосулы болады."</string>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 083c2ed..7cfe236 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"កំណត់ឲ្យតូចជាងមុន"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"កំណត់ឲ្យធំជាងមុន"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ប្រើការបង្វិល​ស្វ័យ​ប្រវត្តិ"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"ការបង្វិល​ស្វ័យ​ប្រវត្តិដោយផ្អែកលើមុខប្រើកាមេរ៉ាខាងមុខ ដើម្បីមើលថាតើ និងរបៀបដែលនរណាម្នាក់កំពុងមើលអេក្រង់។ វាអនុញ្ញាតឱ្យអាន នៅពេលផ្ដេកខ្លួន ហើយរូបភាពមិនត្រូវបានរក្សាទុក ឬបញ្ជូនទៅ Google ទេ។&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;ស្វែងយល់បន្ថែម&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"អត្ថបទគំរូ"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"មេធ្មប់ដ៏អស្ចារ្យនៃទឹកដីពិសិដ្ឋ"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"ជំពូកទី 11៖ ទីក្រុងមរកតដ៏អស្ចារ្យនៃទឹកដីពិសិដ្ឋ"</string>
@@ -403,15 +404,21 @@
       <item quantity="one">បានរៀបចំស្នាមម្រាមដៃ <xliff:g id="COUNT_0">%1$d</xliff:g></item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"ដោះសោដោយប្រើស្នាមម្រាមដៃ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"រៀបចំស្នាម​ម្រាមដៃរបស់អ្នក"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"ប្រើស្នាមម្រាមដៃរបស់អ្នក"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"គ្រាន់តែចុចលើឧបករណ៍ចាប់ស្នាមម្រាមដៃប៉ុណ្ណោះ ដើម្បីដោះសោទូរសព្ទ អនុញ្ញាតលើការទិញ ឬចូលកម្មវិធី។ សូមប្រុង​ប្រយ័ត្ន​ចំពោះ​ស្នាមម្រាមដៃ​ដែល​អ្នកបញ្ចូល។ ស្នាមម្រាមដៃដែលបានបញ្ចូលត្រឹមតែមួយ​អាចធ្វើសកម្មភាពទាំងអស់នេះបាន។"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"ស្នាម​ម្រាម​ដៃ​របស់អ្នក​អាច​មិនសូវ​មាន​សុវត្ថិភាព​ដូច​លំនាំ ឬកូដ PIN ដែល​រឹងមាំ​ទេ។"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"ការគ្រប់គ្រង​ស្ថិតក្នុង​ដៃអ្នក"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"សូមចងចាំ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"ទិន្នន័យដែល​បានថតដោយ​ស្នាមម្រាមដៃ​ត្រូវបានរក្សាទុក​ដោយសុវត្ថិភាព និងមិនចាកចេញពីទូរសព្ទ​របស់អ្នកឡើយ។ អ្នកអាច​លុបទិន្នន័យ​របស់អ្នក​បានគ្រប់ពេល​នៅក្នុង​ការកំណត់។"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"ស្នាម​ម្រាម​ដៃ​របស់អ្នក​អាច​មិនសូវ​មាន​សុវត្ថិភាព​ដូច​លំនាំ ឬកូដ PIN ដែល​រឹងមាំ​ទេ។"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"ទូរសព្ទរបស់អ្នក​នឹងប្រើ​រូបភាព​ស្នាមម្រាមដៃថ្មីៗ​របស់អ្នកម្ដងម្កាល ដើម្បី​បង្កើត​គំរូស្នាមម្រាមដៃ​កាន់តែប្រសើរ។"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ប្រើស្នាមម្រាមដៃរបស់អ្នកដើម្បីដោះសោទូរសព្ទរបស់អ្នក ឬយល់ព្រមលើការទិញ។\n\nចំណាំ៖ អ្នកមិនអាចប្រើស្នាមម្រាមដៃរបស់អ្នក ដើម្បីដោះសោឧបករណ៍នេះឡើយ។ សម្រាប់ព័ត៌មានបន្ថែម សូមទាក់ទងអ្នកគ្រប់គ្រង​របស់​ស្ថាប័នអ្នក។"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ប្រើស្នាមម្រាមដៃរបស់អ្នកដើម្បីដោះសោទូរសព្ទរបស់អ្នក ឬយល់ព្រមលើការទិញ។\n\nចំណាំ៖ ស្នាមម្រាមដៃរបស់អ្នកអាចមិនសូវមានសុវត្ថិភាពដូចការប្រើលំនាំ ឬកូដ PIN ដែលរឹងមាំនោះទេ។"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"បោះបង់"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ទេ អរគុណ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"រំលង"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"បន្ត"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"យល់ព្រម"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"រំលង"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"បន្ទាប់"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"រំលង​ស្នាមមេដៃឬ?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"រំលង"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"បោះបង់"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"ប៉ះឧបករណ៍ចាប់ស្នាមម្រាមដៃ"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"ចុចរូបស្នាមម្រាម​ដៃឱ្យជាប់"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"វាស្ថិតនៅផ្នែកខាងក្រោយនៃទូរសព្ទរបស់អ្នក។ សូមប្រើម្រាមដៃចង្អុលរបស់អ្នក។"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"វាស្ថិត​នៅលើ​អេក្រង់។ សូមរកមើល​ស្នាមម្រាមដៃ​ដែលមាន​រង្វង់ភ្លឺ។"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"ឧបករណ៍ចាប់ស្នាមម្រាមដៃ​មាននៅលើអេក្រង់​របស់អ្នក។ សូមរំកិល​ម្រាមដៃ​របស់អ្នក​លើអេក្រង់ ដើម្បីរកមើលវា។"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"រូបភាពបង្ហាញទីតាំងឧបករណ៍ចាប់ស្នាមម្រាមដៃ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"ឈ្មោះ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"យល់ព្រម"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"លុប"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"ប៉ះឧបករណ៍ចាប់ស្នាមម្រាមដៃ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"ដាក់ម្រាមដៃរបស់អ្នកនៅលើឧបករណ៍ចាប់សញ្ញា ហើយលើកវាឡើងបន្ទាប់ពីអ្នកមានអារម្មណ៍ថាវាញ័រហើយ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"លើកឡើង បន្ទាប់មកប៉ះម្តងទៀត"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"បន្តលើកម្រាមដៃឡើង ដើម្បីបញ្ចូលផ្នែកផ្សេងទៀតនៃស្នាមម្រាមដៃរបស់អ្នក"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"បានបញ្ចូល​ស្នាមម្រាមដៃ​រួចហើយ"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"នៅពេលដែលអ្នកឃើញរូបតំណាងនេះ សូមប្រើស្នាមម្រាមដៃរបស់អ្នកសម្រាប់កំណត់អត្តសញ្ញាណ ឬយល់ព្រមលើការទិញ"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"ធ្វើ​នៅ​ពេលក្រោយ"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"បើក / អេក្រង់​នឹងមិន​បិទទេ ប្រសិនបើ​អ្នក​កំពុង​មើល​អេក្រង់"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"បិទ"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"តម្រូវឱ្យ​មានសិទ្ធិចូលប្រើ​កាមេរ៉ា"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"ចុចដើម្បី​គ្រប់គ្រង​ការអនុញ្ញាត​សម្រាប់​សេវាកម្មកំណត់​ឧបករណ៍​ឱ្យមានលក្ខណៈផ្ទាល់ខ្លួន"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"ទប់ស្កាត់​អេក្រង់​របស់អ្នក​មិនឱ្យបិទ ប្រសិនបើ​អ្នកកំពុងមើលវា"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"\"មុខងារដឹងថាកំពុងនៅប្រើ​\" ប្រើ​កាមេរ៉ា​ខាងមុខ ដើម្បី​មើល​ថាតើមាន​នរណាម្នាក់​កំពុង​មើល​អេក្រង់​ឬអត់។ ការសម្គាល់​របស់​អេក្រង់​ដំណើរការ​នៅលើ​ឧបករណ៍ ហើយ​រូបភាព​មិនត្រូវបាន​រក្សាទុក ឬផ្ញើទៅ Google នោះទេ។"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"បើក​ការដឹងថា​កំពុងនៅប្រើ"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"នៅពេល​អេក្រង់​ងងឹត មុខងារនេះ​នឹងបើក​សម្រាប់ការ​ជូនដំណឹងថ្មីៗ"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"បង្ហាញម៉ោង និង​ព័ត៌មាន​ជានិច្ច"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ប្រើ​ថាមពលថ្ម​ច្រើនជាងមុន"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"អក្សរ​ដិត"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"អក្សរ​ដិត"</string>
     <string name="title_font_size" msgid="570613010306330622">"ទំហំពុម្ពអក្សរ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ធ្វើឲ្យអក្សរធំជាងមុន ឬតូចជាងមុន"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"កំណត់​ការ​ចាក់សោ​ស៊ីម​កាត"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"អ្នក​ប្រើ​ប្រាស់ផ្សេងទៀត"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ឧបករណ៍ផ្ទុក"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"ឧបករណ៍ផ្ទុកចល័ត"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"ម៉ោងរោទ៍ និងការរំលឹក"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"អនុញ្ញាតឱ្យ​កំណត់ម៉ោងរោទ៍ ឬការរំលឹក"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"ម៉ោងរោទ៍ និងការរំលឹក"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"អនុញ្ញាតឱ្យ​កម្មវិធីនេះ​កំណត់កាលវិភាគ​ម៉ោងរោទ៍ ឬព្រឹត្តិការណ៍ដែលមានការកំណត់ពេល​ផ្សេងទៀត។ ការធ្វើបែបនេះនឹង​អនុញ្ញាតឱ្យកម្មវិធីនេះ​ចាប់ផ្ដើម និង​ដំណើរការ ទោះបីជានៅពេលអ្នក​មិនប្រើ​ឧបករណ៍ក៏ដោយ។ សូមចំណាំថា ការដកការអនុញ្ញាតនេះ​អាចបណ្ដាលឱ្យ​កម្មវិធី​ដំណើរការ​ខុសប្រក្រតី ជាពិសេស​ម៉ោងរោទ៍​ទាំងឡាយ​ដែលកម្មវិធីបានកំណត់កាលវិភាគ​នឹងលែងដំណើរការ។"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"កាលវិភាគ ម៉ោងរោទ៍ ការរំលឹក ព្រឹត្តិការណ៍"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"បានប្រើ <xliff:g id="USED">%1$s</xliff:g> នៃ <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"ការប្រើនៃ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"សេវាកម្ម​ទីតាំង"</string>
     <string name="location_title" msgid="5819154746934945021">"ទីតាំង​ខ្ញុំ"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ទីតាំងសម្រាប់កម្រងព័ត៌មានការងារ"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"សិទ្ធិចូលប្រើទីតាំងរបស់កម្មវិធី"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ទីតាំង​បាន​បិទ"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> កម្មវិធី <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ក្នុងចំណោម <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> មានសិទ្ធិ​ចូលប្រើ​ទីតាំង</item>
       <item quantity="one"> កម្មវិធី <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> ក្នុងចំណោម <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> មានសិទ្ធិ​ចូលប្រើ​ទីតាំង</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"ការចូលប្រើទីតាំងថ្មីៗ"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"មើល​ព័ត៌មាន​លម្អិត"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"គ្មាន​កម្មវិធី​បាន​ស្នើសុំ​ទីតាំងនាពេលថ្មីៗនេះទេ"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"មិនមានកម្មវិធីបានចូលប្រើទីតាំងកាលពីថ្មីៗនេះទេ"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ប្រើ​ថ្ម​ច្រើន"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"​ប្រើ​ថ្ម​តិច"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"ការស្កេន Wi‑Fi និងប៊្លូធូស"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"ការស្កេន Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"អនុញ្ញាត​ឱ្យ​កម្មវិធី និងសេវាកម្ម​ស្កេនរក​បណ្ដាញ Wi‑Fi បាន​គ្រប់ពេល ទោះបីជា Wi‑Fi ​បិទក៏ដោយ។ ឧទាហរណ៍ សកម្មភាព​នេះ​អាច​ត្រូវ​បាន​ប្រើ ដើម្បី​កែលម្អ​មុខងារ និងសេវាកម្មនានា​ដែល​ផ្អែក​លើ​ទីតាំង។"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ការស្កេនប៊្លូធូស"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"អនុញ្ញាត​ឱ្យ​កម្មវិធី និងសេវាកម្ម​ស្កេនរក​ឧបករណ៍ដែល​នៅ​ជិត​បាន​គ្រប់ពេល ទោះបីជា​ប៊្លូធូសបិទ​ក៏ដោយ។ ឧទាហរណ៍ សកម្មភាព​នេះ​អាច​ត្រូវ​បាន​ប្រើ ដើម្បី​កែលម្អ​មុខងារ និងសេវាកម្មនានា​ដែល​ផ្អែក​លើ​ទីតាំង។"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"សេវាកម្ម​ទីតាំង"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"សេវាកម្មទីតាំង​សម្រាប់​ការងារ"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ការចាប់ដឹងពីល្វែងម៉ោង​របស់ទីតាំង"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ការចាប់ដឹងពីល្វែងម៉ោង​របស់ទីតាំង"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"អនុញ្ញាតឱ្យប្រើ​ទីតាំងរបស់ឧបករណ៍ ដើម្បីចាប់ដឹងពី​ល្វែងម៉ោងបច្ចុប្បន្ន។ ការកំណត់ទីតាំង​ផ្សេងទៀតដូចជា ការស្កេន Wi‑Fi ជាដើម​អាចប៉ះពាល់ដល់​ភាពត្រឹមត្រូវនៃការចាប់ដឹងពី​ល្វែងម៉ោង។"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"បើក"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"បិទ"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ការចាប់ដឹងពី​ល្វែងម៉ោង​ដោយស្វ័យប្រវត្តិ​ត្រូវបាន​បិទ"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ល្វែងម៉ោង​ស្វ័យប្រវត្តិ​ត្រូវបានបិទ"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ការចាប់ដឹងពីល្វែងម៉ោង​របស់ទីតាំងត្រូវបានបិទ"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ការចាប់ដឹងពី​ល្វែងម៉ោងរបស់ទីតាំង​មិនអាចប្រើបានទេ"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ការផ្លាស់ប្ដូរ​ការចាប់ដឹងពីល្វែងម៉ោង​របស់ទីតាំងមិនត្រូវបាន​អនុញ្ញាតទេ"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"បើក"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"សម្អាត​ទំហំ​ផ្ទុក"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"លុប​បច្ចុប្បន្នភាព"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"អ្នក​បាន​ជ្រើស ដើម្បី​ចាប់ផ្ដើម​​​កម្មវិធី​នេះ​តាម​លំនាំដើម​សម្រាប់​សកម្មភាព​មួយ​ចំនួន។"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"សកម្មភាពមួយចំនួន​ដែលអ្នកបានជ្រើសរើស​បើកនៅក្នុងកម្មវិធីនេះ​តាមលំនាំដើម។"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"អ្នក​បាន​ជ្រើស​ឲ្យ​កម្មវិធី​នេះ​បង្កើត​ធាតុ​ក្រាហ្វិក និង​ចូល​ដំណើរការ​ទិន្នន័យ​របស់​វា។"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"គ្មាន​ការ​កំណត់​លំនាំដើម។"</string>
-    <string name="clear_activities" msgid="341345438786077236">"សម្អាត​លំនាំដើម"</string>
+    <string name="clear_activities" msgid="488089228657585700">"សម្អាតចំណូលចិត្ត​លំនាំដើម"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"កម្មវិធី​​នេះ​មិន​អាច​ត្រូវ​បាន​រៀបចំ​សម្រាប់​អេក្រង់​របស់​អ្នក​ទេ។ អ្នក​អាច​ពិនិត្យ​វិធី​ដែល​វា​កែ​ដើម្បី​តម្រូវ​អេក្រង់​របស់​អ្នក​នៅ​ទីនេះ។"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"សួរ​ពេល​ចាប់ផ្ដើម"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"គ្រប់គ្រង​កម្មវិធី"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"អ្នកអាចកែសម្រួលឧបករណ៍នេះឲ្យសមតាម​តម្រូវការរបស់អ្នក។ មុខងារនៃភាព​ងាយស្រួលទាំងនេះអាចផ្លាស់​ប្តូរពេលក្រោយបាននៅក្នុងការកំណត់។"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ប្ដូរ​ទំហំពុម្ពអក្សរ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"កម្មវិធី​អានអេក្រង់"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"សំឡេង និងអក្សរ​នៅលើអេក្រង់"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"អក្សររត់"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"សំឡេង"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"ទូទៅ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"បង្ហាញ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"អក្សរ និងការបង្ហាញ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ធ្វើឱ្យអេក្រង់ងងឹតជាងមុន"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ក្រហម-បៃតង"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ក្រហម-បៃតង"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ខៀវ-លឿង"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"បន្ថយពន្លឺ"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"បន្ថយ​ពន្លឺ"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ធ្វើឱ្យអេក្រង់ងងឹតជាងពន្លឺអប្បបរមារបស់ទូរសព្ទអ្នក"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ធ្វើឱ្យអេក្រង់ងងឹតជាងពន្លឺអប្បបរមារបស់ថេប្លេតអ្នក"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"ធ្វើឱ្យអេក្រង់របស់អ្នកងងឹតជាងមុន ដើម្បីឱ្យកាន់តែងាយស្រួលអាន។&lt;br/&gt;&lt;br/&gt; ការធ្វើបែបនេះអាចមានប្រយោជន៍ នៅពេល៖ &lt;ol&gt; &lt;li&gt; ពន្លឺអប្បបរមាលំនាំដើមរបស់ទូរសព្ទអ្នកនៅតែភ្លឺខ្លាំងនៅឡើយ&lt;/li&gt; &lt;li&gt; អ្នកកំពុងប្រើទូរសព្ទរបស់អ្នកនៅក្នុងស្ថានភាពងងឹតដូចជា នៅពេលយប់ ឬក្នុងបន្ទប់ងងឹតមុនពេលចូលគេងជាដើម&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3068,7 +3095,7 @@
     <string name="user_settings_footer_text" product="default" msgid="4420915712050349125">"ចែក​រំលែកទូរសព្ទរបស់អ្នក​ដោយ​បញ្ចូល​អ្នក​ប្រើប្រាស់​ថ្មី។ អ្នក​ប្រើ​ប្រាស់​ម្នាក់ៗ​មានទំហំផ្ទុកផ្ទាល់​ខ្លួន​នៅលើ​ទូរសព្ទ​របស់អ្នក​សម្រាប់​គណនី​ កម្មវិធី ការកំណត់ អេក្រង់​ដើមផ្ទាល់ខ្លួន និង​អ្វីៗ​ជាច្រើនទៀត។"</string>
     <string name="user_list_title" msgid="1387379079186123404">"អ្នកប្រើ &amp; ប្រវត្តិរូប"</string>
     <string name="user_add_user_or_profile_menu" msgid="305851380425838287">"បញ្ចូលអ្នក​ប្រើប្រាស់ ឬ​កម្រងព័ត៌មាន"</string>
-    <string name="user_add_user_menu" msgid="6395904234221724625">"បន្ថែម​អ្នកប្រើ"</string>
+    <string name="user_add_user_menu" msgid="6395904234221724625">"បញ្ចូល​អ្នកប្រើ"</string>
     <string name="user_summary_restricted_profile" msgid="451650609582185813">"ប្រវត្តិរូប​បាន​ដាក់​កម្រិត"</string>
     <string name="user_summary_not_set_up" msgid="4602868481732886115">"មិន​បាន​កំណត់"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1658946988920104613">"មិន​បាន​កំណត់-បាន​ដាក់កម្រិត​ប្រវត្តិរូប"</string>
@@ -3095,10 +3122,10 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"លុប​អ្នក​ប្រើ"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"លុប"</string>
     <string name="user_guest" msgid="4545590092001460388">"ភ្ញៀវ"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"លុប​​​ភ្ញៀវ"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"លុប​ភ្ញៀវ?"</string>
-    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"កម្មវិធី និង​ទិន្នន័យ​ទាំងអស់​ក្នុង​សម័យ​​នេះ​នឹង​ត្រូវ​បាន​លុប។"</string>
-    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"លុបចេញ"</string>
+    <string name="user_exit_guest_title" msgid="2653103120908427236">"ដកភ្ញៀវចេញ"</string>
+    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"ដកភ្ញៀវចេញឬ?"</string>
+    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"កម្មវិធី និងទិន្នន័យ​ទាំងអស់​ក្នុង​វគ្គ​នេះ​នឹង​ត្រូវ​លុប។"</string>
+    <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"ដកចេញ"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"បើកការហៅទូរសព្ទ"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"បើកការហៅទូរសព្ទ និងសារ SMS"</string>
     <string name="user_remove_user" msgid="8468203789739693845">"លុប​អ្នក​ប្រើប្រាស់"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"មុខ"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"ស្នាមម្រាមដៃ បញ្ចូល​ស្នាមម្រាមដៃ"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"អេក្រង់​ខ្សោយពន្លឺ អេក្រង់​ចុច ថ្ម ពន្លឺ​ឆ្លាតវៃ ពន្លឺ​ឌីណាមិក ពន្លឺស្វ័យប្រវត្តិ"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"បន្ថយ​ពន្លឺ​អេក្រង់ ដេក ថ្ម អស់ម៉ោង ការដឹងថាកំពុងនៅប្រើ ផ្ទាំងអេក្រង់ អេក្រង់ អសកម្ម"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"បង្វិល ត្រឡប់ រង្វិល បញ្ឈរ ផ្តេក ទិស បន្ទាត់ឈរ បន្ទាត់ដេក"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"ដំឡើងកំណែ, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, កាលវិភាគ ការជូនដំណឹង ទប់ស្កាត់ ស្ងាត់ ញ័រ ដេក ធ្វើការ ផ្តោត សំឡេង បិទសំឡេង ថ្ងៃ ថ្ងៃធ្វើការ ចុងសប្តាហ៍ ពេលយប់នៃថ្ងៃធ្វើការ ព្រឹត្តិការណ៍"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"អេក្រង់ ម៉ោង​ចាក់សោ អស់ម៉ោង អេក្រង់ចាក់សោ"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"សំឡេង​រោទ៍"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"សំឡេង និង​ការ​ញ័រ​ផ្សេងទៀត"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"ការ​ជូនដំណឹង"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"ការ​សន្ទនា"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"បានផ្ញើថ្មីៗ"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"មើល​ទាំងអស់​ចាប់​ពី​ 7 ថ្ងៃមុន"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"កម្រិតខ្ពស់"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ទូទៅ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"ការជូនដំណឹងពីកន្លែងធ្វើការ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"ការជូនដំណឺង​ដែល​មានភាព​បត់បែន"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"អាទិភាពនៃ​ការជូនដំណឹង​ដែលមាន​ភាពបត់បែន"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"បង្ហាញ​ក្នុងផ្ទាំង​ទាញចុះ របារ​ស្ថានភាព និងនៅលើ​អេក្រង់ចាក់សោ"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"លាក់​ការជូនដំណឹង​ស្ងាត់ៗ​នៅក្នុង​របារ​ស្ថានភាព"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ភ្លើងលោត"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"ការជូនដំណឹង​នៅលើ​អេក្រង់ចាក់សោ"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ឯកជនភាព"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"រំលង​អេក្រង់ចាក់សោ"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"បន្ទាប់ពី​ដោះសោតាមទម្រង់មុខរួច សូមចូលទៅ​អេក្រង់​ដែលបានប្រើ​ចុងក្រោយ​តែម្ដង"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ចាក់សោ​អេក្រង់ អេក្រង់​ចាក់សោ រំលង ការរំលង"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="one">~ការ​ជូនដំណឹង <xliff:g id="NUMBER_0">%d</xliff:g> ក្នុងមួយសប្ដាហ៍</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"កុំឱ្យសោះ"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"ចូល​ដំណើរការ​ការ​ជូន​ដំណឹង"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"ការជូនដំណឹង​ឧបករណ៍ និងកម្មវិធី"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"គ្រប់គ្រង​ថាតើការជូនដំណឹងណាខ្លះ​បង្ហាញនៅលើកម្មវិធី និងឧបករណ៍របស់អ្នក"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"ការ​ចូលប្រើប្រាស់​កម្រង​ព័ត៌មាន​ការងារ​ត្រូវ​បានទប់ស្កាត់"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"កម្មវិធី​មិន​អាច​អាន​ការ​ជូន​ដំណឹង"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"បិទ"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"បោះបង់"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"ប្រភេទនៃការជូនដំណឹងដែលអនុញ្ញាត"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"ការ​ជូនដំណឹងជាបន្តបន្ទាប់សំខាន់ៗ"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"ការ​ជូនដំណឹងអំពីការសន្ទនា"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"ការជូនដំណឹង​ញ័រ ឬរោទ៍"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"ការជូនដំណឹង​ស្ងាត់"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"ក្នុងពេលជាក់​ស្ដែង"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"ការធ្វើទំនាក់ទំនង​ក្នុងពេលជាក់ស្ដែង​ពីកម្មវិធីដែលកំពុងប្រើប្រាស់ ការរុករក ការហៅទូរសព្ទ និងអ្វីៗជាច្រើនទៀត"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"ការសន្ទនា"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS និងការធ្វើទំនាក់ទំនង​ផ្សេងទៀត"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"លំនាំដើម"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"ការជូនដំណឹង​ដែលអាចរោទ៍ ឬញ័រ ដោយផ្អែកលើការកំណត់"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"ស្ងាត់"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"ការជូនដំណឹង​ដែលមិនបញ្ចេញសំឡេង ឬញ័រ"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"មើលកម្មវិធីទាំងអស់"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"ប្ដូរការកំណត់​ការជូនដំណឹង​សម្រាប់កម្មវិធីដែល​អាចផ្ញើការជូនដំណឹងបាន"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"កម្មវិធីដែលបង្ហាញ​នៅលើឧបករណ៍"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"សេវាកម្មជំនួយ VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"មិនមានកម្មវិធីដែលបានដំឡើងត្រូវបានស្នើឲ្យដំណើរការជាសេវាកម្មជំនួយ VR នោះទេ។"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"អនុញ្ញាតឲ្យសេវាកម្ម VR ចូលដំណើរការ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"បើកតាមលំនាំដើម"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"តំណសម្រាប់បើក"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"បើកតំណគាំទ្រ"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"តំណដែលអាចប្រើបាន​បើកនៅក្នុងកម្មវិធីនេះ"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"តំណសម្រាប់​បើកនៅក្នុងកម្មវិធីនេះ"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"បើកដោយមិនបាច់សួរ"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"តំណគាំទ្រ"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"លំនាំដើមផ្សេងទៀត"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"ចំណូលចិត្ត​លំនាំដើមផ្សេងទៀត"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"បញ្ចូល​តំណ"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"កម្មវិធី​អាចផ្ទៀងផ្ទាត់តំណ ដើម្បីបើក​នៅក្នុងកម្មវិធី​ដោយស្វ័យប្រវត្តិ។ "<annotation id="url">"ស្វែងយល់បន្ថែម"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other">តំណដែល​បានផ្ទៀងផ្ទាត់ <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="one">តំណដែល​បានផ្ទៀងផ្ទាត់ <xliff:g id="COUNT_0">%d</xliff:g></item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">តំណទាំងនេះ​ត្រូវបានផ្ទៀងផ្ទាត់ និងបើកនៅក្នុងកម្មវិធីនេះ​ដោយស្វ័យប្រវត្តិ។</item>
+      <item quantity="one">តំណនេះត្រូវ​បានផ្ទៀងផ្ទាត់ និងបើកនៅក្នុង​កម្មវិធីនេះដោយស្វ័យប្រវត្តិ។</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"យល់ព្រម"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"កំពុងពិនិត្យរកមើល​តំណដែលអាចប្រើ​បានផ្សេងទៀត…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"បោះបង់"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other">តំណដែលអាចប្រើបាន <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="one">តំណដែលអាចប្រើបាន <xliff:g id="COUNT_0">%d</xliff:g></item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"បញ្ចូល"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"បើកនៅក្នុង <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"បានប្រើអស់<xliff:g id="SIZE">%1$s</xliff:g> នៅក្នុង <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"ទំហំផ្ទុក​ខាងក្នុង"</string>
     <string name="storage_type_external" msgid="125078274000280821">"ទំហំផ្ទុក​ខាងក្រៅ"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"មិនអនុញ្ញាតឲ្យប្រើកាមេរ៉ាទេ"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"មិនអនុញ្ញាតឲ្យប្រើមុខងារថតអេក្រង់ទេ"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"មិន​អាច​បើកកម្មវិធី​នេះបាន​ទេ"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"ប្រសិន​បើ​អ្នក​មាន​សំណួរ សូម​ទាក់ទង​ទៅ​អ្នក​គ្រប់គ្រង​ព័ត៌មាន​វិទ្យា​របស់អ្នក"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"ព័ត៌មានលម្អិតបន្ថែម"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"អ្នកគ្រប់គ្រង​របស់អ្នក​អាច​តាមដាន និងគ្រប់គ្រងកម្មវិធី និងទិន្នន័យដែលពាក់ព័ន្ធជាមួយកម្រង​ព័ត៌មាន​ការងារ​របស់អ្នក ដោយរាប់បញ្ចូលទាំងការកំណត់ ការអនុញ្ញាត ការចូលលក្ខណៈក្រុមហ៊ុន សកម្មភាពបណ្តាញ និងព័ត៌មានអំពីទីតាំងរបស់ឧបករណ៍នេះផងដែរ។"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"អ្នកគ្រប់គ្រង​របស់អ្នក​អាច​តាមដាន និងគ្រប់គ្រងកម្មវិធី និងទិន្នន័យដែលពាក់ព័ន្ធជាមួយអ្នក​ប្រើប្រាស់​នេះ ដោយរាប់បញ្ចូលទាំងការកំណត់ ការអនុញ្ញាត ការចូលលក្ខណៈក្រុមហ៊ុន សកម្មភាពបណ្តាញ និងព័ត៌មានអំពីទីតាំងរបស់ឧបករណ៍នេះផងដែរ។"</string>
@@ -4342,7 +4395,7 @@
       <item quantity="one">ការដាក់កំហិត 1</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ការគណនាទិន្នន័យរបស់ក្រុមហ៊ុនសេវាទូរសព្ទអាចនឹងខុសគ្នាពីការគណនារបស់ឧបករណ៍"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"មិនរួមបញ្ចូល​ទិន្នន័យ​ដែលប្រើ​ដោយ​បណ្ដាញដែលមានប្រភព​មកពីក្រុមហ៊ុនសេវាទូរសព្ទ​ទេ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"មិនរួមបញ្ចូលទិន្នន័យ​ដែលប្រើដោយបណ្ដាញដែលមានប្រភពមកពីក្រុមហ៊ុនសេវាទូរសព្ទទេ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"បានប្រើ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"កំណត់ការព្រមានពីការប្រើទិន្នន័យ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ការព្រមានពីការប្រើទិន្នន័យ"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(បានលុប​សម្រាប់​អ្នក​ប្រើ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(បានបិទ​សម្រាប់​អ្នក​ប្រើ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"សេវាកម្មបំពេញដោយស្វ័យប្រវត្តិ"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"ស្វ័យ​ប្រវត្តិ បំពេញ បំពេញ​ស្វ័យ​ប្រវត្តិ"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"ពាក្យ​សម្ងាត់"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"ស្វ័យប្រវត្តិ បំពេញ បំពេញស្វ័យប្រវត្តិ ពាក្យសម្ងាត់"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;ត្រូវ​ប្រាកដថា​អ្នក​ជឿជាក់​លើ​កម្មវិធី​នេះ&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google បំពេញស្វ័យប្រវត្តិ&gt;%1$s&lt;/xliff:g&gt; ប្រើប្រាស់​អ្វី​ដែល​មាននៅ​លើ​អេក្រង់​របស់អ្នក ដើម្បី​កំណត់​អ្វីដែល​អាចបំពេញ​ដោយ​ស្វ័យប្រវត្តិ។"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"បំពេញ​ដោយស្វ័យប្រវត្តិ"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"កម្រិត​កត់ត្រា"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ប្ដូរ​មុខងារ​​​ប្រតិបត្តិការ​បណ្ដាញ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ប្រភេទ​បណ្ដាញ​​ដែលប្រើជាអាទិភាព​"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ក្រុមហ៊ុន​សេវាទូរសព្ទ"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"កំណែការកំណត់"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"កំណែ​ការកំណត់​ក្រុមហ៊ុនសេវាទូរសព្ទ"</string>
     <string name="call_category" msgid="641461844504128789">"ការហៅទូរសព្ទ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"ការហៅ​ជា​វីដេអូ​តាម​រយៈក្រុមហ៊ុន​សេវាទូរសព្ទ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"ការជ្រើស​រើសប្រព័ន្ធ"</string>
@@ -4930,11 +4984,12 @@
     <string name="sim_action_continue" msgid="1688813133152389943">"បន្ត"</string>
     <string name="sim_action_reboot" msgid="3508948833333441538">"ចាប់ផ្ដើមឡើងវិញ"</string>
     <string name="sim_action_no_thanks" msgid="435717748384544195">"ទេ អរគុណ"</string>
-    <string name="sim_switch_button" msgid="1405772571706095387">"ប៊ូតុង​បិទបើក"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"ប្តូរ"</string>
     <string name="dsds_activation_failure_title" msgid="4467364110584914794">"មិនអាច​បើកដំណើរការ​ស៊ីមបានទេ"</string>
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"សូមដកស៊ីម រួចបញ្ចូលឡើងវិញ។ ប្រសិនបើនៅតែមានបញ្ហា សូម​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នកឡើងវិញ។"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"សូម​សាកល្បង​បើកស៊ីមម្ដងទៀត។ ប្រសិនបើនៅតែមានបញ្ហា សូម​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នកឡើងវិញ។"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ការបើកដំណើរការ​បណ្ដាញ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"ការប្ដូរក្រុមហ៊ុន​សេវា​ទូរសព្ទ"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> កំពុង​ដំណើរការ"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"ចុច​ដើម្បី​ធ្វើបច្ចុប្បន្នភាព​ការកំណត់​ស៊ីម"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"បាន​ប្ដូរទៅ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"បិទ"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"អ៊ីនធឺណិត"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"ស៊ី​ម"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"បង្ហាញ​បណ្ដាញ​នៃ​មុខងារ​ពេលជិះ​យន្តហោះ"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"ស្វែងរក និង​ភ្ជាប់​បណ្ដាញ​នៅក្នុង​មុខងារ​ពេលជិះយន្តហោះ​។"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"ស្វែងរក និងភ្ជាប់បណ្ដាញ Wi‑Fi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"យន្តហោះ មានសុវត្ថិភាព​ពេលជិះយន្តហោះ"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"ការហៅទូរសព្ទ និង SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"ការហៅ​តាម Wi-Fi"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"មិនអាចប្រើ​បានទេ"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"មិន​អាច​ប្រើ​បាន​ជា​បណ្ដោះអាសន្ន​"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"មិនមានស៊ីមទេ"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ចំណូលចិត្ត"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ចំណូលចិត្ត​បណ្តាញ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ភ្ជាប់ជាមួយ​បណ្ដាញសាធារណៈ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ការតភ្ជាប់បណ្ដាញ, អ៊ីនធឺណិត, ឥតខ្សែ, ទិន្នន័យ, wifi, wi-fi, wi fi, បណ្ដាញចល័ត, ឧបករណ៍​ចល័ត, ក្រុមហ៊ុន​សេវាទូរសព្ទចល័ត, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"មើលបណ្ដាញ​នៃមុខងារពេល​ជិះ​យន្តហោះ"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"ការមើល​បណ្ដាញ​នៃមុខងារពេល​ជិះ​យន្តហោះ"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"បើកបណ្ដាញ"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"បិទបណ្ដាញ"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"កំណត់​អ៊ីនធឺណិត​របស់អ្នក​ឡើងវិញឬ?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"ការធ្វើបែបនេះ​នឹងបញ្ចប់​ការហៅទូរសព្ទ​របស់អ្នក"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ការធ្វើបែបនេះ​នឹងបញ្ចប់​ការហៅទូរសព្ទ​របស់អ្នក"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"កំពុង​កំណត់​អ៊ីនធឺណិត​របស់អ្នក​ឡើងវិញ…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"ដោះស្រាយ​ការតភ្ជាប់"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"មានបណ្ដាញ​នៃមុខងារ​ពេលជិះ​យន្តហោះ"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ដើម្បី​ប្ដូរ​បណ្ដាញ សូមផ្ដាច់​អ៊ីសឺរណិត"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ខណៈពេលភ្ជាប់ មិនអាចប្ដូរបណ្ដាញបានទេ"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"បណ្ដាញ​ពេល​ជិះ​យន្តហោះ"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"បានភ្ជាប់"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"អ៊ីនធឺណិតនឹងមិនភ្ជាប់ដោយស្វ័យប្រវត្តិទេ"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"ពណ៌"</string>
     <string name="category_name_others" msgid="2366006298768550310">"ផ្សេងៗ"</string>
     <string name="category_name_general" msgid="7737273712848115886">"ទូទៅ"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"មើលកម្មវិធីទាំងអស់"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"ការបញ្ជូន​បន្ត​ឆ្លាតវៃ"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"បានបើក​ការបញ្ជូនបន្ត​ឆ្លាតវៃ"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"បញ្ចូល​លេខទូរសព្ទ"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"មិនបានបញ្ចូល​លេខទូរសព្ទ​ទេ។"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"យល់ព្រម"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"អនុញ្ញាត 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"ប្រើ​ការតភ្ជាប់​បណ្ដាញទូរសព្ទចល័ត 2G។ 2G ត្រូវបានបើក​ជានិច្ច សម្រាប់​ការហៅទៅលេខ​សង្គ្រោះបន្ទាន់។"</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index cd8259d..73e566f 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"ಪರದೆಯ ಮೇಲೆ ಪಠ್ಯದ ಗಾತ್ರವನ್ನು ಹಿಗ್ಗಿಸಿ ಅಥವಾ ಕುಗ್ಗಿಸಿ."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"ಚಿಕ್ಕದಾಗಿಸು"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"ದೊಡ್ಡದಾಗಿಸು"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ಸ್ವಯಂ-ತಿರುಗುವಿಕೆಯನ್ನು ಬಳಸಿ"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"ಮಾದರಿ ಪಠ್ಯ"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Oz ನ ಅದ್ಭುತವಾದ ಮಾಂತ್ರಿಕ"</string>
@@ -405,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‍‍ಗಳ ಸೆಟ್ ಅಪ್</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಮೂಲಕ ಅನ್‌ಲಾಕ್‌ ಮಾಡಿ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ಸೆಟಪ್‌ ಮಾಡಿ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್ ಸ್ಪರ್ಶಿಸಿ. ನೀವು ಯಾರ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೇರಿಸುತ್ತೀರಿ ಎಂಬುದರ ಕುರಿತು ಎಚ್ಚರದಿಂದಿರಿ. ಸೇರಿಸಲಾದ ಒಂದು ಪ್ರಿಂಟ್ ಸಹ ಇವುಗಳಲ್ಲಿ ಯಾವುದನ್ನಾದರೂ ಮಾಡಬಹುದು."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"ಸದೃಢ ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ಪಿನ್‌ಗಿಂತ ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಕಡಿಮೆ ಸುರಕ್ಷಿತವಾಗಿರಬಹುದು."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"ನಿಮ್ಮನ್ನು ನಿಯಂತ್ರಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"ನೆನಪಿನಲ್ಲಿಡಿ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಮೂಲಕ ರೆಕಾರ್ಡ್ ಮಾಡಿದ ಡೇಟಾವನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಎಂದಿಗೂ ತೊರೆಯುವುದಿಲ್ಲ. ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ನೀವು ಯಾವಗ ಬೇಕಾದರೂ ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಅಳಿಸಬಹುದು."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"ಸದೃಢ ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ಪಿನ್‌ಗಿಂತ ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಕಡಿಮೆ ಸುರಕ್ಷಿತವಾಗಿರಬಹುದು."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"ಸುಧಾರಿತ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಮಾದರಿಗಳನ್ನು ರಚಿಸಲು ನಿಮ್ಮ ಫೋನ್ ಕೆಲವೊಮ್ಮೆ ನಿಮ್ಮ ಇತ್ತೀಚಿನ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಚಿತ್ರಗಳನ್ನು ಬಳಸುತ್ತದೆ."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಖರೀದಿಗಳನ್ನು ಅನುಮೋದಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ.\n\nಗಮನಿಸಿ: ಈ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ನೀವು ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ, ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಖರೀದಿಗಳನ್ನು ಅನುಮೋದಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ.\n\nಗಮನಿಸಿ: ಸಮರ್ಥ ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ಪಿನ್‌ಗಿಂತ ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಕಡಿಮೆ ಸುರಕ್ಷಿತವಾಗಿರಬಹುದು"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ರದ್ದುಮಾಡಿ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ಬೇಡ, ಧನ್ಯವಾದಗಳು"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"ಸ್ಕಿಪ್"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ಮುಂದುವರಿಸು"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"ಸಮ್ಮತಿಸಿ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ಸ್ಕಿಪ್‌"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ಮುಂದೆ"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಸ್ಕಿಪ್ ಮಾಡಬೇಕೇ?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"ರದ್ದುಗೊಳಿಸಿ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"ಸೆನ್ಸರ್ ಸ್ಪರ್ಶಿಸಿ"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಐಕಾನ್ ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಒತ್ತಿ ಹಿಡಿಯಿರಿ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"ನಿಮ್ಮ ಫೋನ್‌ನ ಹಿಂಬದಿಯಲ್ಲಿದೆ. ನಿಮ್ಮ ತೋರು ಬೆರಳನ್ನು ಬಳಸಿ."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"ಅದು ಸ್ಕ್ರೀನ್‌ನ ಮೇಲಿದೆ. ಹೊಳೆಯುವ ವೃತ್ತವಿರುವ ಫಿಂಗರ್ ಪ್ರಿಂಟ್‌ಗಾಗಿ ಹುಡುಕಿ."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್ ನಿಮ್ಮ ಸ್ಕ್ರೀನ್‌ ಮೇಲಿದೆ. ಅದನ್ನು ಹುಡುಕಲು ನಿಮ್ಮ ಬೆರಳನ್ನು ಸ್ಕ್ರೀನ್‌ ಮೇಲೆ ಸರಿಸಿ."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"ಸಾಧನ ಮತ್ತು ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್‌ನ ಸ್ಥಳವನ್ನು ತಿಳಿಸುವ ಚಿತ್ರಣ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"ಹೆಸರು"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ಸರಿ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"ಅಳಿಸಿ"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"ಸೆನ್ಸರ್ ಸ್ಪರ್ಶಿಸಿ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"ಸೆನ್ಸರ್ ಮೇಲೆ ನಿಮ್ಮ ಬೆರಳಿರಿಸಿ ಮತ್ತು ನಿಮಗೆ ವೈಬ್ರೇಷನ್ ಅನುಭವ ಆದ ನಂತರ ತೆಗೆಯಿರಿ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"ಎತ್ತಿರಿ, ನಂತರ ಪುನಃ ಸ್ಪರ್ಶಿಸಿ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ನ ವಿವಿಧ ಭಾಗಗಳನ್ನು ಸೇರಿಸಲು ನಿಮ್ಮ ಬೆರಳನ್ನು ಎತ್ತುತ್ತಲಿರಿ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೇರಿಸಲಾಗಿದೆ"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"ನೀವು ಈ ಐಕಾನ್‌ ನೋಡಿದಾಗ, ಗುರುತಿಸಲು ಅಥವಾ ಖರೀದಿಗಳನ್ನು ಅನುಮೋದಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"ನಂತರ ಮಾಡಿ"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Search"</string>
     <string name="display_settings" msgid="7197750639709493852">"ಪ್ರದರ್ಶನ"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"ಪರದೆಯನ್ನು ಸ್ವಯಂ-ತಿರುಗಿಸು"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"ಆಫ್ ಆಗಿದೆ"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"ಆನ್ ಆಗಿದೆ"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"ಆನ್ ಆಗಿದೆ - ಮುಖ-ಆಧಾರಿತ"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"ಮುಖ ಪತ್ತೆಹಚ್ಚುವಿಕೆ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ಬಣ್ಣಗಳು"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ಪ್ರಾಕೃತಿಕ"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"ಬೂಸ್ಟ್ ಮಾಡಿರುವುದು"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ನೀವು ಸ್ಕ್ರೀನ್‌ನ ಕಡೆಗೆ ವೀಕ್ಷಿಸುತ್ತಿರುವಾಗ, ಆನ್‌ / ಸ್ಕ್ರೀನ್ ಆಫ್ ಆಗುವುದಿಲ್ಲ"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"ಆಫ್ ಮಾಡಿ"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"ಕ್ಯಾಮರಾ ಪ್ರವೇಶದ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"ಸಾಧನ ವೈಯಕ್ತೀಕರಣ ಸೇವೆಗಳ ಕುರಿತಾದ ಅನುಮತಿಗಳನ್ನು ನಿರ್ವಹಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"ನೀವು ಸ್ಕ್ರೀನ್ ವೀಕ್ಷಿಸುತ್ತಿದ್ದರೆ, ಅದನ್ನು ಆಫ್ ಆಗದಂತೆ ತಡೆಯುತ್ತದೆ"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"ಯಾರಾದರೂ ಸ್ಕ್ರೀನ್‌ ಕಡೆಗೆ ನೋಡುತ್ತಿದ್ದಾರೆಯೇ ಎಂಬುದನ್ನು ವೀಕ್ಷಿಸಲು, ಸ್ಕ್ರೀನ್ ಆನ್ ಆಗಿರುವಿಕೆ ಮುಂಬದಿ ಕ್ಯಾಮರಾವನ್ನು ಬಳಸುತ್ತದೆ. ಈ ವೈಶಿಷ್ಟ್ಯವು ಸಾಧನದಲ್ಲಿ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತದೆ ಮತ್ತು ಚಿತ್ರಗಳನ್ನು ಎಂದಿಗೂ ಸಂಗ್ರಹಿಸುವುದಿಲ್ಲ ಅಥವಾ Google ಗೆ ಕಳುಹಿಸುವುದಿಲ್ಲ."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"ಸ್ಕ್ರೀನ್ ಆನ್ ಆಗಿರುವಿಕೆ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆನ್ ಮಾಡಿ"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"ಪರದೆಯು ಡಾರ್ಕ್ ಆಗಿದ್ದಾಗ, ಅದು ಹೊಸ ಅಧಿಸೂಚನೆಗಳಿಗಾಗಿ ಆನ್ ಆಗುತ್ತದೆ"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"ಯಾವಾಗಲೂ ಸಮಯ &amp; ಮಾಹಿತಿ ತೋರಿಸಿ"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ಅಧಿಕ ಬ್ಯಾಟರಿ ಬಳಕೆ"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"ದಪ್ಪ ಅಕ್ಷರದ ಪಠ್ಯ"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"ದಪ್ಪ ಅಕ್ಷರದ ಪಠ್ಯ"</string>
     <string name="title_font_size" msgid="570613010306330622">"ಫಾಂಟ್ ಗಾತ್ರ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ಪಠ್ಯವನ್ನು ಸಣ್ಣದು ಅಥವಾ ದೊಡ್ಡದು ಮಾಡಿ"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಲಾಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"ಇತರ ಬಳಕೆದಾರರು"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ಸಾಧನ ಸಂಗ್ರಹಣೆ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"ಪೋರ್ಟಬಲ್‌ ಸಂಗ್ರಹಣೆ"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"ಅಲಾರಾಮ್‌ಗಳು ಮತ್ತು ರಿಮೈಂಡರ್‌ಗಳು"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"ಅಲಾರಾಮ್‌ಗಳು ಅಥವಾ ರಿಮೈಂಡರ್‌ಗಳನ್ನು ಹೊಂದಿಸಲು ಅನುಮತಿಸಿ"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"ಅಲಾರಾಮ್‌ಗಳು ಮತ್ತು ರಿಮೈಂಡರ್‌ಗಳು"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"ಅಲಾರಾಮ್‌ಗಳು ಅಥವಾ ಸಮಯಾಧಾರಿತ ಈವೆಂಟ್‌ಗಳನ್ನು ನಿಗದಿಪಡಿಸಲು ಈ ಆ್ಯಪ್‌ಗೆ ಅನುಮತಿ ನೀಡಿ. ನೀವು ಸಾಧನವನ್ನು ಬಳಸದೇ ಇದ್ದಾಗಲೂ, ಜಾಗೃತಗೊಳಿಸಲು ಮತ್ತು ರನ್ ಆಗಲು ಇದು ಈ ಆ್ಯಪ್‌ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಈ ಅನುಮತಿಯನ್ನು ಹಿಂತೆಗೆದುಕೊಳ್ಳುವುದು ಆ್ಯಪ್ ಅನ್ನು ಅಸಮರ್ಪಕಗೊಳಿಸುತ್ತದೆ, ನಿರ್ದಿಷ್ಟವಾಗಿ ಆ್ಯಪ್ ನಿಗದಿಪಡಿಸಿದ ಯಾವುದೇ ಅಲಾರಾಮ್‌ಗಳು ಇನ್ನು ಮುಂದೆ ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"ನಿಗದಿತ, ಅಲಾರಾಮ್, ರಿಮೈಂಡರ್, ಈವೆಂಟ್"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> ರಲ್ಲಿ <xliff:g id="USED">%1$s</xliff:g> ಬಳಸಲಾಗಿದೆ"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> ರಲ್ಲಿ ಬಳಸಲಾಗಿದೆ"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"ಸ್ಥಳ ಸೇವೆಗಳು"</string>
     <string name="location_title" msgid="5819154746934945021">"ನನ್ನ ಸ್ಥಳ"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ನ ಸ್ಥಳ"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"ಸ್ಥಳಕ್ಕಾಗಿ ಆ್ಯಪ್ ಪ್ರವೇಶ"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ಸ್ಥಳ ಆಫ್‌ ಆಗಿದೆ"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ಆ್ಯಪ್‌ಗಳು ಸ್ಥಳಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ಹೊಂದಿದೆ</item>
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ಆ್ಯಪ್‌ಗಳು ಸ್ಥಳಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ಹೊಂದಿದೆ</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"ಇತ್ತೀಚಿನ ಸ್ಥಳದ ಪ್ರವೇಶ"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"ವಿವರಗಳನ್ನು ನೋಡಿ"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"ಇತ್ತೀಚೆಗೆ ಯಾವುದೇ ಆ್ಯಪ್‍‍ಗಳು ಸ್ಥಳವನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"ಇತ್ತೀಚೆಗೆ ಯಾವುದೇ ಆ್ಯಪ್‌ಗಳು ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಿಲ್ಲ"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ಹೆಚ್ಚು ಬ್ಯಾಟರಿಯ ಬಳಕೆ"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ಕಡಿಮೆ ಬ್ಯಾಟರಿಯ ಬಳಕೆ"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"ವೈ-ಫೈ ಮತ್ತು ಬ್ಲ್ಯೂಟೂತ್ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"ವೈ-ಫೈ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"ವೈ-ಫೈ ಆಫ್‌ ಆಗಿದ್ದರೂ ಸಹ, ಯಾವ ಸಮುಯದಲ್ಲಾದರೂ ವೈ-ಫೈಗೆ ಸ್ಕ್ಯಾನ್‌ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಅನುಮತಿಸಿ. ಉದಾಹರಣೆಗೆ, ಸ್ಥಳ ಆಧಾರಿತ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಸುಧಾರಿಸಲು ಇದನ್ನು ಬಳಸಬಹುದಾಗಿದೆ."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ಬ್ಲೂಟೂತ್ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ಬ್ಲೂಟೂತ್‌ ಆಫ್‌ ಆಗಿದ್ದರೂ ಸಹ, ಯಾವ ಸಮಯದಲ್ಲಾದರೂ ಸಮೀಪದ ಸಾಧನಗಳಿಗೆ ಸ್ಕ್ಯಾನ್‌ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಅನುಮತಿಸಿ. ಉದಾಹರಣೆಗೆ, ಸ್ಥಳ ಆಧಾರಿತ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಸುಧಾರಿಸಲು ಇದನ್ನು ಬಳಸಬಹುದಾಗಿದೆ."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"ಸ್ಥಳ ಸೇವೆಗಳು"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ಕೆಲಸಕ್ಕಾಗಿ ಸ್ಥಳ ಸೇವೆಗಳು"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ಸ್ಥಳದ ಸಮಯವಲಯದ ಪತ್ತೆಹಚ್ಚುವಿಕೆ"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ಸ್ಥಳದ ಸಮಯವಲಯದ ಪತ್ತೆಹಚ್ಚುವಿಕೆ"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"ಪ್ರಸ್ತುತ ಸಮಯವಲಯವನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಈ ಸಾಧನದ ಸ್ಥಳವನ್ನು ಬಳಸಲು ಅನುಮತಿಸುತ್ತದೆ. ವೈ-ಫೈ ಸ್ಕ್ಯಾನಿಂಗ್‌ನಂತಹ ಇತರ ಸ್ಥಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಸಮಯವಲಯದ ಪತ್ತೆಹಚ್ಚುವಿಕೆಯ ನಿಖರತೆಯ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರಬಹುದು."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ಆನ್ ಆಗಿದೆ"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ಆಫ್ ಆಗಿದೆ"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ಸಮಯವಲಯವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪತ್ತೆಹಚ್ಚುವ ವೈಶಿಷ್ಟ್ಯವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ಸ್ವಯಂಚಾಲಿತ ಸಮಯ ವಲಯ ಆಫ್ ಆಗಿದೆ"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ಸ್ಥಳದ ಸಮಯವಲಯದ ಪತ್ತೆಹಚ್ಚುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ಸ್ಥಳದ ಸಮಯವಲಯದ ಪತ್ತೆಹಚ್ಚುವಿಕೆಯನ್ನು ಬೆಂಬಲಿಸಲಾಗುವುದಿಲ್ಲ"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ಸ್ಥಳದ ಸಮಯವಲಯದ ಪತ್ತೆಹಚ್ಚುವಿಕೆಯಲ್ಲಿ ಬದಲಾವಣೆ ಮಾಡಲು ಅನುಮತಿಯಿಲ್ಲ"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"ಸಕ್ರಿಯಗೊಳಿಸು"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"ಸಂಗ್ರಹಣೆಯನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"ನವೀಕರಣಗಳನ್ನು ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"ಕೆಲವು ಕ್ರಮಗಳಿಗಾಗಿ ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಡಿಫಾಲ್ಟ್ ಆಗಿ ಪ್ರಾರಂಭಿಸಲು ನೀವು ಆಯ್ಕೆ ಮಾಡಿರುವಿರಿ."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"ನೀವು ಆಯ್ಕೆ ಮಾಡಿದ ಕೆಲವು ಚಟುವಟಿಕೆಗಳು ಡಿಫಾಲ್ಟ್ ಆಗಿ ಈ ಆ್ಯಪ್‌ನಲ್ಲಿ ತೆರೆಯುತ್ತವೆ."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅನುಮತಿಸಲು ನೀವು ವಿಜೆಟ್‌ಗಳನ್ನು ರಚಿಸಲು ಮತ್ತು ಅವುಗಳ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಲು ಆಯ್ಕೆಮಾಡಿಕೊಂಡಿರುವಿರಿ."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"ಡೀಫಾಲ್ಟ್‌ಗಳನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ."</string>
-    <string name="clear_activities" msgid="341345438786077236">"ಡೀಫಾಲ್ಟ್‌ಗಳನ್ನು ಅಳಿಸಿ"</string>
+    <string name="clear_activities" msgid="488089228657585700">"ಡೀಫಾಲ್ಟ್ ಆದ್ಯತೆಗಳನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ನಿಮ್ಮ ಪರದೆಗೆ ಅನುಗುಣವಾಗಿ ವಿನ್ಯಾಸಗೊಳಿಸದೆ ಇರಬಹುದು. ನಿಮ್ಮ ಪರದೆಗೆ ಇದು ಹೇಗೆ ಹೊಂದಿಕೊಳ್ಳುತ್ತದೆ ಎಂಬುದನ್ನು ನೀವು ಇಲ್ಲಿ ನಿಯಂತ್ರಿಸಬಹುದು."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"ಆರಂಭಿಸಿದಾಗ ಕೇಳು"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಳತೆ ಮಾಡು"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ನಿಮ್ಮ ಅಗತ್ಯಗಳಿಗೆ ಸರಿಹೊಂದುವಂತೆ ಈ ಸಾಧನವನ್ನು ನೀವು ಕಸ್ಟಮೈಸ್ ಮಾಡಬಹುದು. ಈ ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ನಂತರ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ಫಾಂಟ್ ಗಾತ್ರ ಬದಲಿಸಿ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"ಪರದೆ ರೀಡರ್‌ಗಳು"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ಆಡಿಯೋ ಮತ್ತು ಪರದೆಯ ಮೇಲಿನ ಪಠ್ಯ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"ಶೀರ್ಷಿಕೆಗಳು"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ಆಡಿಯೊ"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"ಸಾಮಾನ್ಯ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ಪ್ರದರ್ಶನ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ಪಠ್ಯ ಮತ್ತು ಡಿಸ್‌ಪ್ಲೇ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ಸ್ಕ್ರೀನ್ ಅನ್ನು ಇನ್ನಷ್ಟು ಡಾರ್ಕ್ ಆಗಿಸಿ"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ಕೆಂಪು-ಹಸಿರು"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ಕೆಂಪು-ಹಸಿರು"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ನೀಲಿ-ಹಳದಿ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ಪ್ರಖರತೆಯನ್ನು ಕಡಿಮೆ ಮಾಡಿ"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"ಪ್ರಖರತೆಯನ್ನು ಕಡಿಮೆ ಮಾಡಿ"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ಸ್ಕ್ರೀನ್ ಅನ್ನು ನಿಮ್ಮ ಫೋನ್‌ನ ಕನಿಷ್ಠ ಪ್ರಖರತೆಗಿಂತ ಡಾರ್ಕ್ ಮಾಡಿ"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ಸ್ಕ್ರೀನ್ ಅನ್ನು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ನ ಕನಿಷ್ಠ ಪ್ರಖರತೆಗಿಂತ ಡಾರ್ಕ್ ಮಾಡಿ"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"ಓದುವುದನ್ನು ಹೆಚ್ಚು ಆರಾಮದಾಯಕವಾಗಿಸಲು ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಡಾರ್ಕ್ ಮಾಡಿ.&lt;br/&gt;&lt;br/ಇದರಿಂದ ಈ ಕೆಳಗಿನ ಸಂದರ್ಭಗಳಲ್ಲಿ ಅನುಕೂಲವಾಗುತ್ತದೆ: &lt;ol&gt; &lt;li&gt; ನಿಮ್ಮ ಫೋನ್‌ನ ಡೀಫಾಲ್ಟ್ ಕನಿಷ್ಠ ಪ್ರಖರತೆ ಬಹಳ ಪ್ರಖರವಾಗಿದ್ದಾಗ&lt;/li&gt; &lt;li&gt; ನೀವು ರಾತ್ರಿ ವೇಳೆ ಅಥವಾ ಮಲಗುವ ಮೊದಲು ಕತ್ತಲೆ ಕೋಣೆಯಲ್ಲಿ, ಇಂತಹ ಕತ್ತಲಿರುವ ಸಂದರ್ಭಗಳಲ್ಲಿ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಬಳಸುತ್ತಿರುವಾಗ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"ಮುಖ"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್, ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೇರಿಸಿ"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"ಡಿಮ್ ಸ್ಕ್ರೀನ್, ಟಚ್‌ಸ್ಕ್ರೀನ್, ಬ್ಯಾಟರಿ, ಸ್ಮಾರ್ಟ್ ಪ್ರಖರತೆ, ಡೈನಾಮಿಕ್ ಪ್ರಖರತೆ, ಸ್ವಯಂ ಪ್ರಖರತೆ"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"ಮಂದ ಸ್ಕ್ರೀನ್, ಸ್ಲೀಪ್, ಬ್ಯಾಟರಿ, ಅವಧಿ ಮುಕ್ತಾಯ, ಆನ್ ಆಗಿರುವಿಕೆ, ಡಿಸ್‌ಪ್ಲೇ, ಸ್ಕ್ರೀನ್, ನಿಷ್ಕ್ರಿಯತೆ"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"ತಿರುಗಿಸಿ, ಫ್ಲಿಪ್, ಸರದಿ, ಭಾವಚಿತ್ರ, ಲ್ಯಾಂಡ್‌ಸ್ಕೇಪ್, ದೃಷ್ಟಿಕೋನ, ಲಂಬವಾದ, ಅಡ್ಡವಾದ"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"ಅಪ್‌ಗ್ರೇಡ್ ಮಾಡಿ, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, ನಿಗದಿಗೊಳಿಸಿ, ಅಧಿಸೂಚನೆಗಳು, ನಿರ್ಬಂಧಿಸಿ, ನಿಶ್ಯಬ್ಧಗೊಳಿಸಿ, ವೈಬ್ರೇಟ್, ನಿದ್ರಾವಸ್ಥೆ, ಕೆಲಸ, ಫೋಕಸ್, ಧ್ವನಿ, ಮ್ಯೂಟ್, ದಿನ, ವಾರದದಿನ, ವಾರಾಂತ್ಯ, ವಾರದ ರಾತ್ರಿ, ಈವೆಂಟ್"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ಪರದೆ, ಲಾಕ್ ಸಮಯ, ಸ್ಕ್ರೀನ್ ಅವಧಿ ಮುಕ್ತಾಯ, ಲಾಕ್‌ಪರದೆ"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ರಿಂಗ್‌ಟೋನ್‌ಗಳು"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"ಇತರ ಧ್ವನಿ ಮತ್ತು ವೈಬ್ರೇಷನ್‌ ಆದ್ಯತೆಗಳು"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"ಅಧಿಸೂಚನೆಗಳು"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"ಸಂವಾದ"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"ಇತ್ತೀಚೆಗೆ ಕಳುಹಿಸಿರುವುದು"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ಕಳೆದ 7 ದಿನಗಳಿಂದ ಎಲ್ಲವನ್ನೂ ನೋಡಿ"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"ಸುಧಾರಿತ"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ಸಾಮಾನ್ಯ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"ಕೆಲಸದ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"ಹೊಂದಿಸಬಲ್ಲ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ಅಡಾಪ್ಟಿವ್‌ ಅಧಿಸೂಚನೆಯ ಆದ್ಯತೆ"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"ಪುಲ್-ಡೌನ್ ಶೇಡ್‌ನಲ್ಲಿ, ಸ್ಥಿತಿ ಪಟ್ಟಿಯಲ್ಲಿ ಮತ್ತು ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಮೇಲೆ ಡಿಸ್‌ಪ್ಲೇ ಆಗುತ್ತದೆ"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ಸ್ಥಿತಿ ಪಟ್ಟಿಯಲ್ಲಿ ನಿಶ್ಶಬ್ಧ ಅಧಿಸೂಚನೆಗಳನ್ನು ಮರೆಮಾಡಿ"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ಮಿನುಗುವ ಲೈಟ್‌"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"ಲಾಕ್‌ ಸ್ಕ್ರೀನ್ ಮೇಲೆ ಅಧಿಸೂಚನೆ"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ಗೌಪ್ಯತೆ"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ಫೇಸ್ ಅನ್‌ಲಾಕ್‌ನ ನಂತರ, ಕೊನೆಗೆ ಬಳಸಿದ ಸ್ಕ್ರೀನ್‌ಗೆ ನೇರವಾಗಿ ಹೋಗಿ"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ಲಾಕ್ ಸ್ಕ್ರೀನ್, ಲಾಕ್‌ಸ್ಕ್ರೀನ್, ಸ್ಕಿಪ್ ಮಾಡಿ, ಬೈಪಾಸ್"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="other">ಪ್ರತಿ ವಾರಕ್ಕೆ ~<xliff:g id="NUMBER_1">%d</xliff:g> ಅಧಿಸೂಚನೆಗಳು</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"ಎಂದೂ ಇಲ್ಲ"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"ಅಧಿಸೂಚನೆ ಪ್ರವೇಶ"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"ಸಾಧನದ &amp; ಆ್ಯಪ್ ಅಧಿಸೂಚನೆಗಳು"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"ನಿಮ್ಮ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಸಾಧನಗಳಲ್ಲಿ ಯಾವ ಅಧಿಸೂಚನೆಗಳು ತೋರಿಸಬೇಕು ಎಂಬುದನ್ನು ನಿಯಂತ್ರಿಸಿ"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್‌ ಅಧಿಸೂಚನೆಗಳಿಗೆ ಪ್ರವೇಶವನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಧಿಸೂಚನೆಗಳನ್ನು ಓದಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"ಆಫ್ ಮಾಡಿ"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"ರದ್ದು ಮಾಡಿ"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"ಅನುಮತಿಸಿದ ಅಧಿಸೂಚನೆ ಪ್ರಕಾರಗಳು"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"ಪ್ರಗತಿಯಲ್ಲಿರುವ ಮುಖ್ಯವಾದ ಅಧಿಸೂಚನೆಗಳು"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"ಸಂಭಾಷಣೆಯ ಅಧಿಸೂಚನೆಗಳು"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"ಎಚ್ಚರಿಸುವ ಅಧಿಸೂಚನೆಗಳು"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"ನಿಶ್ಶಬ್ಧ ಅಧಿಸೂಚನೆಗಳು"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"ನೈಜ ಸಮಯ"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"ಬಳಕೆಯಲ್ಲಿರುವ ಆ್ಯಪ್‌ಗಳು, ನ್ಯಾವಿಗೇಷನ್, ಫೋನ್ ಕರೆಗಳು ಮತ್ತು ಇನ್ನೂ ಮುಂತಾದವುಗಳಿಂದ ನೈಜ-ಸಮಯದ ಸಂವಹನ"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"ಸಂವಾದಗಳು"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS ಹಾಗೂ ಇತರೆ ಸಂವಹನಗಳು"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"ಡಿಫಾಲ್ಟ್"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಆಧರಿಸಿ ರಿಂಗ್ ಅಥವಾ ವೈಬ್ರೇಟ್ ಆಗುವ ಅಧಿಸೂಚನೆಗಳು"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"ನಿಶ್ಯಬ್ಧ"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"ಶಬ್ದ ಅಥವಾ ವೈಬ್ರೇಷನ್‌ಗಳನ್ನು ಎಂದಿಗೂ ಮಾಡದ ಅಧಿಸೂಚನೆಗಳು"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"ಎಲ್ಲಾ ಆ್ಯಪ್‌ಗಳನ್ನು ನೋಡಿ"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಕಳುಹಿಸಬಹುದಾದ ಪ್ರತಿ ಆ್ಯಪ್‌ಗಾಗಿ ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಿ"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"ಸಾಧನದಲ್ಲಿ ತೋರಿಸಿದ ಆ್ಯಪ್‌ಗಳು"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR ಸಹಾಯ ಸೇವೆಗಳು"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು VR ಸಹಾಯಕ ಸೇವೆಗಳ ರೀತಿಯಲ್ಲಿ ರನ್ ಮಾಡಲು ವಿನಂತಿಸಿಲ್ಲ."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> ಗೆ VR ಸೇವೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"ಡಿಫಾಲ್ಟ್ ಮೂಲಕ ತೆರೆಯಿರಿ"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"ತೆರೆಯುವ ಲಿಂಕ್‍ಗಳು"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"ಬೆಂಬಲಿತ ಲಿಂಕ್‌ಗಳನ್ನು ತೆರೆಯಿರಿ"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"ಈ ಆ್ಯಪ್‌ನಲ್ಲಿ ತೆರೆಯಲು ಇರುವ ಬೆಂಬಲಿತ ಲಿಂಕ್‌ಗಳು"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"ಈ ಆ್ಯಪ್‌ನಲ್ಲಿ ತೆರೆಯಲು ಇರುವ ಲಿಂಕ್‌ಗಳು"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"ಕೇಳದೆ ತೆರೆಯಿರಿ"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"ಬೆಂಬಲಿತ ಲಿಂಕ್‌ಗಳು"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"ಇತರ ಡೀಫಾಲ್ಟ್‌ಗಳು"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"ಇತರೆ ಡೀಫಾಲ್ಟ್ ಆದ್ಯತೆಗಳು"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"ಲಿಂಕ್ ಸೇರಿಸಿ"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"ಆ್ಯಪ್‌ನಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ತೆರೆಯಲು ಆ್ಯಪ್ ಲಿಂಕ್‌ಗಳನ್ನು ದೃಢೀಕರಿಸಬಹುದು. "<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ದೃಢೀಕರಿಸಿದ ಲಿಂಕ್‌ಗಳು</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ದೃಢೀಕರಿಸಿದ ಲಿಂಕ್‌ಗಳು</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">ಈ ಲಿಂಕ್‌ಗಳನ್ನು ದೃಢೀಕರಿಸಲಾಗಿದೆ ಹಾಗೂ ಈ ಆ್ಯಪ್‌ನಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ತೆರೆಯುತ್ತವೆ.</item>
+      <item quantity="other">ಈ ಲಿಂಕ್‌ಗಳನ್ನು ದೃಢೀಕರಿಸಲಾಗಿದೆ ಹಾಗೂ ಈ ಆ್ಯಪ್‌ನಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ತೆರೆಯುತ್ತವೆ.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ಸರಿ"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"ಇತರೆ ಬೆಂಬಲಿತ ಲಿಂಕ್‌ಗಳಿಗಾಗಿ ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"ರದ್ದುಮಾಡಿ"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ಬೆಂಬಲಿತ ಲಿಂಕ್‌ಗಳು</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ಬೆಂಬಲಿತ ಲಿಂಕ್‌ಗಳು</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"ಸೇರಿಸಿ"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> ನಲ್ಲಿ ತೆರೆಯುತ್ತದೆ"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>ಯಲ್ಲಿ <xliff:g id="SIZE">%1$s</xliff:g> ಬಳಸಲಾಗಿದೆ"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆ"</string>
     <string name="storage_type_external" msgid="125078274000280821">"ಬಾಹ್ಯ ಸಂಗ್ರಹಣೆ"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"ಕ್ಯಾಮರಾಗೆ ಅನುಮತಿಯಿಲ್ಲ"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"ಸ್ಕ್ರೀನ್‌ಶಾಟ್‌ಗೆ ಅನುಮತಿಯಿಲ್ಲ"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"ಈ ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"ನಿಮಗೆ ಯಾವುದೇ ಪ್ರಶ್ನೆಗಳಿದ್ದರೆ, ನಿಮ್ಮ ಐಟಿ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"ಇನ್ನಷ್ಟು ವಿವರಗಳು"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಪ್ರವೇಶ, ನೆಟ್‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ಗೆ ಸಂಬಂಧಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಪ್ರವೇಶ, ನೆಟ್‌‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ಈ ಬಳಕೆದಾರರಿಗೆ ಸಂಬಂಧಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ನಿರ್ಬಂಧಗಳು</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ವಾಹಕ ಡೇಟಾ ಲೆಕ್ಕಾಚಾರವು ಸಾಧನ ಲೆಕ್ಕಾಚಾರಕ್ಕಿಂತ ಭಿನ್ನವಾಗಿರಬಹುದು"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"ವಾಹಕ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ಬಳಸುವ ಡೇಟಾವನ್ನು ಹೊರತುಪಡಿಸುತ್ತದೆ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"ವಾಹಕ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ಬಳಸುವ ಡೇಟಾವನ್ನು ಹೊರತುಪಡಿಸುತ್ತದೆ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ಬಳಸಲಾಗಿದೆ"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ಡೇಟಾ ಎಚ್ಚರಿಕೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ಡೇಟಾ ಎಚ್ಚರಿಕೆ"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g> ಬಳಕೆದಾರರಿಗೆ ಅಸ್ಥಾಪಿಸಲಾಗಿದೆ)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g> ಬಳಕೆದಾರರಿಗೆ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"ಸ್ವಯಂತುಂಬುವಿಕೆ ಸೇವೆ"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"ಸ್ವಯಂ, ತುಂಬುವಿಕೆ, ಸ್ವಯಂತುಂಬುವಿಕೆ"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"ಪಾಸ್‌ವರ್ಡ್‌ಗಳು"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"ಸ್ವಯಂಚಾಲಿತ, ಭರ್ತಿ ಮಾಡುವಿಕೆ, ಸ್ವಯಂ-ಭರ್ತಿಮಾಡುವಿಕೆ, ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;ನಿಮಗೆ ಈ ಅಪ್ಲಿಕೇಶನ್ ಮೇಲೆ ವಿಶ್ವಾಸವಿರುವುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ &lt;/b&gt; &lt;br/&gt; &lt;br/&gt; ಯಾವ ಕ್ಷೇತ್ರಗಳನ್ನು ಸ್ವಯಂ-ಭರ್ತಿ ಮಾಡಬಹುದು ಎಂಬುದನ್ನು ನಿರ್ಧರಿಸಲು &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ನಿಮ್ಮ ಪರದೆಯಲ್ಲಿರುವ ಮಾಹಿತಿಯನ್ನು ಬಳಸಿಕೊಳ್ಳುತ್ತದೆ."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"ಸ್ವಯಂ ಭರ್ತಿ"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"ಲಾಗ್ ಮಾಡುವ ಹಂತ"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ನೆಟ್‌ವರ್ಕ್‌ ಕಾರ್ಯಾಚರಣೆ ಮೋಡ್‌ ಬದಲಾಯಿಸಿ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್‌ವರ್ಕ್‌ ಪ್ರಕಾರ"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ಕ್ಯಾರಿಯರ್"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಆವೃತ್ತಿ"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"ಕ್ಯಾರಿಯರ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಆವೃತ್ತಿ"</string>
     <string name="call_category" msgid="641461844504128789">"ಕರೆಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"ವಾಹಕ ವೀಡಿಯೊ ಕರೆ ಮಾಡುವಿಕೆ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"ಸಿಸ್ಟಂ ಆಯ್ಕೆ"</string>
@@ -4924,8 +4972,8 @@
     <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"ವಾಹಕವನ್ನು ಬದಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ದೋಷವೊಂದರ ಕಾರಣದಿಂದಾಗಿ ವಾಹಕವನ್ನು ಬದಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಅನ್ನು ಆಫ್ ಮಾಡುವುದೇ?"</string>
-    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ಸಿಮ್ ಅನ್ನು ಆಫ್ ಮಾಡುವುದೇ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಅನ್ನು ಆಫ್ ಮಾಡಬೇಕೇ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ಸಿಮ್ ಅನ್ನು ಆಫ್ ಮಾಡಬೇಕೇ?"</string>
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ಸಿಮ್ ಅನ್ನು ಆಫ್ ಮಾಡಲಾಗುತ್ತಿದೆ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
     <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"ವಾಹಕವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ಏನೋ ತಪ್ಪಾಗಿದೆ ಮತ್ತು ನಿಮ್ಮ ವಾಹಕವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ಸಿಮ್ ಅನ್ನು ತೆಗೆದುಹಾಕಿ ಹಾಗೂ ಅದನ್ನು ಮತ್ತೆ ಸೇರಿಸಿ. ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ಸಿಮ್ ಅನ್ನು ಮತ್ತೆ ಆನ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ನೆಟ್‌ವರ್ಕ್ ಸಕ್ರಿಯಗೊಳಿಸುವಿಕೆ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"ವಾಹಕ ಬದಲಾಯಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಸಕ್ರಿಯವಾಗಿದೆ"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸಲಾಗಿದೆ"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"ಆಫ್ ಆಗಿದೆ"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"ಇಂಟರ್ನೆಟ್"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"ಸಿಮ್‌ಗಳು"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ತೋರಿಸಿ"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್‌ನಲ್ಲಿರುವಾಗ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಹುಡುಕಿ ಮತ್ತು ಕನೆಕ್ಟ್ ಮಾಡಿ."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"ವೈಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಹುಡುಕಿ ಹಾಗೂ ಅವುಗಳಿಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ಏರ್‌ಪ್ಲೇನ್, ಏರ್‌ಪ್ಲೇನ್-ಸುರಕ್ಷತಾ"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"ಕರೆಗಳು &amp; SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ತಾತ್ಕಾಲಿಕವಾಗಿ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"ಯಾವುದೇ ಸಿಮ್ ಇಲ್ಲ"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ನೆಟ್‌ವರ್ಕ್ ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ಸಾರ್ವಜನಿಕ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ನೆಟ್‌ವರ್ಕ್ ಕನೆಕ್ಷನ್, ಇಂಟರ್ನೆಟ್, ವೈರ್‌ಲೆಸ್, ಡೇಟಾ, ವೈಫೈ, ವೈ-ಫೈ, ವೈ ಫೈ, ಸೆಲ್ಯುಲಾರ್, ಮೊಬೈಲ್, ಸೆಲ್ ವಾಹಕ, 4g, 3g, 2g, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ನೋಡಿ"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ವೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಆನ್ ಮಾಡಿ"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಆಫ್ ಮಾಡಿ"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"ನಿಮ್ಮ ಇಂಟರ್ನೆಟ್ ಅನ್ನು ರೀಸೆಟ್ ಮಾಡಬೇಕೇ?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"ಇದರಿಂದ ನಿಮ್ಮ ಫೋನ್ ಕರೆ ಕೊನೆಗೊಳ್ಳುತ್ತದೆ"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ಇದರಿಂದ ನಿಮ್ಮ ಫೋನ್ ಕರೆ ಕೊನೆಗೊಳ್ಳುತ್ತದೆ"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"ನಿಮ್ಮ ಇಂಟರ್ನೆಟ್ ಅನ್ನು ರೀಸೆಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಿಕೆಯ ದೋಷವನ್ನು ಸರಿಪಡಿಸಿ"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ಲಭ್ಯವಿವೆ"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಬದಲಿಸಲು, ಇಥರ್ನೆಟ್ ಅನ್ನು ಡಿಸ್‌ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ಕನೆಕ್ಟ್ ಆಗುವಾಗ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಬದಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"ಕನೆಕ್ಟ್ ಆಗಿದೆ"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"ಇಂಟರ್ನೆಟ್ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಕನೆಕ್ಟ್ ಆಗುವುದಿಲ್ಲ"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"ಬಣ್ಣ"</string>
     <string name="category_name_others" msgid="2366006298768550310">"ಇತರೆ"</string>
     <string name="category_name_general" msgid="7737273712848115886">"ಸಾಮಾನ್ಯ"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"ಎಲ್ಲಾ ಆ್ಯಪ್‌ಗಳನ್ನು ನೋಡಿ"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"ಸ್ಮಾರ್ಟ್ ಫಾರ್ವರ್ಡ್ ಮಾಡುವಿಕೆ"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"ಸ್ಮಾರ್ಟ್ ಫಾರ್ವರ್ಡ್ ಮಾಡುವಿಕೆ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ಫೋನ್ ಸಂಖ್ಯೆ ತಪ್ಪಿಹೋಗಿದೆ."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ಸರಿ"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G ಅನ್ನು ಅನುಮತಿಸಿ"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G ಸೆಲ್ಯುಲಾರ್ ಸಂಪರ್ಕಗಳನ್ನು ಬಳಸಿ. ತುರ್ತು ಕರೆಗಳಿಗಾಗಿ, 2G ಅನ್ನು ಯಾವಾಗಲೂ ಆನ್ ಮಾಡಲಾಗುತ್ತದೆ."</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index bb2541b..6cc88b5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"화면 텍스트를 축소 또는 확대합니다."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"축소"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"확대"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"자동 회전 사용"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"샘플 텍스트"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"오즈의 마법사"</string>
@@ -405,15 +404,21 @@
       <item quantity="one">지문 <xliff:g id="COUNT_0">%1$d</xliff:g>개 설정됨</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"지문으로 잠금 해제"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"지문 설정"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"지문 사용"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"지문 센서를 터치하기만 하면 휴대전화를 잠금 해제하거나 구매를 승인하거나 앱에 로그인할 수 있습니다. 누구의 지문을 추가할지 신중하게 선택하세요. 지문을 한 번이라도 추가한 사용자는 이러한 작업을 모두 할 수 있습니다."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"지문은 안전한 패턴 또는 PIN보다 보안 수준이 낮을 수 있습니다."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"한 곳에서 편리하게 계정 관리"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"주의사항"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Fingerprint에서 기록한 데이터는 휴대전화에 안전하게 저장되며 외부로 유출되지 않습니다. 언제든지 설정에서 데이터를 삭제할 수 있습니다."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"지문은 안전한 패턴 또는 PIN보다 보안 수준이 낮을 수 있습니다."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"휴대전화에서 가끔 최근 지문 이미지를 사용하여 지문 모델을 개선할 수 있습니다."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"지문을 사용하여 휴대전화를 잠금 해제하거나 구매를 승인하세요.\n\n참고: 이 기기는 지문을 사용하여 잠금 해제할 수 없습니다. 자세한 내용은 조직의 관리자에게 문의하세요."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"지문을 사용하여 휴대전화를 잠금 해제하거나 구매를 승인하세요.\n\n참고: 지문은 안전한 패턴 또는 PIN보다 보안 수준이 낮을 수 있습니다."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"취소"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"취소"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"건너뛰기"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"계속"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"동의"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"건너뛰기"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"다음"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"지문 설정을 건너뛰시겠습니까?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"건너뛰기"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"취소"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"센서 터치"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"지문 아이콘을 길게 터치하세요"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"휴대전화 뒷면에 있습니다. 검지를 사용하세요."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"센서는 화면에 있습니다. 빛나는 원 안에 있는 지문을 찾으세요."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"지문 센서는 화면에 있습니다. 화면 위에서 손가락을 움직여 센서 위치를 찾으세요."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"기기와 지문 센서 위치가 포함된 그림"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"이름"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"확인"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"삭제"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"센서 터치"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"센서에 손가락을 올리고 진동이 느껴지면 떼세요."</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"손가락을 뗀 후 다시 터치"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"손가락을 뗀 후 다시 터치하여 지문의 다른 부분을 추가하세요."</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"지문 추가됨"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"이 아이콘이 표시되면 지문을 사용하여 사용자 본인임을 인증하거나 구매를 승인할 수 있습니다."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"나중에"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"검색"</string>
     <string name="display_settings" msgid="7197750639709493852">"디스플레이"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"화면 자동 회전"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"꺼짐"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"켜짐"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"켜짐 - 얼굴 기반"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"얼굴 인식 사용"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"색상"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"자연스럽게"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"생생하게"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"사용/화면을 보고 있으면 꺼지지 않음"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"사용 안함"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"카메라 액세스 권한 필요"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"기기 맞춤설정 서비스의 권한을 관리하려면 탭하세요."</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"화면을 보고 있으면 꺼지지 않습니다."</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"화면 시선 감지는 전면 카메라를 사용하여 화면을 보고 있는 사용자가 있는지 확인하는 기능입니다. 이 기능은 기기에서 작동하며 이미지는 Google에 전송되거나 저장되지 않습니다."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"화면 시선 감지 사용"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"화면을 어둡게 설정한 경우 새 알림이 오면 절전 모드 자동 해제 기능을 사용 설정합니다."</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"시간 및 정보 항상 표시"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"배터리 사용량 증가"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"텍스트 굵게 표시"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"텍스트 굵게 표시"</string>
     <string name="title_font_size" msgid="570613010306330622">"글꼴 크기"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"텍스트를 확대 또는 축소"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM 카드 잠금 설정"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"다른 사용자"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"기기 저장용량"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"휴대용 저장소"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"알람 및 리마인더"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"알람 또는 리마인더를 설정하도록 허용"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"알람 및 리마인더"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"이 앱에서 알람 또는 다른 시간 기반 일정을 예약하도록 허용합니다. 이렇게 하면 기기를 사용하고 있지 않더라도 앱이 절전 모드에서 해제된 후 실행됩니다. 이 권한을 취소하면 앱이 오작동할 수 있으며 특히 이 앱에서 예약한 모든 알람은 더 이상 작동하지 않습니다."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"일정 예약, 알람, 리마인더, 이벤트"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>"<xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"/ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"위치 서비스"</string>
     <string name="location_title" msgid="5819154746934945021">"사용자 위치"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"직장 프로필 위치"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"앱의 위치 액세스 권한"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"위치 서비스 사용 안함"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g>개 중 <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>개의 앱이 위치 정보에 액세스할 수 있음</item>
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g>개 중 <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g>개의 앱이 위치 정보에 액세스할 수 있음</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"최근에 위치 정보에 액세스한 앱"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"세부정보 보기"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"최근에 위치 정보를 요청한 앱이 없습니다."</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"최근에 위치에 액세스한 앱 없음"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"배터리 사용량 많음"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"배터리 사용량 적음"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi 및 블루투스 검색"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi 검색"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi‑Fi가 꺼져 있을 때도 항상 앱과 서비스에서 Wi-Fi 네트워크를 검색하도록 허용합니다. 이 설정은 위치 기반 기능 및 서비스 개선 등에 사용될 수 있습니다."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"블루투스 검색"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"블루투스가 꺼져 있을 때도 항상 앱과 서비스에서 주변 기기를 검색하도록 허용합니다. 이 설정은 위치 기반 기능 및 서비스 개선 등에 사용될 수 있습니다."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"위치 서비스"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"업무용 위치 서비스"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"위치 시간대 감지"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"위치 시간대 감지"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"현재 시간대를 감지하기 위하여 기기 위치를 사용할 수 있도록 허용합니다. Wi-Fi 검색과 같은 다른 위치 설정이 시간대 감지의 정확도에 영향을 줄 수 있습니다."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"사용"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"사용 안함"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"시간대 자동 감지가 사용 중지됩니다."</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"자동 시간대가 사용 안함"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"위치 시간대 감지가 사용 중지됩니다."</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"위치 시간대 감지가 지원되지 않습니다."</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"위치 시간대 감지 변경이 허용되지 않습니다."</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"사용"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"저장용량 비우기"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"업데이트 제거"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"이 앱을 해당 작업에 대한 기본 프로그램으로 실행하도록 선택했습니다."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"선택한 일부 활동이 기본적으로 이 앱에서 열립니다."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"이 앱이 위젯을 만들고 자체 데이터에 액세스할 수 있도록 선택했습니다."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"기본값이 설정되지 않음"</string>
-    <string name="clear_activities" msgid="341345438786077236">"기본값 지우기"</string>
+    <string name="clear_activities" msgid="488089228657585700">"기본 환경설정 지우기"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"이 앱은 사용 중인 화면에 맞게 개발되지 않았을 수 있습니다. 여기에서 어떻게 앱을 화면에 맞출지 선택할 수 있습니다."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"설치 시 확인"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"앱 확장"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"필요에 따라 기기를 맞춤설정할 수 있습니다. 다음 접근성 기능은 언제든지 설정에서 변경할 수 있습니다."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"글꼴 크기 변경"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"스크린 리더"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"오디오 및 화면에 있는 텍스트"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"자막"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"오디오"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"일반"</string>
     <string name="display_category_title" msgid="6638191682294461408">"디스플레이"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"텍스트 및 화면"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"화면 어둡게"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"적녹색약"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"적녹색약"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"청황색약"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"밝기 낮추기"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"밝기 낮추기"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"화면을 휴대전화의 최소 밝기보다 더 어둡게 설정합니다"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"화면을 태블릿의 최소 밝기보다 더 어둡게 설정합니다"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"읽기 쉽도록 화면을 어둡게 만듭니다.&lt;br/&gt;&lt;br/&gt; 다음과 같은 경우 어두운 화면이 도움이 됩니다. &lt;ol&gt; &lt;li&gt; 휴대전화를 기본 최소 밝기로 설정해도 여전히 너무 밝을 때&lt;/li&gt; &lt;li&gt; 밤에 또는 자기 전 어두운 실내에서 휴대전화를 사용할 때&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"얼굴"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"지문, 지문 추가"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"화면 어둡게 하기, 터치스크린, 배터리, 스마트 밝기, 동적 밝기, 자동 밝기"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"화면 어둡게, 절전 모드, 배터리, 자동 잠금 시간, 시선 감지, 디스플레이, 화면, 활동 없음"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"돌리기, 뒤집기, 회전, 세로 모드, 가로 모드, 방향, 세로, 가로"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"업그레이드, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"방해 금지 모드, 예약, 알림, 차단, 무음, 진동, 절전 모드, 업무, 집중, 소리, 음소거, 낮, 평일, 주말, 평일 밤, 일정"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"화면, 잠금 시간, 자동 잠금 시간, 잠금 화면"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"벨소리"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"기타 소리 및 진동"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"알림"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"대화"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"최근에 알림을 보낸 앱"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"지난 7일간의 모든 항목 보기"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"고급"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"일반"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"직장 알림"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"적응형 알림"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"적응형 알림 우선순위"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"풀다운 창, 상태 표시줄, 잠금 화면에 표시됩니다."</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"상태 표시줄에서 무음 알림 숨기기"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"표시등 깜박임"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"잠금 화면에 알림 표시"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"개인정보 보호"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"잠금 화면 건너뛰기"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"얼굴인식 잠금해제 후 최근 사용한 화면으로 바로 이동"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"잠금 화면, 잠금화면, 건너뛰기, 우회"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">1주일에 약 <xliff:g id="NUMBER_0">%d</xliff:g>개</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"전송하지 않음"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"알림 액세스"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"기기 및 앱 알림"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"앱 및 기기에서 표시할 알림을 제어합니다."</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"직장 프로필 알림에 액세스하지 못하도록 차단됨"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"앱에서 알림을 읽을 수 없습니다."</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"사용 중지"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"취소"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"허용된 알림 유형"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"중요한 지속적인 알림"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"대화 알림"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"소리 알림"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"무음 알림"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"실시간"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"사용 중인 앱, 내비게이션, 전화 통화 등의 실시간 커뮤니케이션"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"대화"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS 및 기타 커뮤니케이션"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"기본"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"설정에 따라 울리거나 진동할 수 있는 알림"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"무음"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"소리나 진동이 없는 알림"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"앱 모두 보기"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"알림을 보낼 수 있는 각 앱에 대한 알림 설정을 변경합니다."</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"기기에 표시되는 앱"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR 도우미 서비스"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"설치된 앱 중에서 VR 도우미 서비스로 실행되도록 요청한 앱이 없습니다."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR 서비스가 <xliff:g id="SERVICE">%1$s</xliff:g>에 액세스하도록 허용하시겠습니까?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"기본적으로 열기"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"링크 열기"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"지원되는 링크 열기"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"지원되는 링크를 이 앱에서 열기"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"이 앱에서 열리는 링크"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"묻지 않고 열기"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"지원되는 링크"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"기타 기본값"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"기타 기본 환경설정"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"링크 추가"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"앱에서 링크를 확인하여 자동으로 열 수 있습니다. "<annotation id="url">"자세히 알아보기"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other">확인된 링크 <xliff:g id="COUNT_1">%d</xliff:g>개</item>
+      <item quantity="one">확인된 링크 <xliff:g id="COUNT_0">%d</xliff:g>개</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">확인되어 이 앱에서 자동으로 열리는 링크입니다.</item>
+      <item quantity="one">확인되어 이 앱에서 자동으로 열리는 링크입니다.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"확인"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"다른 지원되는 링크 확인 중…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"취소"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other">지원되는 링크 <xliff:g id="COUNT_1">%d</xliff:g>개</item>
+      <item quantity="one">지원되는 링크 <xliff:g id="COUNT_0">%d</xliff:g>개</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"추가"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g>에서 열기"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>에 <xliff:g id="SIZE">%1$s</xliff:g> 사용"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"내부 저장소"</string>
     <string name="storage_type_external" msgid="125078274000280821">"외부 저장소"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"카메라를 사용할 수 없음"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"스크린샷을 사용할 수 없음"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"열 수 없는 앱"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"궁금한 점이 있으면 IT 관리자에게 문의하세요."</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"세부정보 더보기"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"관리자는 설정, 권한, 기업 액세스, 네트워크 활동, 기기의 위치 정보 등 직장 프로필과 연결된 데이터와 앱을 모니터링하고 관리할 수 있습니다."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"관리자는 설정, 권한, 기업 액세스, 네트워크 활동, 기기의 위치 정보 등 사용자와 연결된 데이터와 앱을 모니터링하고 관리할 수 있습니다."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">제한 1개</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"기기에 표시되는 데이터 사용량은 이동통신사에서 산출한 데이터 사용량과 다를 수 있습니다."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"이동통신사 네트워크를 통해 사용한 데이터는 제외됩니다."</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"이동통신사 네트워크를 통해 사용된 데이터는 제외됩니다."</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> 사용함"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"데이터 경고 설정"</string>
     <string name="data_warning" msgid="2925054658166062884">"데이터 경고"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g>님의 경우 제거됨)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g>님의 경우 사용 안함)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"자동완성 서비스"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"자동, 완성, 자동완성"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"비밀번호"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"자동, 채우기, 자동 완성, 비밀번호"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;신뢰할 수 있는 앱인지 확인하세요.&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt;에서는 자동 완성할 수 있는 항목을 결정하기 위해 화면의 내용을 사용합니다."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"자동 완성"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"로깅 수준"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"네트워크 작동 모드 변경"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"기본 네트워크 유형"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"이동통신사"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"설정 버전"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"이동통신사 설정 버전"</string>
     <string name="call_category" msgid="641461844504128789">"통화"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"이동통신사 화상 통화"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"시스템 선택"</string>
@@ -4918,7 +4966,7 @@
     <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM 카드 사용으로 전환하시겠습니까?"</string>
     <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"SIM은 한 번에 하나만 활성화할 수 있습니다.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 서비스로 전환해도 <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> 서비스는 취소되지 않습니다."</string>
     <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"다운로드한 SIM은 한 번에 하나만 활성화할 수 있습니다.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 서비스로 전환해도 <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> 서비스는 취소되지 않습니다."</string>
-    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"SIM은 한 번에 하나만 활성화할 수 있습니다.\n\nSIM을 전환해도 <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 서비스는 취소되지 않습니다."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"SIM은 한 번에 하나만 활성화할 수 있습니다.\n\nSIM으로 전환해도 <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 서비스는 취소되지 않습니다."</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> 서비스로 전환"</string>
     <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"네트워크에 연결 중…"</string>
     <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> 서비스로 전환하는 중"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM을 삭제하고 다시 삽입해 보세요. 그래도 문제가 지속되면 기기를 다시 시작하세요."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM을 다시 사용 설정해 보세요. 그래도 문제가 지속되면 기기를 다시 시작하세요."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"네트워크 활성화"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"이동통신사 전환"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>이(가) 활성화됨"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM 설정을 업데이트하려면 탭하세요."</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>(으)로 전환됨"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"사용 안함"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"인터넷"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"비행기 모드 네트워크 표시"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"비행기 모드에서 네트워크를 찾아 연결합니다."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Wi‑Fi 네트워크 찾기 및 연결"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"항공, 항공 안전"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"통화 및 SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi 통화"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"사용할 수 없음"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"일시적으로 사용할 수 없음"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM 없음"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"환경설정"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"네트워크 환경설정"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"공용 네트워크에 연결"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"네트워크 연결, 인터넷, 무선, 데이터, Wifi, Wi-Fi, Wi Fi, 셀룰러, 모바일, 이동통신사, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"비행기 모드 네트워크 보기"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"비행기 모드 네트워크 표시 중"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"네트워크 사용"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"네트워크 사용 중지"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"인터넷을 재설정하시겠습니까?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"휴대전화 통화가 종료됩니다."</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"휴대전화 통화가 종료됩니다."</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"인터넷 재설정 중…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"연결 문제 해결"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"비행기 모드 네트워크 사용 가능"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"네트워크를 전환하려면 이더넷을 연결 해제하세요."</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"연결된 상태에서는 네트워크를 전환할 수 없음"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"비행기 모드 네트워크"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"연결됨"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"인터넷에 자동으로 연결되지 않음"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"색상"</string>
     <string name="category_name_others" msgid="2366006298768550310">"기타"</string>
     <string name="category_name_general" msgid="7737273712848115886">"일반"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"앱 모두 보기"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"스마트 착신전환"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"스마트 착신전환 사용 설정됨"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"전화번호 입력"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"전화번호를 입력하세요."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"확인"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G 허용"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G 모바일 데이터 연결을 사용하세요. 긴급 전화의 경우 2G가 항상 사용 설정됩니다."</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index d4ca6bf..b6abf80 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Экрандагы текстти кичирейтип же чоңойтуңуз."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Кичирээк кылуу"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Чоңураак кылуу"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Автоматтык бурулууну колдонуу"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Үлгү текст"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Оз өлкөсүнүн ажайып сыйкырчысы"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> манжа изин коюу</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Кулпну манж из менн ач"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Манжа изин жөндөө"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Манжа изиңизди колдонуңуз"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Телефонуңуздун кулпусун ачып, кандайдыр бир нерсени сатып алып жатканыңызды ырастап же колдонмолорго кирүү үчүн жөн гана манжаңызды сенсорго тийгизип коюңуз. Кимдир-бирөөнүн манжа изин кошуп жатканыңызда этият болуңуз. Бир эле манжа изи кошулса да, ушул нерселердин баарын аткарууга болот."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Түзмөгүңүздү манжа изи менен коргоого караганда, графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Баары өзүңүздүн колуңузда"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Көңүл буруңуз"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Манжа изи функциясы жаздырган нерселер телефонуңузда коопсуз сакталат. Аларды каалаган убакта өчүрүп салсаңыз болот."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Түзмөгүңүздү манжа изи менен коргоого караганда, графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Манжа изи функциясы менен тартылган жаңы сүрөттөр кез-кезде манжа изинин жакшыртылган үлгүлөрүн түзүү үчүн колдонулат."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Манжаңыздын изи менен, телефонуңуздун кулпусун ачып, ар кандай нерселерди сатып ала аласыз.\n\nЭскертүү: Бул түзмөктүн кулпусун манжаңыздын изи менен ачууга болбойт. Кененирээк маалымат алгыңыз келсе, ишканаңыздын администраторуна кайрылыңыз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Манжаңыздын изи менен, телефонуңуздун кулпусун ачып, ар кандай нерселерди сатып ала аласыз.\n\nЭскертүү: Түзмөгүңүздү манжа изи менен коргоого караганда, графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Жокко чыгаруу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Жок, рахмат"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Өткөрүп жиберүү"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Улантуу"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Макул"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Өткөрүп жиберүү"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Кийинки"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Манжа издерин койбойсузбу?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Өткөрүп жиберүү"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Жок"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Сенсорго тийиңиз"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Манжа изинин сүрөтчөсүн коё бербей басып туруңуз"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Сенсор телефонуңуздун аркасында. Сөөмөйүңүз менен тийиңиз."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Cенсор экранда. Айланасы жаркырап турган манжа изин табыңыз."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Манжа изинин сенсору экранда жайгашкан. Аны табуу үчүн манжаңыз менен экранды сүрүңүз."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Бул сүрөт сенсор кайда жайгашканын көрсөтөт"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Аталышы"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Жарайт"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Жок кылуу"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Сенсорго тийиңиз"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Манжаңызды сенсорго коюп, дирилдегенин сезгенден кийин көтөрүңүз"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Көтөрүп, кайра тийип коюңуз"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Манжаңызды толугу менен скандоо үчүн, акырындык менен жылдырыңыз"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Манжа изи кошулду"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Бул сүрөтчө көрүнгөндө, манжаңыздын изи менен өздүгүңүздү же кандайдыр бир нерсени сатып алууну ырастайсыз"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Азыр эмес"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Издөө"</string>
     <string name="display_settings" msgid="7197750639709493852">"Экран"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Экранды авто буруу"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Өчүк"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Күйүк"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Күйүк – Жүздүн негизинде"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Жүздү аныктоону иштетүү"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Түстөр"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Табигый"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Күчөтүлгөн"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Күйүк / Экранды карап турганда, ал өчүп калбайт"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Өчүк"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Камераны колдонууга уруксат берүү керек"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Түзмөктү жекечелештирген кызматтар үчүн уруксаттарды башкаруу үчүн басыңыз"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Экранды карап турганыңызда, ал өчпөйт"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"\"Ыңгайлашуучу көшүү режими\" экранды кимдир-бирөө карап жатканын текшерүү үчүн, маңдайкы камераны колдонот. Ал түзмөктө иштеп, сүрөттөрдү эч качан сактап калбайт жана Google\'га жөнөтпөйт."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Ыңгайл. көшүү режимин күйгүзүү"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Экран караңгы болуп турганда жаңы билдирме келсе, ал күйөт"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Убакыт жана маалымат ар дайым көрүнүп турсун"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Батарея тез отуруп калат"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Жоон текст"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Жоон текст"</string>
     <string name="title_font_size" msgid="570613010306330622">"Арип өлчөмү"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Текстти чоңойтуп же кичирейтесиз"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM картаны кулпулоо жөндөөлөрү"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Башка колдонуучулар"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Түзмөктүн сактагычы"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Ташылма сактагыч"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Ойготкучтар жана эстеткичтер"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Ойготкучтарды, эстеткичтерди коюуга уруксат берүү"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Ойготкучтар жана эстеткичтер"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Бул колдонмого ойготкучтарды коюуга жана убакыттын негизинде аткарылган башка иш-чараларды жөндөөгө уруксат бериңиз. Ушуну менен түзмөктү колдонбой турганыңызда да, колдонмо өзү иштеп баштайт. Бул уруксаттан баш тартсаңыз, колдонмо туура эмес иштеп, ал койгон бардык ойготкучтар мындан ары иштебей калат."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"график, ойготкуч, эстеткич, иш-чара"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> ичинен <xliff:g id="USED">%1$s</xliff:g> колдонулду"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"колдонулду <xliff:g id="TOTAL">%1$s</xliff:g> ичинен"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Жайгашкан жерди аныктоо кызматы"</string>
     <string name="location_title" msgid="5819154746934945021">"Жайгашкан жерим"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Жумуш профилинин жери"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Колдонмого жайгашкан жерди көрсөтүү"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Жайгашкан жерди аныктоо өчүрүлгөн"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ичинен <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> колдонмо жайгашкан жерди көрө алат</item>
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> ичинен <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> колдонмо жайгашкан жерди көрө алат</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Гео маалымат акыркы жолу качан колдонулду"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Кеңири маалымат"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Жакында жайгашкан жерди сураган колдонмолор болгон жок"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Жакында жайгашкан жерди аныктоо кызматына бир да колдонмо кирген жок"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Батарейди көп колдонуу"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Батареянын кубаты үнөмдөлүүдө"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi менен Bluetooth\'ду издөө"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi издөө"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi-Fi өчүп турса да, колдонмолор менен кызматтарга Wi-Fi тармактарын издегенге уруксат бересиз. Бул параметр менен жайгашкан жерди тагыраак аныктоого болот."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth түзмөктөрүн издөө"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth өчүп турса да, колдонмолор менен кызматтарга жакын жердеги түзмөктөрдү издегенге уруксат бересиз. Бул параметр менен жайгашкан жерди тагыраак аныктоого болот."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Жайгашкан жерди аныктоо кызматтары"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Жумуш үчүн Жайгашкан жерди аныктоо кызматтары"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Убакыт алкагын жайгашкан жер аркылуу аныктоо"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Убакыт алкагын жайгашкан жер аркылуу аныктоо"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Түзмөктүн жайгашкан жери учурдагы убакыт алкагын аныктоо үчүн колдонулат. Жайгашкан жерди аныктоонун башка жөндөөлөрү, мисалы, Wi-Fi тармактарын издөө жайгашкан жерди аныктоого таасирин тийгизиши мүмкүн."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Күйүк"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Өчүк"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Убакыт алкагын автоматтык түрдө аныктоо өчүрүлгөн"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Убакыт алкагын автоматтык түрдө аныктоо өчүк"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Убакыт алкагын жайгашкан жер аркылуу аныктоо өчүрүлгөн"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Убакыт алкагын жайгашкан жер аркылуу аныктоо колдоого алынбайт"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Убакыт алкагын жайгашкан жер аркылуу аныктоо жөндөөлөрүн өзгөртүүгө болбойт"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Иштетүү"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Сактагычты тазалоо"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Жаңыртууларды чыгарып салуу"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Бул колдонмо айрым аракеттер үчүн абалкы болуп орнотулган"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Сиз тандаган айрым аракеттер ушул колдонмодо демейки шартта ачылат."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Сиз бул колдонмого виджеттерди түзүү жана алардын берилиштерине жетүү уруксатын бердиңиз."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Демейкилер коюлган жок."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Демейкилерди тазалоо"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Демейки жөндөөлөрдү өчүрүү"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Бул колдонмо, сиздин экраныңызга туураланып түзүлбөгөн болушу мүмкүн. Сиз аны бул жерден экраныңызга тууралап алсаңыз болот."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Жүргүзүлгөндө суралсын"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Колдонмону масштабдоо"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Түзмөктү өзүңүзгө карап ыңгайлаштырып алыңыз. Бул атайын мүмкүнчүлүктөрдүн параметрлерин кийинчерээк өзгөртсөңүз болот."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Арип өлчөмүн өзгөртө аласыз"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Экрандагыны окугучтар"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио жана текстти окуп берүү"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Коштомо жазуулар"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аудио"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Жалпы"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Экран"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Текст жана чагылдыруу"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Экранды караңгылатуу"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Кызыл-жашыл"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Кызыл-жашыл"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Көк-сары"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Экрандын жарыктыгын төмөндөтүү"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Экрандын жарыктыгын төмөндөтүү"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Телефонуңуздун экранынын демейки минималдуу жарыктыгынан да караңгылатыңыз"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Планшетиңиздин экранынын демейки минималдуу жарыктыгынан да караңгылатыңыз"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Ыңгайлуу окуу үчүн экранды караңгылатыңыз.&lt;br/&gt;&lt;br/&gt; Бул төмөнкү учурларда пайдалуу болот: &lt;ol&gt; &lt;li&gt; Телефонуңуздун экранынын демейки минималдуу жарыктыгы дагы деле жарык болсо &lt;/li&gt; &lt;li&gt; Телефонуңузду караңгы жерлерде: түнү же уктаганга чейин караңгы уктоочу бөлмөдө колдонсоңуз&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3103,7 +3124,7 @@
     <string name="user_guest" msgid="4545590092001460388">"Конок"</string>
     <string name="user_exit_guest_title" msgid="2653103120908427236">"Конокту алып салуу"</string>
     <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Конокту алып саласызбы?"</string>
-    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Бул сеанстагы бардык колдонмолор жана дайындар өчүрүлөт."</string>
+    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Бул сеанстагы бардык колдонмолор жана маалыматтар өчүрүлөт."</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Алып салуу"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Телефон чалууларын иштетүү"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Чалуулар менен SMS иштетүү"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"жүз"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"манжа изи, манжа изин кошуу"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"күңүрт экран, сенсордук экран, батарея, акылдуу жарыктык, динамикалык жарыктык, авто-жарыктык"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"экранды бүдөмүктөтүү, уйку режими, батарея, экрандын өчүү убакыты, көңүл буруу, дисплей, экран, аракетсиздик"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"буруу, көрсөтүү, айлануу, тигинен, туурасынан, багыт, вертикалдык, горизонталдык"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"кийинки версияга көтөрүү, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"та, график, билдирмелер, бөгөттөө, үнүн басуу, дирилдөө, уйку режими, жумуш, фокустоо, добуш, үнсүз, күн, иш күнү, дем алыш, иш күндөрүнүн кечтери, окуя"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"экран, кулпулоо убакыты, таймаут, кулпуланган экран"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Рингтондор"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Башка үндөр жана дирилдөөлөр"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Билдирмелер"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Сүйлөшүү"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Акыркы жолу билдирмелерди жөнөткөн колдонмолор"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Акыркы 7 күндөгү бардык колдонмолорду көрүү"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Өркүндөтүлгөн"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Жалпы"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Жумуш боюнча билдирмелер"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Ыңгайлаштырылуучу билдирмелер"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Ыңгайлаштырылуучу билдирменин маанилүүлүгү"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Тигинен жайгашкан экранда, абал тилкесинде жана кулпуланган экранда чагылдыруу"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Үнсүз билдирмелерди абал тилкесинен жашыруу"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Жарык индикатору"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Кулпуланган экрандагы билдирмелер"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Купуялык"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Экран кулпуcун өткөрүп жиберүү"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Экрандын кулпусу жүзүнөн таанып ачылгандан кийин, акыркы ачылган экранга өтөсүз"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Кулпуланган экран, кулпу экраны, өткөрүп жиберүү, айланып өтүү"</string>
@@ -3638,7 +3662,7 @@
     <string name="allow_interruption" msgid="5237201780159482716">"Эскертмелерге уруксат берүү"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"Үнү чыгат, дирилдейт жана билдирмелер башка колдонмолордун үстүнөн көрүнөт"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"Маанилүүлүгү"</string>
-    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Жазышуулар тизмесинин өйдө жагында калкып чыкма билдирме түрүндө көрүнүп, профиль сүрөтү кулпуланган экрандан чагылдырылат"</string>
+    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Жазышуулар тизмесинин өйдө жагында калкып чыкма билдирме түрүндө көрүнсө, профиль сүрөтү кулпуланган экранда көрүнөт"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосунда жазышуу функцияларынын көпчүлүгү иштебейт. Жазышууларды маанилүү деп белгилей албайсыз жана алар калкып чыкма маек түрүндө көрүнбөйт."</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"Тигинен жайгашкан экранда билдирмелерди бир сапка жыйыштыруу"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"Үнү чыкпайт жана дирилдебейт"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">аптасына болжол менен <xliff:g id="NUMBER_0">%d</xliff:g> билдирме</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Эч качан"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Билдирмелерди иштетүү"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Түзмөктөгү жана колдонмодогу билдирмелер"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Колдонмолор менен түзмөктөрдө кайсы билдирмелер көрсөтүлөрүн көзөмөлдөө"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Жумуш профилинин эскертмелерине кирүү бөгөттөлгөн"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Колдонмолор билдирмелерди окуй алышпайт"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3667,7 +3692,7 @@
     <string name="notification_assistant_title" msgid="6983941403582134437">"Ыңгайлаштырылуучу билдирмелер"</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"Жок"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"Орнотулган колдонмолор үчүн эскертме мүмкүнчүлүгү талап кылынбайт"</string>
-    <string name="notification_access_detail_switch" msgid="46386786409608330">"Билдирмелерге кирүү мүмкүнчүлүгүн берүү"</string>
+    <string name="notification_access_detail_switch" msgid="46386786409608330">"Билдирмелерди алып турууга уруксат берүү"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"<xliff:g id="SERVICE">%1$s</xliff:g> кызматына билдирмелерди пайдаланууга уруксат бересизби?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> колдонмосу билдирмелердин баарын, ошону менен катар байланыштардын аты-жөнү жана алынган билдирүүлөр сыяктуу жеке маалыматты окуй алат. Мындан тышкары, билдирмелерди жаап же телефон чалууларына жооп берүү сыяктуу билдирмелердеги баскычтарды баса алат. \n\nКолдонмо \"Тынчымды алба\" режимин күйгүзүп же өчүрүп, ошондой эле анын жөндөөлөрүн өзгөртүү мүмкүнчүлүгүнө ээ болот."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"<xliff:g id="SERVICE">%1$s</xliff:g> колдонмосу үчүн билдирмелерди иштетесизби?"</string>
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Өчүрүү"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Жок"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Уруксат берилген билдирмелердин түрлөрү"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Маанилүү билдирмелер"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Жазышуунун билдирмелери"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Эскертүүлөр"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Үнсүз билдирмелер"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Анык убакыт"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Иштеп жаткан колдонмолордун, навигациянын, телефон чалуулардын жана башка кызматтардын анык убакыттагы билдирүүлөрү"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Жазышуулар"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS жана башка жазышуулар"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Демейки"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Жөндөөлөргө жараша шыңгыраган же дирилдеген билдирмелер"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Үнсүз"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Эч качан добуш чыгарбаган же дирилдебеген билдирмелер"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Бардык колдонмолорду көрүү"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Билдирмелерди жөнөтө алган ар бир колдонмо үчүн билдирмелердин жөндөөлөрүн өзгөртүү"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Түзмөктө көрүнгөн колдонмолор"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR көмөкчү кызматтары"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Орнотулган колдонмолор көмөкчү VR кызматы катары иштөөгө уруксат сураган жок."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR кызматына <xliff:g id="SERVICE">%1$s</xliff:g> кызматында иштөөгө уруксат берилсинби?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Демейки боюнча ачуу"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Шилтемелерди ачуу"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Колдоого алынган шилтемелерди ачуу"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Ушул колдонмодо колдоого алынган шилтемелер"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Ушул колдонмодо ачылган шилтемелер"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Сурабай туруп ачуу"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Колдоого алынган шилтемелер"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Башка демейкилер"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Башка демейки жөндөөлөр"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Шилтеме кошуу"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Колдонмо автоматтык түрдө ачыла турган шилтемелерди текшере алат. "<annotation id="url">"Кеңири маалымат"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> текшерилген шилтеме</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> текшерилген шилтеме</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Бул шилтемелер текшерилген жана автоматтык түрдө ушул колдонмодо ачылат.</item>
+      <item quantity="one">Бул шилтеме текшерилген жана автоматтык түрдө ушул колдонмодо ачылат.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Макул"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Колдоого алынган башка шилтемелер текшерилүүдө…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Жокко чыгаруу"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> колдоого алынган шилтеме</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> колдоого алынган шилтеме</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Кошуу"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> ачылат"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> ичинде <xliff:g id="SIZE">%1$s</xliff:g> колдонулду"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"ички сактагыч"</string>
     <string name="storage_type_external" msgid="125078274000280821">"тышкы сактагыч"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Камераны колдонууга тыюу салынган"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Скриншот колдонууга тыюу салынган"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Бул колдонмо ачылбайт"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Суроолоруңуз болсо, IT администраторуңузга кайрылыңыз"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Көбүрөөк маалымат"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Администратор жумуш профилиңизге байланыштуу колдонмолор менен дайын-даректерди, анын ичинде жөндөөлөр, уруксаттар, корпоративдик кирүү мүмкүнчүлүгү, Интернеттеги аракеттери жана түзмөктүн жайгашкан жери тууралуу маалыматты көзөмөлдөй алат."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Администратор бул колдонуучуга байланыштуу колдонмолор менен дайын-даректерди, анын ичинде жөндөөлөр, уруксаттар, корпоративдик кирүү мүмкүнчүлүгү, Интернеттеги аракеттери жана түзмөктүн жайгашкан жери тууралуу маалыматты көзөмөлдөй алат."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 чектөө</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Байланыш операторунун статистикасы түзмөгүңүздүн статистикасынан айырмаланышы мүмкүн."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Байланыш операторунун тармактары колдонгон дайын-даректерден тышкары"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Байланыш операторунун тармактары колдонгон дайын-даректерден тышкары"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> колдонулду"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Трафик тууралуу эскертүү"</string>
     <string name="data_warning" msgid="2925054658166062884">"Эскертүүлөр"</string>
@@ -4641,8 +4688,8 @@
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="464054894363899866">"Администратор түзмөктү кулпулап, сырсөздү баштапкы абалга келтире алат"</string>
     <string name="enterprise_privacy_wipe_device" msgid="869589182352244591">"Администратор түзмөктүн бардык дайындарын жок кыла алат"</string>
-    <string name="enterprise_privacy_failed_password_wipe_device" msgid="7045164901334821226">"Сырсөздү бир нече жолу ката киргизгенден кийин түзмөктөгү бардык дайындар өчүрүлөт"</string>
-    <string name="enterprise_privacy_failed_password_wipe_work" msgid="2537582942554484170">"Сырсөздү бир нече жолу ката киргизгенден кийин жумуш профилиндеги бардык дайындар өчүрүлөт"</string>
+    <string name="enterprise_privacy_failed_password_wipe_device" msgid="7045164901334821226">"Сырсөздү бир нече жолу ката киргизгенден кийин түзмөктөгү бардык маалыматтар өчүрүлөт"</string>
+    <string name="enterprise_privacy_failed_password_wipe_work" msgid="2537582942554484170">"Сырсөздү бир нече жолу ката киргизгенден кийин жумуш профилиндеги бардык маалыматтар өчүрүлөт"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="8811973918944217791">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> аракет</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> аракет</item>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g> үчүн чыгарылып салынган)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g> үчүн өчүрүлгөн)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Автотолтуруу кызматы"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"авто, толтуруу, автотолтуруу"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Сырсөздөр"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"авто, толтуруу, автоматтык түрдө толтуруу, сырсөз"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Колдонмонун коопсуз экенин текшериңиз&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; экрандагы нерселерди талдап, автоматтык түрдө толтурула турган саптарды табат."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Автотолтуруу"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Кирүү деңгээли"</string>
@@ -4882,8 +4930,8 @@
     <string name="mobile_network_use_sim_off" msgid="6303281166199670639">"Өчүк"</string>
     <string name="mobile_network_disable_sim_explanation" msgid="2851862257846773796">"Бул SIM картаны өчүрүү үчүн, аны түзмөктөн чыгарып салыңыз"</string>
     <string name="mobile_network_tap_to_activate" msgid="4139979375717958102">"<xliff:g id="CARRIER">%1$s</xliff:g> байланыш операторун иштетүү үчүн басыңыз"</string>
-    <string name="mobile_network_esim_swap_confirm_title" msgid="2762744961192218789">"<xliff:g id="CARRIER">%1$s</xliff:g> операторуна которулсунбу?"</string>
-    <string name="mobile_network_esim_swap_confirm_body" msgid="8168680839542031781">"Бир учурда бир гана жүктөлүп алынган SIM карта активдүү болушу керек.\n\n<xliff:g id="CARRIER1">%1$s</xliff:g> операторуна которулсаңыз, <xliff:g id="CARRIER2">%2$s</xliff:g> кызматыңыз жокко чыгарылбайт."</string>
+    <string name="mobile_network_esim_swap_confirm_title" msgid="2762744961192218789">"<xliff:g id="CARRIER">%1$s</xliff:g> операторуна которуласызбы?"</string>
+    <string name="mobile_network_esim_swap_confirm_body" msgid="8168680839542031781">"Жүктөлүп алынган бир гана SIM карта колдонулушу керек.\n\n<xliff:g id="CARRIER1">%1$s</xliff:g> операторуна которулсаңыз, <xliff:g id="CARRIER2">%2$s</xliff:g> байланыш операторундагы тарифтик планыңыз өзгөрбөйт."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="8695772737522378095">"<xliff:g id="CARRIER">%1$s</xliff:g> операторуна которулуу"</string>
     <string name="mobile_network_erase_sim" msgid="4629071168032714930">"SIM картаны тазалоо"</string>
     <string name="mobile_network_erase_sim_error_dialog_title" msgid="6680959559589234726">"SIM карта тазаланбай жатат"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Тармактын иштөө режимин өзгөртүңүз"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Тармактын түрү"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Байланыш оператору"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Жөндөөлөрдүн версиясы"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Байланыш операторунун жөндөөлөрүнүн версиясы"</string>
     <string name="call_category" msgid="641461844504128789">"Чалуулар"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Видео чалуулар"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Системаны тандоо"</string>
@@ -4914,11 +4962,11 @@
     <string name="see_less" msgid="2642392725363552793">"Азыраак көрүү"</string>
     <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> күйгүзүлсүнбү?"</string>
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM-карта күйгүзүлсүнбү?"</string>
-    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> операторуна которулсунбу?"</string>
-    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM-картаны колдонууга которуласызбы?"</string>
-    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Бир учурда бир гана SIM-карта активдүү болушу керек.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> операторуна которулсаңыз, <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> кызматыңыз жокко чыгарылбайт."</string>
-    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Бир учурда бир гана жүктөлүп алынган SIM-карта активдүү болушу керек.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> операторуна которулсаңыз, <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> кызматыңыз жокко чыгарылбайт."</string>
-    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Бир учурда бир гана SIM-карта активдүү болушу керек.\n\nБашка SIM-картага которулсаңыз, <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> кызматыңыз жокко чыгарылбайт."</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> операторуна которуласызбы?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM картага которуласызбы?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Бир эле маалда бир нече SIM карта колдонууга болбойт.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> операторуна которулсаңыз, <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> байланыш операторундагы тарифтик планыңыз өзгөрбөйт."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Жүктөлүп алынган бир гана SIM карта колдонулушу керек.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> операторуна которулсаңыз, <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> байланыш операторундагы тарифтик планыңыз өзгөрбөйт."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Бир эле маалда бир нече SIM карта колдонууга болбойт.\n\nБашка SIM картага которулсаңыз, \"<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>\" байланыш операторундагы тарифтик планыңыз өзгөрбөйт."</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> операторуна которулуу"</string>
     <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Байланыш операторуна туташууда…"</string>
     <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> операторуна которулууда"</string>
@@ -4930,7 +4978,7 @@
     <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Байланыш оператору өчүрүлгөн жок"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Бир жерден ката кетти, байланыш операторуңуз өчүрүлгөн жок."</string>
     <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 SIM-картаны колдоносузбу?"</string>
-    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Бул түзмөктө бир эле убакта 2 SIM-картаны иштетүүгө болот. Бир эле убакта 1 SIM-картаны гана колдонуу үчүн \"Жок, рахмат\" баскычын таптап коюңуз."</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Бул түзмөктө бир эле маалда 2 SIM-картаны иштетүүгө болот. Эгер бир SIM карта жетиштүү болсо, \"Жок, рахмат\" дегенди басып коюңуз."</string>
     <string name="sim_action_restart_title" msgid="7054617569121993825">"Түзмөк өчүп күйсүнбү?"</string>
     <string name="sim_action_restart_text" msgid="8019300474703571013">"Баштоо үчүн түзмөктү өчүрүп күйгүзүңүз. Андан соң башка SIM-картаны кошсоңуз болот."</string>
     <string name="sim_action_continue" msgid="1688813133152389943">"Улантуу"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM-картаны чыгарып, кайра салыңыз. Эгер маселе чечилбесе, түзмөктү өчүрүп күйгүзүңүз."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM-картаны кайра күйгүзүп көрүңүз. Эгер маселе чечилбесе, түзмөктү өчүрүп күйгүзүңүз."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Тармакты иштетүү"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Байланыш оператору которуштурулууда"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> иштеп жатат"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM-картанын жөндөөлөрүн жаңыртуу үчүн таптап коюңуз"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> байланыш операторуна которулду"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Өчүк"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM карталар"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Учак режиминде жеткиликтүү тармактарды көрсөтүү"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Учак режиминде жеткиликтүү тармактарды таап жана туташа аласыз."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Wi‑Fi тармактарын таап, туташуу"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"учак, учак режимине ылайыктуу"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Телефон чалуу жана SMS жөнөтүү"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi аркылуу чалуу"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"жеткиликсиз"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Убактылуу жеткиликсиз"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM-карта жок"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Жеке жөндөөлөр"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Тармак жөндөөлөрү"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Жалпыга ачык тармактарга туташуу"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"тармакка туташуу, интернет, зымсыз, маалымат, wifi, wi-fi, wi fi, уюлдук, мобилдик, байланыш оператору, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Учак режиминдеги тармактарды көрүү"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Учак режиминде жеткиликтүү тармактарды көрүү"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Тармактарды күйгүзүү"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Тармактарды өчүрүү"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Интернетти баштапкы абалга келтиресизби?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Ушуну менен телефон чалууңуз бүтөт"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Ушуну менен телефон чалууңуз бүтөт"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Интернет баштапкы абалга келтирилүүдө…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Байланышты оңдоо"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Учак режиминдеги тармактар жеткиликтүү"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Башка тармактарга которулуу үчүн Ethernet кабелин ажыратыңыз"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Туташып турганда тармактарды которууга болбойт"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Учак режиминдеги тармактар"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Туташты"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Интернет автоматтык түрдө туташпайт"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Түс"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Башкалар"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Жалпы"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Бардык колдонмолорду көрүү"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Акылдуу багыттоо"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Акылдуу багыттоо иштетилди"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Телефон номерин киргизиңиз"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Телефондун номери жетишпейт."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Макул"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G тармагына уруксат берүү"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G тармагын колдонуңуз. Шашылыш чалуулар үчүн 2G тармагы ар дайым күйүк болот."</string>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 1f59019b..a078112 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"ເຮັດໃຫ້ນ້ອຍລົງ"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"ເຮັດໃຫ້ໃຫຍ່ຂຶ້ນ"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ໃຊ້ການໝຸນອັດຕະໂນມັດ"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"ການໝຸນອັດຕະໂນມັດໂດຍອ້າງອີງໃບໜ້າຈະໃຊ້ກ້ອງໜ້າເພື່ອເບິ່ງວ່າມີຄົນກຳລັງເບິ່ງໜ້າຈໍຫຼືບໍ່ ແລະ ເບິ່ງແນວໃດ. ມັນຈະເຮັດໃຫ້ສາມາດອ່ານໄດ້ໃນຂະນະທີ່ກຳລັງນອນລົງ ແລະ ຈະບໍ່ຖືກບັນທຶກ ຫຼື ສົ່ງໄປໃຫ້ Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Learn more&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"ຂໍ້ຄວາມຕົວຢ່າງ"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"ພໍ່ມົດອັດສະຈັນແຫ່ງອອດຊ໌"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"ບົດທີ 11: ເມືອງມໍລະກົດອັນໜ້າອັດສະຈັນຂອງອອດຊ໌"</string>
@@ -403,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ລາຍ​ນີ້ວ​ມື​ຖືກ​ຕັ້ງ​ແລ້ວ</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"ປົດລັອກດ້ວຍລາຍນີ້ວມື"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"ຕັ້ງຄ່າລາຍນິ້ວມືຂອງທ່ານ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"ໃຊ້ລາຍນິ້ວມືຂອງທ່ານ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"ພຽງແຕະໃສ່ເຊັນ​ເຊີລາຍນີ້ວ​ມືເພື່ອປົດລັອກໂທລະສັບຂອງທ່ານ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບຫາແອັບຕ່າງໆ. ໃຫ້ລະວັງລາຍນິ້ວມືຂອງຄົນທີ່ທ່ານເພີ່ມໃສ່. ລາຍນິ້ວມືພຽງອັນດຽວທີ່ເພີ່ມໃສ່ກໍສາມາດເຮັດສິ່ງເຫຼົ່ານີ້ໄດ້."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"ລາຍນິ້ວມືຂອງທ່ານອາດມີຄວາມປອດໄພທີ່ໜ້ອຍກວ່າຮູບແບບປົດລັອກ ຫຼື ລະຫັດ PIN ທີ່ຍາກ."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"ທ່ານຄວບຄຸມໄດ້"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"ຂໍ້ຄວນຈື່"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"ຂໍ້ມູນທີ່ບັນທຶກໄວ້ໂດຍລາຍນິ້ວມືແມ່ນຖືກບັນທຶກໄວ້ຢ່າງປອດໄພ ແລະ ຈະບໍ່ຖືກສົ່ງອອກຈາກໂທລະສັບຂອງທ່ານເດັດຂາດ. ທ່ານສາມາດລຶບຂໍ້ມູນຂອງທ່ານອອກຕອນໃດກໍໄດ້ໃນການຕັ້ງຄ່າ."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"ລາຍນິ້ວມືຂອງທ່ານອາດມີຄວາມປອດໄພທີ່ໜ້ອຍກວ່າຮູບແບບປົດລັອກ ຫຼື ລະຫັດ PIN ທີ່ຍາກ."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"ໂທລະສັບຂອງທ່ານຈະໃຊ້ຮູບລາຍນິ້ວມືທ່ານເປັນບາງໂອກາດເພື່ອສ້າງໂມເດວລາຍນິ້ວມືທີ່ໄດ້ຮັບການປັບປຸງ."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບ ຫຼື ອະນຸມັດການສັ່ງຊື້.\n\nໝາຍເຫດ: ທ່ານບໍ່ສາມາດໃຊ້ນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກອຸປະກອນນີ້ໄດ້. ສຳລັບຂໍ້ມູນເພີ່ມເຕີມ, ໃຫ້ຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບອົງກອນຂອງທ່ານ."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບ ຫຼື ອະນຸມັດການສັ່ງຊື້.\n\nໝາຍເຫດ: ນິ້ວມືຂອງທ່ານອາດມີຄວາມປອດໄພທີ່ໜ້ອຍກວ່າຮູບແບບປົດລັອກ ຫຼື ລະຫັດ PIN ທີ່ຍາກ."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"​ຍົກ​ເລີກ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ບໍ່, ຂອບໃຈ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"ຂ້າມ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"​ສືບ​ຕໍ່"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"ຍອມຮັບ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ຂ້າມ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ຕໍ່ໄປ"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"ຂ້າມລາຍນິ້ວມືບໍ?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"ຂ້າມ"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"ຍົກເລີກ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"ແຕະທີ່ເຊັນເຊີ"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"ແຕະໃສ່ໄອຄອນລາຍນິ້ວມືຄ້າງໄວ້"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"ມັນຢູ່ຫຼັງໂທລະສັບຂອງທ່ານ. ໃຫ້ໃຊ້ນິ້ວຊີ້ຂອງທ່ານແຕະໃສ່."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"ມັນຢູ່ເທິງໜ້າຈໍ. ຊອກຫາລາຍນິ້ວມືທີ່ມີວົງມົນເຮືອງແສງ."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"ເຊັນເຊີລາຍນິ້ວມືແມ່ນຢູ່ໜ້າຈໍຂອງທ່ານ. ເລື່ອນນິ້ວຂອງທ່ານໄປມາຢູ່ໜ້າຈໍເພື່ອຊອກຫາມັນ."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"ການ​ອະ​ທິ​ບາຍ​ປະ​ກອບ​ດ້ວຍ​ທີ່​ຕັ້ງ​ເຊັນ​ເຊີ​ອຸ​ປະ​ກອນ ແລະ​ລາຍ​ນີ້ວ​ມື"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"ຊື່"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ຕົກລົງ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"​ລຶບ"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"ແຕະທີ່ເຊັນເຊີ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"ວາງ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ລົງ​ເທິງ​ເຊັນ​ເຊີ ແລະ ຍົກ​ຂຶ້ນ​ຫຼັງ​ຈາກ​ທ່ານ​ຮູ້​ສຶກ​ມີ​ການ​ສັ່ນ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"ຍົກຂຶ້ນ, ຈາກນັ້ນແຕະອີກຄັ້ງ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"ຍົກນິ້ວຂອງທ່ານຂຶ້ນເພື່ອເພີ່ມສ່ວນຕ່າງໆຂອງລາຍນິ້ວມືທ່ານ."</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ເພີ່ມລາຍນີ້ວມືແລ້ວ"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"ເມື່ອທ່ານເຫັນໄອຄອນນີ້, ໃຫ້ໃຊ້ນິ້ວມືຂອງທ່ານເພື່ອລະບຸຕົວຕົນ ຫຼື ອະນຸມັດການສັ່ງຊື້."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"ເຮັດໃນພາຍຫຼັງ"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ເປີດ / ໜ້າຈໍຈະບໍ່ປິດຫາກທ່ານເບິ່ງມັນຢູ່"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"ປິດ"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"ຕ້ອງການສິດເຂົ້າເຖິງກ້ອງຖ່າຍຮູບ"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"ແຕະເພື່ອຈັດການສິດອະນຸຍາດສຳລັບບໍລິການປັບແຕ່ງອຸປະກອນໃຫ້ເປັນສ່ວນຕົວ"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"ປ້ອງກັນບໍ່ໃຫ້ໜ້າຈໍຂອງທ່ານປິດຫາກທ່ານກຳລັງເບິ່ງມັນຢູ່"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"ການເອົາໃຈໃສ່ໜ້າຈໍຈະໃຊ້ກ້ອງໜ້າເພື່ອເບິ່ງວ່າມີຄົນກຳລັງເບິ່ງໜ້າຈໍຢູ່ບໍ່. ມັນເຮັດວຽກຢູ່ອຸປະກອນ ແລະ ຈະບໍ່ມີການບັນທຶກຮູບພາບ ຫຼື ສົ່ງຮູບໄປໃຫ້ Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"ເປີດໃຊ້ການເອົາໃຈໃສ່ໜ້າຈໍ"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"ເມື່ອໜ້າຈໍມືດ, ມັນຈະຖືກເປີດໃຊ້ສຳລັບການແຈ້ງເຕືອນໃໝ່"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"ສະແດງເວລາ ແລະ ຂໍ້ມູນຕະຫຼອດ"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ເພີ່ມການນຳໃຊ້ແບັດເຕີຣີ"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"ຂໍ້ຄວາມຕົວໜາ"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"ຂໍ້ຄວາມຕົວໜາ"</string>
     <string name="title_font_size" msgid="570613010306330622">"ຂະໜາດຕົວອັກສອນ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ເຮັດໃຫ້ຂໍ້ຄວາມໃຫຍ່ຂຶ້ນ ຫຼື ນ້ອຍລົງ"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"ການຕັ້ງຄ່າການລັອກ SIM ກາດ"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"ຜູ່ໃຊ້ອື່ນໆ"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ບ່ອນຈັດເກັບຂໍ້ມູນອຸປະກອນ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"ໜ່ວຍເກັບຂໍ້ມູນແບບພົກພາ"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"ໂມງປຸກ ແລະ ການແຈ້ງເຕືອນ"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"ອະນຸຍາດໃຫ້ຕັ້ງໂມງປຸກ ຫຼື ການແຈ້ງເຕືອນ"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"ໂມງປຸກ ແລະ ການແຈ້ງເຕືອນ"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"ອະນຸຍາດໃຫ້ແອັບນີ້ກຳນົດເວລາໂມງປຸກ ຫຼື ເຫດການທີ່ອ້າງອີງເວລາອື່ນໆ. ນີ້ຈະເຮັດໃຫ້ແອັບສາມາດປຸກ ແລະ ເຮັດວຽກໄດ້ເຖິງແມ່ນວ່າທ່ານຈະບໍ່ໄດ້ໃຊ້ອຸປະກອນຢູ່ກໍຕາມ. ກະລຸນາຮັບຊາບວ່າການຖອດຖອນການອະນຸຍາດນີ້ອາດສົ່ງຜົນໃຫ້ແອັບເຮັດວຽກຜິດປົກກະຕິໄດ້, ໂດຍສະເພາະແມ່ນໂມງປຸກໃດກໍຕາມທີ່ແອັບໄດ້ກຳນົດເວລາໄວ້ຈະບໍ່ສາມາດເຮັດວຽໄດ້ອີກຕໍ່ໄປ."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"ກຳນົດເວລາ, ໂມງປຸກ, ການແຈ້ງເຕືອນ, ນັດໝາຍ"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> ໃຊ້ແລ້ວຈາກ <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"ໃຊ້ແລ້ວຈາກ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"ບໍລິການສະຖານທີ່"</string>
     <string name="location_title" msgid="5819154746934945021">"ທີ່ຢູ່ຂອງຂ້ອຍ"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ສະຖານທີ່ສຳລັບໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"ສິດເຂົ້າເຖິງສະຖານທີ່ຂອງແອັບ"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ປິດສະຖານທີ່ແລ້ວ"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ແອັບມີສິດເຂົ້າເຖິງສະຖານທີ່</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> ແອັບມີສິດເຂົ້າເຖິງສະຖານທີ່</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"ສິດການເຂົ້າເຖິງຫຼ້າສຸດ"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"ເບິ່ງລາຍລະອຽດ"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"ບໍ່ມີແອັບທີ່ຮ້ອງຂໍສະຖານທີ່ເມື່ອບໍ່ດົນມານີ້"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"ບໍ່ມີແອັບໃດເຂົ້າເຖິງສະຖານທີ່ຫຼ້າສຸດ"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ໃຊ້ແບັດເຕີຣີ່ຫຼາຍ"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ໃຊ້ແບັດເຕີຣີ່ໜ້ອຍ"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"ການສະແກນ Wi‑Fi ແລະ Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"ການ​ສະ​ແກນ Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"ອະນຸຍາດໃຫ້ແອັບ ແລະ ບໍລິການຕ່າງໆສະແກນຫາເຄືອຂ່າຍ Wi-Fi ໄດ້ທຸກເວລາ, ເຖິງແມ່ນວ່າຈະປິດ Wi-Fi ໄວ້ກໍຕາມ. ຄຸນສົມບັດນີ້ສາມາດໃຊ້ເພື່ອປັບປຸງຄຸນສົມບັດ ແລະ ບໍລິການທີ່ອ້າງອີງສະຖານທີ່ໄດ້."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ການ​ສະ​ແກນ Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ອະນຸຍາດໃຫ້ແອັບ ແລະ ບໍລິການຕ່າງໆສະແກນຫາອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງໄດ້ທຸກເວລາ, ເຖິງແມ່ນວ່າຈະປິດ Bluetooth ໄວ້ກໍຕາມ. ຄຸນສົມບັດນີ້ສາມາດໃຊ້ເພື່ອປັບປຸງຄຸນສົມບັດ ແລະ ບໍລິການທີ່ອ້າງອີງສະຖານທີ່ໄດ້."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"ບໍລິການສະຖານທີ່"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ບໍລິການສະຖານທີ່ສຳລັບວຽກ"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ການກວດຫາເຂດເວລາສະຖານທີ່"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ການກວດຫາເຂດເວລາສະຖານທີ່"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"ອະນຸຍາດໃຫ້ໃຊ້ສະຖານທີ່ຂອງອຸປະກອນເພື່ອກວດຫາເຂດເວລາປັດຈຸບັນ ການຕັ້ງຄ່າສະຖານທີ່ອື່ນໆ ເຊັ່ນ: ການສະແກນ Wi‑Fi ອາດມີຜົນກະທົບກັບຄວາມຖືກຕ້ອງຂອງການກວດຫາເຂດເວລາໄດ້."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ເປີດ"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ປິດ"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ປິດການນຳໃຊ້ການກວດຫາເຂດເວລາອັດຕະໂນມັດແລ້ວ"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ເຂດເວລາອັດຕະໂນມັດປິດຢູ່"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ປິດການນຳໃຊ້ການກວດຫາເຂດເວລາສະຖານທີ່ແລ້ວ"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ບໍ່ຮອງຮັບການກວດຫາເຂດເວລາສະຖານທີ່"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ບໍ່ອະນຸຍາດໃຫ້ປ່ຽນການກວດຫາເຂດເວລາສະຖານທີ່"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"ເປີດນຳໃຊ້"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"ລຶບພື້ນທີ່ຈັດເກັບຂໍ້ມູນ"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"ຖອນການຕິດຕັ້ງອັບເດດ"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"ທ່ານໄດ້ເລືອກທີ່ຈະເປີດໃຊ້ແອັບຯນີ້ ເປັນຄ່າເລີ່ມຕົ້ນ ສຳລັບການເຮັດວຽກບາງຢ່າງ."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"ການເຄື່ອນໄຫວຈຳນວນໜຶ່ງທີ່ທ່ານເລືອກຈະເປີດໃນແອັບນີ້ຕາມຄ່າເລີ່ມຕົ້ນ."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"ທ່ານໄດ້ອະນຸຍາດໃຫ້ແອັບຯນີ້ ສ້າງວິກເຈັດ ແລະເຂົ້າເຖິງຂໍ້ມູນຂອງພວກເຂົາໄດ້ແລ້ວ."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"ບໍ່ໄດ້ຕັ້ງຄ່າເລີ່ມຕົ້ນເທື່ອ."</string>
-    <string name="clear_activities" msgid="341345438786077236">"ລຶບຄ່າເລີ່ມຕົ້ນ"</string>
+    <string name="clear_activities" msgid="488089228657585700">"ລຶບລ້າງການຕັ້ງຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"ແອັບຯນີ້ອາດບໍ່ໄດ້ຖືກອອກແບບມາ ສຳລັບຂະໜາດໜ້າຈໍທີ່ທ່ານໃຊ້. ທ່ານສາມາດຄວບຄຸມວິທີທີ່ມັນປັບໂຕ ໃຫ້ເຂົ້າກັບໜ້າຈໍຂອງທ່ານໄດ້ບ່ອນນີ້."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"ຖາມເມື່ອເປີດໃຊ້"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"ກຳນົດຂະໜາດແອັບຯ"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ທ່ານສາມາດປັບແຕ່ງອຸປະກອນນີ້ໃຫ້ເໝາະສົມກັບຄວາມຕ້ອງການຂອງທ່ານ. ຄຸນສົມບັດຊ່ວຍເຂົ້າເຖິງເຫຼົ່ານີ້ສາມາດຖືກປ່ຽນແປງໄດ້ໃນພາຍຫຼັງໃນການຕັ້ງຄ່າ."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ປ່ຽນຂະໜາດຟອນ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"ຕົວອ່ານໜ້າຈໍ"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ສຽງ ແລະ ຂໍ້ຄວາມໜ້າຈໍ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"ຄຳບັນຍາຍ"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ສຽງ"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"ທົ່ວໄປ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ການສະແດງຜົນ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ຂໍ້ຄວາມ ແລະ ການສະແດງຜົນ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ເຮັດໃຫ້ໜ້າຈໍມືດລົງ"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ສີແດງ-ຂຽວ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ສີແດງ-ຂຽວ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ສີຟ້າ-ເຫຼືອງ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ຫຼຸດຄວາມສະຫວ່າງ"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"ຫຼຸດຄວາມສະຫວ່າງລົງ"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ເຮັດໃຫ້ໜ້າຈໍຂອງທ່ານມືດກວ່າຄວາມສະຫວ່າງຂັ້ນຕ່ຳຂອງໂທລະສັບທ່ານ"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ເຮັດໃຫ້ໜ້າຈໍຂອງທ່ານມືດກວ່າຄວາມສະຫວ່າງຂັ້ນຕ່ຳຂອງແທັບເລັດທ່ານ"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"ເຮັດໃຫ້ໜ້າຈໍຂອງທ່ານມືດລົງເພື່ອໃຫ້ອ່ານໄດ້ສະບາຍຂຶ້ນ.&lt;br/&gt;&lt;br/&gt; ນີ້ຈະມີປະໂຫຍດໃນເວລາ: &lt;ol&gt; &lt;li&gt; ຄວາມສະຫວ່າງຂັ້ນຕ່ຳເລີ່ມຕົ້ນຂອງໂທລະສັບທ່ານຍັງຄົງແຈ້ງເກີນໄປ&lt;/li&gt; &lt;li&gt; ທ່ານກຳລັງໃຊ້ໂທລະສັບໃນສະຖານະການທີ່ມືດ ເຊັ່ນ: ໃນເວລາກາງຄືນ ຫຼື ໃນຫ້ອງມືດກ່ອນນອນ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3097,7 +3124,7 @@
     <string name="user_guest" msgid="4545590092001460388">"ແຂກ"</string>
     <string name="user_exit_guest_title" msgid="2653103120908427236">"​ລຶບ​ແຂກ"</string>
     <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"ລຶບ​ແຂກ?"</string>
-    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"​ແອັບຯ​ແລະ​ຂໍ້​ມູນ​ທັງ​ໝົດ​ໃນ​ເຊດ​ຊັນ​ນີ້​ຈະ​ຖືກ​ລຶບ​ອອກ."</string>
+    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"​ແອັບ ແລະ ​ຂໍ້​ມູນ​ທັງ​ໝົດ​ໃນ​ເຊດ​ຊັນ​ນີ້​ຈະ​ຖືກ​ລຶບ​ອອກ."</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"ລຶບ​"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"ເປີດ​ການໂທ​"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ເປີດ​ໂທ​ລະ​ສັບ ແລະ SMS"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"ໃບໜ້າ"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"ລາຍນິ້ວມື, ເພີ່ມລາຍນິ້ວມື"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"ຫຼຸດແສງໜ້າຈໍ, ໜ້າຈໍສຳຜັດ, ແບັດເຕີຣີ, ຄວາມສະຫວ່າງອັດສະລິຍະ, ຄວາມສະຫວ່າງແບບໄດນາມິກ, ຄວາມສະຫວ່າງອັດຕະໂນມັດ"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"ຫຼຸດແສງໜ້າຈໍ, ປິດໜ້າຈໍ, ແບັດເຕີຣີ, ​ໄລ​ຍະໝົດເວລາ, ການເອົາໃຈໃສ່, ສະແດງຜົນ, ໜ້າຈໍ, ບໍ່ເຄື່ອນໄຫວ"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"ໝຸນ, ກັບດ້ານ, ຮູບລວງຕັ້ງ, ຮູບລວງນອນ, ທິດທາງ, ລວງຕັ້ງ, ລວງນອນ"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"ອັບເກຣດ, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, ກຳນົດການ, ການແຈ້ງເຕືອນ, ບລັອກ, ງຽບ, ສັ່ນເຕືອນ, ຫຼັບ, ວຽກ, ໂຟກັສ, ສຽງ, ປິດສຽງ, ມື້, ມື້ທຳມະດາ, ມື້ພັກ, ຄືນທຳມະດາ, ເຫດການ"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ໜ້າຈໍ, ເວລາລັອກ, ​ໄລ​ຍະໝົດເວລາ, ໜ້າຈໍລັອກ"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ຣິງໂທນ"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"ສຽງ ແລະ ການສັ່ນເຕືອນອື່ນໆ"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"ການແຈ້ງເຕືອນ"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"ການສົນທະນາ"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"ສົ່ງຫຼ້າສຸດ"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ເບິ່ງທັງໝົດຈາກ 7 ມື້ຫຼ້າສຸດ"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"​ຂັ້ນ​ສູງ"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ທົ່ວໄປ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"ການແຈ້ງເຕືອນວຽກ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"ການແຈ້ງເຕືອນແບບປັບປ່ຽນໄດ້ເອງ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ຄວາມສຳຄັນການແຈ້ງເຕືອນແບບປັບໄດ້ເອງ"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"ສະແດງໃນແຖບແບບເລື່ອນລົງ, ແຖບສະຖານະ ແລະ ຢູ່ໜ້າຈໍລັອກ"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ເຊື່ອງການແຈ້ງເຕືອນງຽບໃນແຖບສະຖານະ"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ກະພິບໄຟ"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"ການແຈ້ງເຕືອນຢູ່ໜ້າຈໍລັອກ"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ຄວາມເປັນສ່ວນຕົວ"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ຂ້າມໜ້າຈໍລັອກ"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ຫຼັງຈາກປົດລັອກດ້ວຍໜ້າແລ້ວ, ໃຫ້ໄປທີ່ໜ້າຈໍທີ່ໃຊ້ຫຼ້າສຸດໂດຍກົງ"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ໜ້າຈໍລັອກ, ຂ້າມ, ອ້ອມ"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> ການແຈ້ງເຕືອນຕໍ່ອາທິດ</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"ບໍ່ສົ່ງ"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"ການ​ເຂົ້າ​ເຖິງ​ການ​ແຈ້ງ​ເຕືອນ"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"ອຸປະກອນ ແລະ ການແຈ້ງເຕືອນ"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"ຄວບຄຸມວ່າຈະໃຫ້ສະແດງການແຈ້ງເຕືອນໃດຢູ່ແອັບ ແລະ ອຸປະກອນຂອງທ່ານ"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"ການເຂົ້າເຖິງການແຈ້ງເຕືອນໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຖືກບລັອກໄວ້"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"ແອັບຯບໍ່ສາມາດອ່ານການແຈ້ງເຕືອນໄດ້"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"ປິດໄວ້"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"ຍົກເລີກ"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"ປະເພດການແຈ້ງເຕືອນທີ່ໄດ້ຮັບອະນຸຍາດ"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"ການແຈ້ງເຕືອນຂາອອກສຳຄັນ"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"ການແຈ້ງເຕືອນການສົນທະນາ"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"ການແຈ້ງເຕືອນການເຕືອນ"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"ການແຈ້ງເຕືອນແບບງຽບ"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"ແບບສົດໆ"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"ການຕິດຕໍ່ສື່ສານແບບສົດໆຈາກແອັບທີ່ນຳໃຊ້ຢູ່, ການນຳທາງ, ການໂທລະສັບ ແລະ ອື່ນໆ"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"ການສົນທະນາ"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS ແລະ ການຕິດຕໍ່ສື່ສານອື່ນໆ"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"ຄ່າເລີ່ມຕົ້ນ"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"ການແຈ້ງເຕືອນທີ່ອາດສົ່ງສຽງ ຫຼື ສັ່ນເຕືອນໂດຍອີງໃສ່ການຕັ້ງຄ່າ"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"ງຽບ"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"ການແຈ້ງເຕືອນທີ່ບໍ່ມີສຽງ ຫຼື ການສັ່ນເຕືອນ"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"ເບິ່ງແອັບທັງໝົດ"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"ປ່ຽນການຕັ້ງຄ່າການແຈ້ງເຕືອນສຳລັບແຕ່ລະແອັບທີ່ສາມາດສົ່ງການແຈ້ງເຕືອນໄດ້"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"ແອັບທີ່ສະແດງຢູ່ອຸປະກອນ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"ບໍລິການຕົວຊ່ວຍ VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ບໍ່ມີແອັບທີ່ຕິດຕັ້ງແລ້ວທີ່ຮ້ອງຂໍໃຫ້ໃຊ້ເປັນບໍລິການຕົວຊ່ວຍ VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"ອະນຸຍາດໃຫ້ເຂົ້າເຖິງບໍລິການ VR ສຳລັບ <xliff:g id="SERVICE">%1$s</xliff:g> ບໍ?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"ເປີດ​ຕາມ​ມາດ​ຕະ​ຖານ"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"ການເປີດລິ້ງ"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"ເປີດ​ລິ້ງ​ທີ່​ຮອງ​ຮັບ​"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"ລິ້ງທີ່ຮອງຮັບຈະເປີດໃນແອັບນີ້"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"ລິ້ງເພື່ອເປີດໃນແອັບນີ້"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"ເປີດ​ໂດຍ​ບໍ່​ຕ້ອງ​ຖາມ"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"ລິ້ງ​ທີ່​ຮອງ​ຮັບ​"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"ມາດ​ຕະ​ຖານ​ອື່ນ"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"ການຕັ້ງຄ່າເລີ່ມຕົ້ນອື່ນໆ"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"ເພີ່ມລິ້ງ"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"ແອັບສາມາດຢັ້ງຢືນລິ້ງເພື່ອເປີດອັດຕະໂນມັດໃນແອັບ. "<annotation id="url">"ສຶກສາເພີ່ມເຕີມ"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ລິ້ງທີ່ຢັ້ງຢືນແລ້ວ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ລິ້ງທີ່ຢັ້ງຢືນແລ້ວ</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">ລິ້ງເຫຼົ່ານີ້ຜ່ານການຢັ້ງຢືນແລ້ວ ແລະ ເປີດໃນແອັບນີ້ໂດຍອັດຕະໂນມັດ.</item>
+      <item quantity="one">ລິ້ງນີ້ຜ່ານການຢັ້ງຢືນແລ້ວ ແລະ ເປີດໃນແອັບນີ້ໂດຍອັດຕະໂນມັດ.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ຕົກລົງ"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"ກຳລັງກວດສອບລິ້ງທີ່ຮອງຮັບອື່ນໆ…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"ຍົກເລີກ"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ລິ້ງທີ່ຮອງຮັບ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ລິ້ງທີ່ຮອງຮັບ</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"ເພີ່ມ"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"ເປີດໃນ <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> ໃຊ້​ຢູ່​ໃນ <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"ບ່ອນຈັດເກັບຂໍ້ມູນພາຍໃນ"</string>
     <string name="storage_type_external" msgid="125078274000280821">"ບ່ອນຈັດເກັບຂໍ້ມູນພາຍນອກ"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"ບໍ່ອະນຸຍາດໃຫ້ໃຊ້ກ້ອງຖ່າຍຮູບ"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"ບໍ່ອະນຸຍາດຖ່າຍຮູບໜ້າຈໍ"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"ບໍ່ສາມາດເປີດແອັບນີ້ໄດ້"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"ຫາກທ່ານມີຄຳຖາມ, ກະລຸນາຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບໄອທີຂອງທ່ານ"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"ລາຍລະອຽດເພີ່ມເຕີມ"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"ຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານສາມາດຕິດຕາມ ແລະ ຈັດການແອັບ ແລະ ຂໍ້ມູນທີ່ເຊື່ອມໂຍງກັບໂປຣໄຟລ໌ບ່ອນເຮັດວຽກຂອງທ່ານໄດ້ ເຊິ່ງຮວມເຖິງການຕັ້ງຄ່າ, ການອະນຸຍາດ, ການເຂົ້າເຖິງອົງກອນ, ການເຄື່ອນໄຫວເຄືອຂ່າຍ ແລະ ຂໍ້ມູນສະຖານທີ່ຂອງອຸປະກອນ."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"ຜູ້ເບິ່ງແຍງລະບົບຂອງທ່ານສາມາດຕິດຕາມ ແລະ ຈັດການແອັບ ແລະ ຂໍ້ມູນທີ່ເຊື່ອມໂຍງກັບຜູ້ໃຊ້ນີ້ໄດ້ ເຊິ່ງຮວມເຖິງການຕັ້ງຄ່າ, ການອະນຸຍາດ, ການເຂົ້າເຖິງອົງກອນ, ການເຄື່ອນໄຫວເຄືອຂ່າຍ ແລະ ຂໍ້ມູນສະຖານທີ່ຂອງອຸປະກອນ."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="one">1 ຂໍ້ຈຳກັດ</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ການນັບຂໍ້ມູນຈາກຜູ້ໃຫ້ບໍລິການ ອາດມີຄວາມແຕກຕ່າງຈາກການນັບຂອງອຸປະກອນ"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"ບໍ່ຮວມການໃຊ້ອິນເຕີເນັດທີ່ຖືກໃຊ້ໂດຍເຄືອຂ່າຍຜູ້ໃຫ້ບໍລິການ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"ບໍ່ຮວມປະລິມານຂໍ້ມູນອິນເຕີເນັດທີ່ໃຊ້ໂດຍເຄືອຂ່າຍຜູ້ໃຫ້ບໍລິການ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"ໃຊ້ໄປແລ້ວ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ຕັ້ງການເຕືອນຂໍ້ມູນ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ຄຳເຕືອນຂໍ້ມູນ"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(ຖືກຖອນການຕິດຕັ້ງສຳລັບຜູ້ໃຊ້ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(ຖຶືກປິດໄວ້ສຳລັບຜູ້ໃຊ້ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"ບໍລິການຕື່ມຂໍ້ມູນອັດຕະໂນມັດ"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"ອັດຕະໂນມັດ, ຕື່ມຂໍ້ມູນ, ຕື່ມຂໍ້ມູນອັດຕະໂນມັດ"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"ລະ​ຫັດ​ຜ່ານ"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"ອັດຕະໂນມັດ, ຕື່ມຂໍ້ມູນ, ການຕື່ມຂໍ້ມູນອັດຕະໂນມັດ, ລະຫັດຜ່ານ"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;ໃຫ້ກວດສອບວ່າທ່ານເຊື່ອແອັບນີ້&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ຈະໃຊ້ສິ່ງທີ່ຢູ່ໃນໜ້າຈໍຂອງທ່ານເພື່ອກວດເບິ່ງວ່າຈະຕື່ມຂໍ້ມູນຫຍັງອັດຕະໂນມັດ."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"ຕື່ມຂໍ້ມູນອັດຕະໂນມັດ"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"ລະດັບການບັນທຶກ"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ປ່ຽນໂໝດປະຕິບັດການຂອງເຄືອຂ່າຍ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ປະເພດເຄືອຂ່າຍທີ່ຕ້ອງການ"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ຜູ້ໃຫ້ບໍລິການ"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ເວີຊັນການຕັ້ງຄ່າ"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"ເວີຊັນການຕັ້ງຄ່າຜູ້ໃຫ້ບໍລິການ"</string>
     <string name="call_category" msgid="641461844504128789">"ກຳລັງໂທ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"ການໂທວິດີໂອຂອງຜູ້ໃຫ້ບໍລິການ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"ການເລືອກລະບົບ"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ກະລຸນາຖອດຊິມອອກແລ້ວໃສ່ເຂົ້າໄປໃໝ່. ຫາກຍັງຄົງພົບບັນຫາຢູ່, ໃຫ້ຣີສະຕາດອຸປະກອນຂອງທ່ານ."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ໃຫ້ລອງເປີດຊິມຄືນໃໝ່. ຫາກຍັງຄົງພົບບັນຫາຢູ່, ໃຫ້ຣີສະຕາດອຸປະກອນຂອງທ່ານ."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ການເປີດນຳໃຊ້ເຄືອຂ່າຍ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"ການສະຫຼັບຜູ້ໃຫ້ບໍລິການ"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"ເປີດໃຊ້ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ຢູ່"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"ແຕະເພື່ອອັບເດດການຕັ້ງຄ່າຊິມກາດ"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"ສະຫຼັບໄປໃຊ້ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ແລ້ວ"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"ປິດ"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"ອິນເຕີເນັດ"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"ສະແດງເຄືອຂ່າຍໂໝດຢູ່ໃນຍົນ"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"ຊອກຫາ ແລະ ເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍໃນໂໝດຢູ່ໃນຍົນ."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"ຊອກ ແລະ ເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍ Wi‑Fi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ຍົນ, ປອດໄພກັບຍົນ"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"ການໂທ ແລະ SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"ການໂທ Wi-Fi"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ບໍ່ມີຂໍ້ມູນ"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ບໍ່ສາມາດໃຊ້ໄດ້ຊົ່ວຄາວ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"ບໍ່ມີຊິມ"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ການຕັ້ງຄ່າ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ການຕັ້ງຄ່າເຄືອຂ່າຍ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍສາທາລະນະ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ການເຊື່ອມຕໍ່ເຄືອຂ່າຍ, ອິນເຕີເນັດ, ໄຮ້ສາຍ, ອິນເຕີເນັດມືຖື, wifi, wi-fi, wi fi, ເຄືອຂ່າຍທືຖື, ມືຖື, ຜູ້ໃຫ້ບໍລິການມືຖື, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ເບິ່ງເຄືອຂ່າຍໂໝດຢູ່ໃນຍົນ"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"ກຳລັງເບິ່ງເຄືອຂ່າຍໂໝດຢູ່ໃນຍົນ"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"ເປີດເຄືອຂ່າຍ"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"ປິດເຄືອຂ່າຍ"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"ຣີເຊັດອິນເຕີເນັດຂອງທ່ານບໍ?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"ນີ້ຈະເປັນການສິ້ນສຸດການໂທຂອງທ່ານ"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ນີ້ຈະເປັນການສິ້ນສຸດການໂທຂອງທ່ານ"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"ກຳລັງຣີເຊັດອິນເຕີເນັດຂອງທ່ານ…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"ແກ້ໄຂການເຊື່ອມຕໍ່"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"ສາມາດໃຊ້ເຄືອຂ່າຍໂໝດຢູ່ໃນຍົນໄດ້"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ເພື່ອສະຫຼັບເຄືອຂ່າຍ, ໃຫ້ຕັດການເຊື່ອມຕໍ່ອີເທີເນັດກ່ອນ"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ບໍ່ສາມາດສະຫຼັບເຄືອຂ່າຍໄດ້ໃນຂະນະທີ່ເຊື່ອມຕໍ່ແລ້ວ"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ເຄືອຂ່າຍໂໝດຢູ່ໃນຍົນ"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"ຈະບໍ່ເຊື່ອມຕໍ່ອິນເຕີເນັດ"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"ສີ"</string>
     <string name="category_name_others" msgid="2366006298768550310">"ອື່ນໆ"</string>
     <string name="category_name_general" msgid="7737273712848115886">"ທົ່ວໄປ"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"ເບິ່ງແອັບທັງໝົດ"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"ການໂອນສາຍອັດສະລິຍະ"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"ເປີດການນຳໃຊ້ການໂອນສາຍອັດສະລິຍະແລ້ວ"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ໃສ່ເບີໂທລະສັບ"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ບໍ່ມີເບີໂທລະສັບ."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ຕົກລົງ"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"ອະນຸຍາດ 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"ໃຊ້ການເຊື່ອມຕໍ່ມືຖື 2G. ສຳລັບການໂທສຸກເສີນ, ຈະເປີດໃຊ້ 2G ຕະຫຼອດເວລາ."</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 979bc79..60f5a04 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -54,9 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Sumažinkite arba padidinkite ekrane rodomą tekstą."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Padaryti mažesnius"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Padaryti didesnius"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Naudoti automatinį pasukimą"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Pavyzdinis tekstas"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Nuostabusis Ozo šalies burtininkas"</string>
@@ -413,15 +412,21 @@
       <item quantity="other">Nustatyta <xliff:g id="COUNT_1">%1$d</xliff:g> piršto atspaudų</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Atrakinimas piršto atspaudu"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Kontrolinio kodo nustatymas"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Piršto antspaudo naudojimas"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Tiesiog palieskite piršto antspaudo jutiklį, kad galėtumėte atrakinti telefoną, įgalioti pirkimo operacijas arba prisijungti prie programų. Atidžiai rinkitės, kieno kontrolinius kodus pridedate. Net vienu pridėtu piršto antspaudu galima atlikti visus šiuos veiksmus."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Kontrolinis kodas gali būti ne toks saugus kaip sudėtingas atrakinimo piešinys ar PIN kodas."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Jūs viską valdote"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Atminkite"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Naudojant kontrolinio kodo funkciją įrašyti duomenys saugiai saugomi ir visada lieka tik jūsų telefone. Savo duomenis galite bet kada ištrinti skiltyje „Nustatymai“."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Kontrolinis kodas gali būti ne toks saugus kaip sudėtingas atrakinimo piešinys ar PIN kodas."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Telefonas retkarčiais naudos naujausius kontrolinio kodo vaizdus, kad galėtų sukurti patobulintus kontrolinio kodo modelius."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Atrakinkite telefoną ir patvirtinkite pirkimo operacijas piršto atspaudu.\n\nPastaba: negalite atrakinti šio įrenginio piršto atspaudu. Norėdami gauti daugiau informacijos, susisiekite su organizacijos administratoriumi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Atrakinkite telefoną ir patvirtinkite pirkimo operacijas piršto atspaudu.\n\nPastaba: piršto atspaudas gali būti ne toks saugus kaip patikimas atrakinimo piešinys ar PIN kodas."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Atšaukti"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, ačiū"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Praleisti"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Tęsti"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Sutikti"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Praleisti"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Kitas"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Praleisti piršto antspaudą?"</string>
@@ -438,16 +443,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Praleisti"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Atšaukti"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Palieskite jutiklį"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Palieskite ir palaikykite kontrolinio kodo piktogramą"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Jis yra telefono užpakalinėje dalyje. Naudokite smilių."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Tai ekrane. Ieškokite kontrolinio kodo su švytinčiu apskritimu."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Kontrolinio kodo jutiklis yra jūsų ekrane. Raskite jį pirštu braukdami per ekraną."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Įrenginio ir piršto antspaudo jutiklio vietos iliustracija"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Pavadinimas"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Gerai"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Ištrinti"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Palieskite jutiklį"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Uždėkite pirštą ant jutiklio ir pakelkite, kai pajusite vibravimą"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Patraukite ir vėl prilieskite"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Vis patraukite pirštą, kad pridėtumėte skirtingas piršto atspaudo dalis"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Piršto atspaudas pridėtas"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Kai rodoma ši piktograma, tapatybei nustatyti ar pirkimo operacijai patvirtinti naudokite piršto antspaudą"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Atlikti vėliau"</string>
@@ -1216,14 +1230,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Ieškoti"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ekranas"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automatiškai sukti ekraną"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Išjungta"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Įjungta"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Įjungta – pagal veidą"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Įgalinti veido aptikimą"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Spalvos"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natūrali"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Suintensyvinta"</string>
@@ -1268,7 +1278,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Įjungta – ekranas neišsijungs, kol į jį žiūrėsite"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Išjungta"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Reikalinga prieiga prie fotoaparato"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Palieskite ir tvarkykite įrenginio suasmeninimo paslaugų leidimus"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Neleidžiama išsijungti ekranui, kol į jį žiūrite"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Funkcija „Žiūrėjimas į ekraną“ naudoja priekinį fotoaparatą, kad nustatytų, ar kas nors žiūri į ekraną. Ši funkcija veikia pačiame įrenginyje, jokie vaizdai neišsaugomi ir nesiunčiami „Google“."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Žiūrėjimo į ekraną funkcijos įjungimas"</string>
@@ -1349,7 +1362,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Tamsus ekranas įjungiamas gavus naujų pranešimų"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Visada rodyti laiką ir inform."</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Naudojama daugiau akumuliatoriaus energijos"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Pusjuodis tekstas"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Pusjuodis tekstas"</string>
     <string name="title_font_size" msgid="570613010306330622">"Šrifto dydis"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Padidinkite arba sumažinkite tekstą"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM kort. užrakto nust."</string>
@@ -1520,6 +1533,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Kiti naudotojai"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Įrenginio atmintinė"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Nešiojama atmintinė"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Signalai ir priminimai"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Leisti nustatyti signalus arba priminimus"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Signalai ir priminimai"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Leisti šiai programai planuoti signalus ar kitą laiką pagal įvykius. Bus leidžiama pažadinti programą ir vykdyti įvykį, kai nenaudojate įrenginio. Atminkite, kad anuliavus šį leidimą programa gali veikti netinkamai, ypač nebeveiks programos suplanuoti signalai."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"tvarkaraštis, signalas, priminimas, įvykis"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Naudojama: <xliff:g id="USED">%1$s</xliff:g> iš <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Naudojama iš <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1769,7 +1787,8 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Vietovės nustatymo paslaugos"</string>
     <string name="location_title" msgid="5819154746934945021">"Mano vieta"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Darbo profilio vieta"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Programos vietovės prieiga"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Vietovė išjungta"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> Tiek programų gali pasiekti vietovę: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> iš <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
@@ -1777,24 +1796,24 @@
       <item quantity="many"> Tiek programų gali pasiekti vietovę: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> iš <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
       <item quantity="other"> Tiek programų gali pasiekti vietovę: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> iš <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Pastaroji vietovės prieiga"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Žr. išsamią informaciją"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Nė viena programa pastaruoju metu nepateikė užklausų dėl vietovės"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Jokios programos neseniai nepasiekė vietovės"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Naudoja daug akum. energijos"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Naudoja mažai akum. energijos"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"„Wi‑Fi“ ir „Bluetooth“ ryšio nuskaitymas"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"„Wi‑Fi“ nuskaitymas"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Leisti programoms ir paslaugoms bet kuriuo metu nuskaityti ieškant „Wi‑Fi“ tinklų, net kai „Wi‑Fi“ išjungtas. Tai galima naudoti norint, pvz., tobulinti pagal vietovę teikiamas funkcijas ir paslaugas."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"„Bluetooth“ nuskaitymas"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Leisti programoms ir paslaugoms bet kuriuo metu nuskaityti ieškant netoliese esančių įrenginių, net kai „Bluetooth“ išjungtas. Tai galima naudoti norint, pvz., tobulinti pagal vietovę teikiamas funkcijas ir paslaugas."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Vietovės paslaugos"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Darbui skirtos Vietovės paslaugos"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Vietovės laiko juostos nustatymas"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Vietovės laiko juostos nustatymas"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Leidžiama naudoti įrenginio vietovės informaciją norint nustatyti dabartinę laiko juostą. Kiti vietovės nustatymai, pvz., „Wi‑Fi“ nuskaitymas, gali turėti įtakos laiko juostos nustatymo tikslumui."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Įjungta"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Išjungta"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatinis laiko juostos nustatymas išjungtas"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatinė laiko juosta išjungta"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Vietovės laiko juostos nustatymas išjungtas"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Vietovės laiko juostos nustatymas nepalaikomas"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Vietovės laiko juostos nustatymo pakeitimai neleidžiami"</string>
@@ -1977,10 +1996,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Įgalinti"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Išvalyti saugyklą"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Pašalinti naujinius"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Pasirinkote pagal numatytuosius nustatymus paleisti šią programą atliekant tam tikrus veiksmus."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Kai kurios jūsų pasirinktos veiklos atidaromos šioje programoje pagal numatytuosius nustatymus."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Pasirinkote leisti šiai programai kurti valdiklius ir pasiekti jų duomenis."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Nenustatyti jokie numatytieji nustatymai."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Išvalyti numatytuosius nustatymus"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Išvalyti numatytąsias nuostatas"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Ši programa gali būti nepritaikyta jūsų ekranui. Čia galite valdyti jos pritaikymą pagal ekraną."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Paklausti, kai paleidžiama"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Keisti programos mastelį"</string>
@@ -2192,7 +2211,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Galite tinkinti šį įrenginį pagal savo poreikius. Vėliau šias pritaikymo neįgaliesiems funkcijas galite pakeisti nustatymuose."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Pakeisti šrifto dydį"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekrano skaitytuvai"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Garsas ir tekstas ekrane"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtitrai"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Garsas"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Bendrieji"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekranas"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekstas ir vaizdas"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekrano tamsinimas"</string>
@@ -2347,7 +2368,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Raudona, žalia"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Raudona, žalia"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Mėlyna, geltona"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Šviesumo mažinimas"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Šviesumo mažinimas"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Tamsinkite ekraną daugiau nei mažiausias telefono šviesumas"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Tamsinkite ekraną daugiau nei mažiausias planšetinio kompiuterio šviesumas"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Tamsinkite ekraną, kad būtų patogiau skaityti.&lt;br/&gt;&lt;br/&gt; Tai gali būti naudinga, kai: &lt;ol&gt; &lt;li&gt; nustačius numatytąjį mažiausią telefono šviesumą ekranas vis tiek pernelyg šviesus;&lt;/li&gt; &lt;li&gt; telefoną naudojate tamsioje aplinkoje, pvz., naktį arba tamsiame kambaryje prieš eidami miegoti.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3422,8 +3443,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"veidas"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"kontrolinis kodas, pridėti kontrolinį kodą"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"pritemdyti ekraną, jutiklinis ekranas, akumuliatorius, išmanusis šviesumas, dinaminis šviesumas, automatinis šviesumas"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"užtemdyti ekraną, miego būsena, akumuliatorius, skirtasis laikas, dėmesys, pateiktis, ekranas, neaktyvumas"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"pasukti, apversti, pasukimas, stačia, gulsčia, orientacija, vertikali, horizontali"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"atnaujinti, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, tvarkaraštis, pranešimai, blokuoti, tyla, vibruoti, miego būsena, darbas, fokusavimas, garsas, nutildyti, diena, savaitės diena, savaitgalis, savaitės naktis, renginys"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ekranas, užrakinimo laikas, skirtasis laikas, užrakinimo ekranas"</string>
@@ -3592,9 +3615,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Skambėjimo tonai"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Kiti garsai ir vibravimas"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Pranešimai"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Pokalbis"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Neseniai išsiųsta"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Žiūrėti visas pastarųjų 7 d."</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Išplėstiniai"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Bendrieji"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Darbo profilio pranešimai"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Prisitaikantys pranešimai"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptyviųjų pranešimų prioritetas"</string>
@@ -3656,7 +3680,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Pateikti išskleidžiamajame skydelyje, būsenos juostoje ir užrakinimo ekrane"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Slėpti tylius pranešimus būsenos juostoje"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Mirksinti šviesa"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Pranešimai užrakinimo ekrane"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privatumas"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Praleisti užrakinimo ekraną"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Pan. atr. pagal veidą funkc., ties. eiti į pask. naud. ekr."</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"užrakinimo ekranas, praleisti, apeiti"</string>
@@ -3751,7 +3775,8 @@
       <item quantity="other">~ <xliff:g id="NUMBER_1">%d</xliff:g> pranešimų per savaitę</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Niekada"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Prieiga prie pranešimų"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"įrenginių ir programų pranešimai"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Valdykite, kokie pranešimai rodomi programose ir įrenginiuose"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Prieiga prie darbo profilio pranešimų užblokuota"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Programos negali skaityti pranešimų"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3772,17 +3797,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Išjungti"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Atšaukti"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Leidžiamų pranešimų tipai"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Svarbūs pranešimai iš programų"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Pokalbių pranešimai"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Įspėjamieji pranešimai"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Tylieji pranešimai"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Realusis laikas"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Realiojo laiko pranešimai iš naudojamų programų, navigacija, telefono skambučiai ir kt."</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Pokalbiai"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS ir kiti pranešimai"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Numatytasis"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Pranešimai, kurie gali skambėti arba vibruoti, atsižvelgiant į nustatymus"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Begarsis"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Pranešimai, pateikiami be garso ar vibracijos"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Žr. visas programas"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Pakeiskite kiekvienos programos, galinčios siųsti pranešimus, pranešimų nustatymus"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Įrenginyje rodomos programos"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Pagalbinės virtualiosios realybės paslaugos"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nėra įdiegtų programų, kurios pateikė užklausą būti vykdomos kaip pagalbinės virtualiosios realybės paslaugos."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Leisti „<xliff:g id="SERVICE">%1$s</xliff:g>“ pasiekti virtualiosios realybės paslaugą?"</string>
@@ -4082,9 +4107,36 @@
     <string name="launch_by_default" msgid="892824422067985734">"Atidaryti pagal numatyt. nustatymus"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Atidarymo nuorodos"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Atidaryti palaikomas nuorodas"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Palaikomos nuorodos atidaromos šioje programoje"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Nuorodos, kurios atidaromos šioje programoje"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Atidaryti neklausiant"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Palaikomos nuorodos"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Kiti numatytieji nustatymai"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Kitos numatytosios nuostatos"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Pridėti nuorodą"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Programa gali patvirtinti nuorodas, kad jas būtų galimai automatiškai atidaryti programoje. "<annotation id="url">"Sužinokite daugiau"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> patvirtinta nuoroda</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> patvirtintos nuorodos</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> patvirtintos nuorodos</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> patvirtintų nuorodų</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Šios nuorodos yra patvirtintos ir automatiškai atidaromos šioje programoje.</item>
+      <item quantity="few">Šios nuorodos yra patvirtintos ir automatiškai atidaromos šioje programoje.</item>
+      <item quantity="many">Šios nuorodos yra patvirtintos ir automatiškai atidaromos šioje programoje.</item>
+      <item quantity="other">Šios nuorodos yra patvirtintos ir automatiškai atidaromos šioje programoje.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Gerai"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Ieškoma kitų palaikomų nuorodų…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Atšaukti"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> palaikoma nuoroda</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> palaikomos nuorodos</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> palaikomos nuorodos</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> palaikomų nuorodų</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Pridėti"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Atidaroma programoje „<xliff:g id="APP_LABEL">%s</xliff:g>“"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"Naudojama: <xliff:g id="SIZE">%1$s</xliff:g> (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"vidinė atmintis"</string>
     <string name="storage_type_external" msgid="125078274000280821">"išorinė atmintis"</string>
@@ -4399,7 +4451,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Fotoaparatas neleidžiamas"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Ekrano kopija neleidžiama"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Nepavyko atidaryti šios programos"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Jei kyla klausimų, susisiekite su IT administratoriumi"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Daugiau išsamios informacijos"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Administratorius gali stebėti ir tvarkyti su jūsų darbo profiliu susietas programas ir duomenis, įskaitant nustatymus, leidimus, prieigą prie įmonės duomenų, tinklo veiklą ir įrenginio vietovės informaciją."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Administratorius gali stebėti ir tvarkyti su šiuo naudotoju susietas programas ir duomenis, įskaitant nustatymus, leidimus, prieigą prie įmonės duomenų, tinklo veiklą ir įrenginio vietovės informaciją."</string>
@@ -4482,7 +4535,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apribojimų</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operatoriaus duomenų apskaita gali skirtis nuo įrenginio duomenų apskaitos"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Išskiriami duomenys, kuriuos naudoja operatorių tinklai"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Išskiriami duomenys, kuriuos naudoja operatorių tinklai"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Išnaudota <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Nustatyti duomenų įspėjimą"</string>
     <string name="data_warning" msgid="2925054658166062884">"Duomenų įspėjimas"</string>
@@ -4845,7 +4898,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(pašalinta naudotojui <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(išjungta naudotojui <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Aut. pildymo paslauga"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automatinis, pildymas, automatinis pildymas"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Slaptažodžiai"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automatinis, užpildyti, automatinis pildymas, slaptažodis"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Įsitikinkite, kad pasitikite šia programa&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=„Google“ automatinis pildymas&gt;%1$s&lt;/xliff:g&gt; naudodamas informaciją ekrane nustato, ką gali užpildyti automatiškai."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Automatinis pildymas"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Registr. į žurnalą lygis"</string>
@@ -5054,7 +5108,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Pakeisti tinklo veikimo režimą"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Pageidaujamas tinklo tipas"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operatorius"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Nustatymų versija"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operatoriaus nustatymų versija"</string>
     <string name="call_category" msgid="641461844504128789">"Skambinama"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operatoriaus vaizdo skambučiai"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sistemos pasirinkimas"</string>
@@ -5103,6 +5157,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Išimkite SIM kortelę ir vėl įdėkite. Jei problema išlieka, iš naujo paleiskite įrenginį."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Pabandykite vėl įjungti SIM kortelę. Jei problema išlieka, iš naujo paleiskite įrenginį."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Tinklo aktyvinimas"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operatoriaus keitimas"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Operatorius „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“ aktyvus"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Palieskite ir atnaujinkite SIM nustatymus"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Perjungta į „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“"</string>
@@ -5267,8 +5322,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Išjungta"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internetas"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Rodyti lėktuvo režimo tinklus"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Raskite ir prisijunkite prie tinklų lėktuvo režimu."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Raskite „Wi‑Fi“ tinklus ir prisijunkite prie jų"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lėktuvas, saugu naudoti lėktuvuose"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Skambučiai ir SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"„Wi‑Fi“ skambučiai"</string>
@@ -5282,22 +5336,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nepasiekiama"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Laikinai nepasiekiama"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nėra SIM kortelės"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Nuostatos"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Tinklo nuostatos"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Prisijungti prie viešųjų tinklų"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"tinklo ryšys, internetas, belaidis ryšys, duomenys, „Wifi“, „Wi-Fi“, „Wi Fi“, mobilusis ryšys, mobilusis, mobiliojo ryšio operatorius, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Žr. lėktuvo režimo tinklus"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Peržiūrimi lėktuvo režimo tinklai"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Įjungti tinklus"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Išjungti tinklus"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Nustatyti internetą iš naujo?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Tai atlikus bus nutrauktas telefono skambutis"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Tai atlikus bus nutrauktas telefono skambutis"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Internetas nustatomas iš naujo…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Tvarkyti ryšį"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Pasiekiami lėktuvo režimo tinklai"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Norėdami perjungti tinklus, atjunkite eternetą"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Negalima perjungti tinklų prisijungus"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Lėktuvo režimo tinklai"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Prisijungta"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Prie interneto nebus jungiamasi automatiškai"</string>
@@ -5318,6 +5371,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Spalva"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Kita"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Bendrieji"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Žr. visas programas"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Išmanusis peradresavimas"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Išmanusis peradresavimas įgalintas"</string>
@@ -5331,4 +5388,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Įveskite telefono numerį"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Nėra telefono numerio."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Gerai"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Leisti 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Naudokite 2G korinius ryšius. 2G yra visada įjungtas, kad būtų galima atlikti skambučius pagalbos numeriu."</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b94afbe..fe58fd5 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -53,9 +53,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Palieliniet vai samaziniet tekstu ekrānā."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Samazināt"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Palielināt"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Automātiska pagriešana"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Teksta paraugs"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Brīnumainais burvis no Oza zemes"</string>
@@ -409,15 +408,21 @@
       <item quantity="other">Iestatīt <xliff:g id="COUNT_1">%1$d</xliff:g> pirkstu nospiedumus</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Atbloķēšana ar pirksta nospiedumu"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Pirksta nospied. iestatīšana"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Pirksta nospieduma lietošana"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Pieskarieties pirksta nospieduma sensoram, lai atbloķētu tālruni, autorizētu pirkumus vai pierakstītos lietotnēs. Pievienojiet tikai uzticamu personu pirkstu nospiedumus. Pat viens pievienots pirksta nospiedums ļauj veikt šīs darbības."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Pirksta nospiedums var būt mazāk drošs nekā sarežģīta kombinācija vai PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Viss ir jūsu pārziņā"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Svarīga informācija"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Reģistrētie pirkstu nospiedumu dati tiek droši glabāti un vienmēr atrodas jūsu tālrunī. Iestatījumos varat jebkurā laikā dzēst šos datus."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Pirksta nospiedums var būt mazāk drošs nekā sarežģīta kombinācija vai PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Jūsu tālrunī laiku pa laikam tiks izmantoti nesenie pirkstu nospiedumu attēli, lai uzlabotu pirkstu nospiedumu modeļus."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Izmantojiet pirksta nospiedumu, lai atbloķētu tālruni vai apstiprinātu pirkumu.\n\nPiezīme. Pirksta nospiedumu nevar izmantot šīs ierīces atbloķēšanai. Lai iegūtu plašāku informāciju, sazinieties ar savas organizācijas administratoru."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Izmantojiet pirksta nospiedumu, lai atbloķētu tālruni vai apstiprinātu pirkumu.\n\nPiezīme. Pirksta nospiedums var būt mazāk drošs nekā sarežģīta kombinācija vai PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Atcelt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nē, paldies"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Izlaist"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Turpināt"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Piekrītu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Izlaist"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Tālāk"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Izlaist pirksta nospiedumu?"</string>
@@ -434,16 +439,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Izlaist"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Atcelt"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Pieskarieties sensoram"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Pieskarieties pirksta nospieduma ikonai un turiet to"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Tas atrodas tālruņa aizmugurē. Izmantojiet rādītājpirkstu."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Tas ir redzams ekrānā. Meklējiet pirksta nospiedumu ar starojošu apli."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Pirkstu nospiedumu sensors atrodas uz ekrāna. Lai to atrastu, pārvietojiet pirkstu pa ekrānu."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Attēls ar ierīci un pirkstu nospiedumu sensora atrašanās vietu uz tās"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nosaukums"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Labi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Dzēst"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Pieskarieties sensoram"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Novietojiet pirkstu uz sensora un paceliet to pēc tam, kad sajūtat vibrāciju"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Pieskarieties vēlreiz"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Atkārtoti uzlieciet pirkstu, lai pievienotu dažādas pirksta nospieduma daļas."</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Pirksta nospiedums pievienots"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Kad tiek rādīta šī ikona, izmantojiet pirksta nospiedumu identifikācijai vai pirkuma autorizēšanai."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Vēlāk"</string>
@@ -1196,14 +1210,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Meklēt"</string>
     <string name="display_settings" msgid="7197750639709493852">"Attēls"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automātiska ekrāna pagriešana"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Izslēgt"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Ieslēgt"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Ieslēgt (ar sejas noteikšanu)"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Iespējot sejas noteikšanu"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Krāsas"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Dabiska"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Paspilgtināta"</string>
@@ -1248,7 +1258,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ieslēgts/ekrāns netiks izslēgts, ja uz to skatīsieties"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Izslēgts"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Nepieciešama piekļuve kamerai"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Pieskarieties, lai pārvaldītu atļaujas ierīces personalizēšanas pakalpojumiem."</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Ekrāns netiek izslēgts, ja uz to skatāties."</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Atpazīšanai ekrānā tiek izmantota priekšējā kamera, lai noteiktu, vai kāds skatās uz ekrānu. Šī funkcija darbojas ierīcē, un attēli netiek ne saglabāti, ne nosūtīti uzņēmumam Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Atpazīšanas ekrānā ieslēgšana"</string>
@@ -1329,7 +1342,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kad ekrāns ir tumšs, tas tiek ieslēgts, saņemot jaunus paziņojumus"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Vienmēr rādīt laiku un inform."</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Palielināts akumulatora lietojums"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Teksts treknrakstā"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Teksts treknrakstā"</string>
     <string name="title_font_size" msgid="570613010306330622">"Fonta lielums"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Palielināt vai samazināt tekstu"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM kartes bloķēšanas iestatījumi"</string>
@@ -1499,6 +1512,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Citi lietotāji"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Ierīces atmiņa"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Pārnēsājama krātuve"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Signāli un atgādinājumi"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Atļaut iestatīt signālus vai atgādinājumus"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Signāli un atgādinājumi"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Atļaujiet šai lietotnei ieplānot signālus vai citus uz laiku balstītus notikumus. Tādējādi lietotne tiks aktivizēta un darbosies, pat ja neizmantosiet ierīci. Ņemiet vērā, ka, atsaucot šo atļauju, var tikt traucēta lietotnes darbība un vairs nedarbosies lietotnes ieplānotie signāli."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"ieplānot, signāls, atgādinājums, notikums"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Izmantots: <xliff:g id="USED">%1$s</xliff:g> no <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"izmantots no <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1748,31 +1766,32 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Atrašanās vietu pakalpojumi"</string>
     <string name="location_title" msgid="5819154746934945021">"Mana atrašanās vieta"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Darba profila atrašanās vieta"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Lietotnes piekļ. atraš. vietai"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Atrašanās vieta ir izslēgta"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="zero"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> lietotnēm no <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ir piekļuve atrašanās vietai</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> lietotnei no <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ir piekļuve atrašanās vietai</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> lietotnēm no <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ir piekļuve atrašanās vietai</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Nesena piekļuve atrašanās vietai"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Skatīt detalizētu informāciju"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Pēdējā laikā nevienā lietotnē nav pieprasīta atrašanās vietas informācija."</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Neviena lietotne pēdējā laikā nav piekļuvusi atrašanās vietas informācijai"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Augsts akumulatora patēriņš"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Zems akumulatora patēriņš"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi un Bluetooth meklēšana"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi meklēšana"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Ļauj lietotnēm un pakalpojumiem meklēt Wi-Fi tīklus vienmēr, pat ja Wi-Fi ir izslēgts. Šo iestatījumu var izmantot, piemēram, lai uzlabotu atrašanās vietas funkcijas un pakalpojumus."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth meklēšana"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Ļauj lietotnēm un pakalpojumiem meklēt tuvumā esošas ierīces vienmēr, pat ja Bluetooth ir izslēgts. Šo iestatījumu var izmantot, piemēram, lai uzlabotu atrašanās vietas funkcijas un pakalpojumus."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Atrašanās vietu pakalpojumi"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Atrašanās vietu pakalpojumi darbam"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Atrašanās vietas laika joslas noteikšana"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Atrašanās vietas laika joslas noteikšana"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Var tikt izmantota ierīces atrašanās vieta, lai noteiktu pašreizējo laika joslu. Laika joslas noteikšanas precizitāti var ietekmēt citi atrašanās vietas iestatījumi, piemēram, Wi‑Fi meklēšana."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Ieslēgta"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Izslēgta"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automātiska laika joslas noteikšana ir atspējota."</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automātiskā laika josla ir izslēgta."</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Atrašanās vietas laika joslas noteikšana ir atspējota."</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Atrašanās vietas laika joslas noteikšana netiek atbalstīta."</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Atrašanās vietas laika joslas noteikšanas izmaiņas nav atļautas."</string>
@@ -1953,10 +1972,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Iespējot"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Notīrīt krātuvi"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Atinstalēt atjauninājumus"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Jūs esat norādījis, ka, veicot noteiktas darbības, pēc noklusējuma ir jāpalaiž šī lietotne."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Dažas no jūsu atlasītajām darbībām pēc noklusējuma tiks veiktas šajā lietotnē."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Jūs esat izvēlējies šai lietotnei ļaut veidot logrīkus un piekļūt to datiem."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Nav iestatīti noklusējumi."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Notīrīt noklusējumus"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Notīrīt noklusējuma preferences"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Iespējams, ka šī lietotne nav paredzēta jūsu ierīces ekrānam. Šeit varat norādīt, kā lietotne jārāda jūsu ekrānā."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Jautāt palaišanas laikā"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Mērogot lietotni"</string>
@@ -2168,7 +2187,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Varat pielāgot šo ierīci savām vajadzībām. Šīs pieejamības funkcijas var mainīt vēlāk sadaļā Iestatījumi."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Mainīt fonta lielumu"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekrāna lasītāji"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio un ekrānā redzamais teksts"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtitri"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Vispārīgi"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Attēlojums"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Teksts un attēlojums"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekrāna aptumšošana"</string>
@@ -2322,7 +2343,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Sarkana/zaļa krāsa"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Sarkana/zaļa krāsa"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Zila/dzeltena krāsa"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Spilgtuma samazināšana"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Spilgtuma samazināšana"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Padariet ekrānu tumšāku par tālruņa minimālo spilgtumu."</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Padariet ekrānu tumšāku par planšetdatora minimālo spilgtumu."</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Padariet savu ekrānu tumšāku ērtākai lasīšanai.&lt;br/&gt;&lt;br/&gt; Tas var būt noderīgi tālāk minētajos gadījumos. &lt;ol&gt; &lt;li&gt; Jūsu tālruņa noklusējuma minimālais spilgtums joprojām ir pārāk gaišs.&lt;/li&gt; &lt;li&gt; Jūs izmantojat tālruni vāja apgaismojuma apstākļos, piemēram, naktī vai tumšā telpā pirms gulētiešanas.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3378,8 +3399,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"seja"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"pirksta nospiedums, pievienot pirksta nospiedumu"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"aptumšots ekrāns, skārienekrāns, akumulators, viedais spilgtums, dinamiskais spilgtums, automātisks spilgtums"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"ekrāna aptumšošana, miega režīms, akumulators, noildze, uzmanība, displejs, ekrāns, bezdarbība"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"pagriezt, apvērst, pagriešana, portrets, ainava, virziens, vertikāls, horizontāls"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"jaunināt, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, grafiks, paziņojumi, bloķēt, klusums, vibrēt, miega režīms, darbs, izcelt, skaņa, izslēgt skaņu, diena, nedēļas diena, nedēļas nogale, vakars, notikums"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ekrāns, bloķēšanas laiks, noildze, bloķēšanas ekrāns"</string>
@@ -3548,9 +3571,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Zvana signāli"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Citas skaņas un vibrācija"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Paziņojumi"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Saruna"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nesen nosūtīti"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Skatīt visas pēdējo 7 dienu laikā instalētās"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Papildu"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Vispārīgi"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Darba paziņojumi"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Adaptīvie paziņojumi"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Adaptīvo paziņojumu prioritāte"</string>
@@ -3612,7 +3636,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Rādīt nolaižamajā panelī, statusa joslā un bloķēšanas ekrānā"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Paslēpt klusos paziņojumus statusa joslā"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Mirgojošs gaismas signāls"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Paziņojumi bloķēšanas ekrānā"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Konfidencialitāte"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Izlaist bloķēšanas ekrānu"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Kad veikta autorizācija pēc sejas, atvērt iepriekšējo ekrānu"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Bloķēšanas ekrāns, izlaist, apiet"</string>
@@ -3704,7 +3728,8 @@
       <item quantity="other">Ap <xliff:g id="NUMBER_1">%d</xliff:g> paziņojumiem nedēļā</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nekad"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Piekļuve paziņojumiem"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Ierīču un lietotņu paziņojumi"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Nosakiet, kurus paziņojumus drīkst rādīt jūsu lietotnēs un ierīcēs"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Piekļuve darba profila paziņojumiem ir bloķēta"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Lietotnēs nevar lasīt paziņojumus."</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3724,17 +3749,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Izslēgt"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Atcelt"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Atļauto paziņojumi veidi"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Svarīgi aktīvie paziņojumi"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Paziņojumi par sarunām"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Paziņojumi ar skaņu vai vibrāciju"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Klusie paziņojumi"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Reāllaika paziņojumi"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Reāllaika paziņojumi par pašlaik izmantotajām lietotnēm, navigāciju, tālruņa zvaniem u.tml."</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Sarunas"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"Īsziņas un cita saziņa"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Noklusējums"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Saņemot šos paziņojumus, atkarībā no iestatījumiem var tikt atskaņots signāls vai izmantota vibrācija"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Klusums"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Saņemot šos paziņojumus, nekad netiek atskaņoti signāli un izmantota vibrācija"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Skatīt visas lietotnes"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Varat mainīt paziņojumu iestatījumus katrai lietotnei, kura drīkst sūtīt paziņojumus"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Ierīcē parādītās lietotnes"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR palīga pakalpojumi"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nevienai instalētajai lietotnei nav pieprasīta palaišana kā VR palīga pakalpojumam."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vai atļaut VR pakalpojumam piekļūt pakalpojumam <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4028,9 +4053,33 @@
     <string name="launch_by_default" msgid="892824422067985734">"Atvērt pēc noklusējuma"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Palaišanas saites"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Atbalstīto saišu atvēršana"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Atbalstītās saites tiek atvērtas šajā lietotnē"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Saites, ko atvērt šajā lietotnē"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Atvērt bez vaicāšanas"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Atbalstītās saites"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Citi noklusējuma iestatījumi"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Citas noklusējuma preferences"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Pievienot saiti"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Lietotne var verificēt saites, ko drīkstēs automātiski atvērt attiecīgajā lietotnē. "<annotation id="url">"Uzzināt vairāk"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="zero"><xliff:g id="COUNT_1">%d</xliff:g> verificētu saišu</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> verificēta saite</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> verificētas saites</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="zero">Šīs saites ir verificētas un automātiski tiek atvērtas šajā lietotnē.</item>
+      <item quantity="one">Šīs saites ir verificētas un automātiski tiek atvērtas šajā lietotnē.</item>
+      <item quantity="other">Šīs saites ir verificētas un automātiski tiek atvērtas šajā lietotnē.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Labi"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Tiek pārbaudīts, vai ir citas atbalstītas saites…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Atcelt"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="zero"><xliff:g id="COUNT_1">%d</xliff:g> atbalstītu saišu</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> atbalstīta saite</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> atbalstītas saites</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Pievienot"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Tiek atvērta lietotnē <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"Izmantots: <xliff:g id="SIZE">%1$s</xliff:g> no <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"iekšējā atmiņa"</string>
     <string name="storage_type_external" msgid="125078274000280821">"ārējā atmiņa"</string>
@@ -4335,7 +4384,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Nav atļauts izmantot kameru"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Nav atļauts veikt ekrānuzņēmumus"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Nevar atvērt šo lietotni"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Ja jums radās jautājumi, sazinieties ar savu IT administratoru."</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Plašāka informācija"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Administrators var pārraudzīt un pārvaldīt ar jūsu darba profilu saistītās lietotnes un datus, tostarp iestatījumus, atļaujas, korporatīvo piekļuvi, darbības tīklā un informāciju par ierīces atrašanās vietu."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Administrators var pārraudzīt un pārvaldīt ar šo lietotāju saistītās lietotnes un datus, tostarp iestatījumus, atļaujas, korporatīvo piekļuvi, darbības tīklā un informāciju par ierīces atrašanās vietu."</string>
@@ -4415,7 +4465,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ierobežojumi</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Mobilo sakaru operatora datu uzskaite var atšķirties no datu uzskaites ierīcē"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Neietver datu lietojumu, ko nodrošina mobilo sakaru operatoru tīkli."</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Neietver datu lietojumu mobilo sakaru operatoru tīklos."</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> izmantoti"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Ieslēgt brīdinājumu par datiem"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datu brīdinājums"</string>
@@ -4765,7 +4815,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(atinstalēts lietotājam <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(atspējots lietotājam <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Automātiskā aizpilde"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automātiskā aizpilde"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Paroles"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automātiskā aizpilde, automātiski aizpildīt, parole"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Pārliecinieties, ka šī lietotne ir uzticama&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google automātiskā aizpilde&gt;%1$s&lt;/xliff:g&gt; izmanto ekrānā redzamo, lai noteiktu, kādu informāciju aizpildīt automātiski."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Automātiskā aizpilde"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Pieteikšanās līmenis"</string>
@@ -4973,7 +5024,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Mainiet tīkla darbības režīmu"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Ieteicamais tīkla veids"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Mobilo sakaru operators"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Iestatījumu versija"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Mobilo sakaru operatora iestatījumu versija"</string>
     <string name="call_category" msgid="641461844504128789">"Zvanīšana"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Mobilo sakaru operatora videozvani"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sistēmas atlasīšana"</string>
@@ -5022,6 +5073,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Izņemiet un atkal ievietojiet SIM karti. Ja problēma nav novērsta, restartējiet savu ierīci."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Mēģiniet atkal ieslēgt SIM karti. Ja problēma nav novērsta, restartējiet savu ierīci."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Tīkla aktivizācija"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Mobilo sakaru operatora pārslēgšana"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ir aktīvs"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Pieskarieties, lai atjauninātu SIM kartes iestatījumus."</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Pārslēgts uz: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5184,8 +5236,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Izslēgta"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internets"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM kartes"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Rādīt lidojuma režīmā pieejamos tīklus"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Atrodiet tīklus un izveidojiet savienojumu ar tiem lidojuma režīmā."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Atrast Wi-Fi tīklus un veidot savienojumus ar tiem"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lidojuma režīms, var izmantot lidojuma režīmu"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Zvani un īsziņas"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi zvani"</string>
@@ -5199,22 +5250,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nav pieejami"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Īslaicīgi nav pieejams"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nav SIM kartes"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Tīkla preferences"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Izveidot savienojumu ar publiskiem tīkliem"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"tīkla savienojums, internets, bezvadu, dati, Wi-Fi, mobilais tīkls, mobilie sakari, mobilo sakaru operators, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Skatīt lidojuma režīmā pieejamos tīklus"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Tiek skatīti lidojuma režīmā pieejamie tīkli"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Ieslēgt tīklus"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Izslēgt tīklus"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Vai atiestatīt internetu?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Tiks pārtraukts jūsu tālruņa zvans."</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Tiks pārtraukts jūsu tālruņa zvans."</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Notiek interneta atiestatīšana…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Novērst problēmu ar savienojamību"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Lidojuma režīmā pieejamie tīkli"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Lai pārslēgtu tīklus, atvienojiet tīkla Ethernet vadu."</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Nevar mainīt tīklu, kamēr savienojums ir aktīvs"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Lidojuma režīmā pieejamie tīkli"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ir izveidots savienojums"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Interneta savienojums netiks izveidots automātiski"</string>
@@ -5235,6 +5285,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Krāsa"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Citi"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Vispārīgi"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Skatīt visas lietotnes"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Viedā pāradresācija"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Viedā pāradresācija ir iespējota"</string>
@@ -5248,4 +5302,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Ievadiet tālruņa numuru"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Nav norādīts tālruņa numurs."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Labi"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G atļaušana"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Izmantojiet 2G mobilo datu savienojumus. Ārkārtas izsaukumiem 2G vienmēr ir ieslēgts."</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index d6cd8d8..a2782b1 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Намалете го или зголемете го текстот на екранот."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Намали"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Зголеми"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Користи автоматско ротирање"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Примерок на текст"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Чудесниот волшебник од Оз"</string>
@@ -405,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> поставени отпечатоци</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Отклучи со отпечаток"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Поставете го вашиот отпечаток"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Користење на отпечатокот"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Само допрете го сензорот за отпечаток за отклучување на телефонот, за одобрување купувања или за најавување на апликациите. Внимавајте чии отпечатоци ги додавате. Само еден додаден отпечаток може да ги прави сите тие работи."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Отпечатокот може да биде помалку безбеден од силна шема или PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Контролата е во ваши раце"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Имајте предвид"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Податоците снимени со отпечаток се складираат на безбедно и никогаш не го напуштаат вашиот телефон. Податоците може да ги избришете во секое време во „Поставки“."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Отпечатокот може да биде помалку безбеден од силна шема или PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Телефонот понекогаш ќе ги користи вашите неодамнешни слики од отпечатокот за да создаде подобрени модели на отпечатокот."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Користете го отпечатокот за да го отклучувате телефонот или да ги одобрувате купувањата.\n\nЗабелешка: не може да го користите отпечатокот за да го отклучувате уредов. За повеќе информации, контактирајте со администраторот на вашата организација."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Користете го отпечатокот за да го отклучувате телефонот или да ги одобрувате купувањата.\n\nЗабелешка: отпечатокот може да биде помалку безбеден од силна шема или PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Откажи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Не, фала"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Прескокни"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Продолжи"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Се согласувам"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Прескокни"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Следно"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Да се прескокне отпечаток?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Прескокни"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Откажи"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Допрете го сензорот"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Допрете и задржете ја иконата за отпечаток"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Се наоѓа на задната страна на телефонот. Користете го показалецот."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"На екранот е. Побарајте го отпечатокот со светлечки круг."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Сензорот за отпечатоци се наоѓа на вашиот екран. Движете го прстот низ екранот за да го најдете."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Илустрација со локација на уредот и сензорот за отпечаток"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Име"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Во ред"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Избриши"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Допрете го сензорот"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Ставете го прстот на сензорот и подигнете го откако ќе почувствувате вибрации"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Подигнете и допрете повторно"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Подигнувајте го прстот за да ги додадете различните делови од отпечатокот"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Отпечатокот е додаден"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Кога ќе ја видите иконава, користете го отпечатокот за идентификација или да ги одобрите купувањата"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Направи подоцна"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Пребарај"</string>
     <string name="display_settings" msgid="7197750639709493852">"Приказ"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Автоматско ротирање на екранот"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Исклучено"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Вклучено"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Вклучено - според лице"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Овозможи откривање лица"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Бои"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Природно"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Нагласено"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Вклучено/Екранот нема да се исклучи додека гледате во него"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Исклучено"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Потребен е пристап до камерата"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Допрете за да управувате со дозволите за „Услугите за персонализација на уредот“"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Спречува екранот да се исклучи додека гледате во него"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"„Вклучен екран“ ја користи предната камера за да види дали некој гледа во екранот. Функционира на самиот уред, а сликите никогаш не се складираат или испраќаат до Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Вклучете ја „Вклучен екран“"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Кога екранот е темен, се вклучува за нови известувања"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Секогаш прикажи време и инфо."</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Зголемено користење на батеријата"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Текст во болд"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Текст во болд"</string>
     <string name="title_font_size" msgid="570613010306330622">"Големина на фонт"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Намалете го или зголемете го текстот"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Поставки на заклучување на SIM картичка"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Други корисници"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Капацитет на уредот"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Пренослива меморија"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Аларми и потсетници"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Дозволете поставување аларми или потсетници"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Аларми и потсетници"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Дозволете ѝ на апликацијава да закажува аларми и други временски базирани настани. Ова ќе ѝ дозволи на апликацијата да се разбуди и да се извршува дури и кога не го користите уредот. Имајте предвид дека повлекувањето на дозволава може да предизвика неправилно работење на апликацијата, односно алармите што апликацијата ги закажала веќе нема да функционираат."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"закажување, аларм, потсетник, наастан"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> искористено од <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Искористено од <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Услуги за локација"</string>
     <string name="location_title" msgid="5819154746934945021">"Моја локација"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Локација за работен профил"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Апликациски пристап до локација"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Локацијата е исклучена"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> од <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> апликации има пристап до локацијата</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> од <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> апликации имаат пристап до локацијата</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Неодамнешен пристап до локацијата"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Прикажи ги деталите"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Нема апликации што неодамна побарале локација"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ниедна апликација нема пристапено до локацијата неодамна"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Голема искористеност на бат."</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Мала искористеност на бат."</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Скенирање Wi‑Fi и Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Скенирање на Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Дозволете апликациите и услугите да скенираат Wi-Fi мрежи во секое време, дури и кога Wi-Fi е исклучено. Ова може да се користи, на пример, за да се подобрат функциите и услугите базирани на локација."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Скенирање на Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дозволете апликациите и услугите да скенираат уреди во близина во секое време, дури и кога Bluetooth е исклучен. Ова може да се користи, на пример, за да се подобрат функциите и услугите базирани на локација."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Услуги според локација"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Услуги според локација за работа"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Откривање временска зона на локација"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Откривање временска зона на локација"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Овозможува да се користи локацијата на уредот за откривање на тековната временска зона. Другите поставки за локација како скенирање за Wi‑Fi може да влијаат врз прецизноста на откривањето на временската зона."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Вклучено"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Исклучено"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Автоматското откривање на временската зона е оневозможено"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Автоматската временска зона е исклучена"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Откривање временска зона на локација е оневозможено"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Откривањето временска зона на локација не е поддржано"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Промените на откривањето временска зона на локација не се дозволени"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Овозможи"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Избриши ја меморијата"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Деинсталирај ажурирања"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Избравте оваа апликација да се стартува стандардно за некои дејства."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Некои од активностите што ги избравте стандардно се отвораат во апликацијава."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Сте одбрале да ѝ дозволите за апликацијата да создава виџети и да пристапува кон нивните податоци."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Нема поставени стандардни вредности."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Избриши стандардни вредности"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Избришете ги стандардните поставки"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Оваа апликација може да не е дизајнирана за вашиот екран. Може да контролирате како се прилагодува на вашиот екран тука."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Прашај при стартување"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Скалирај апликација"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Уредот може да го приспособите да одговара на вашите потреби. Овие функции за пристапност може да ги смените подоцна во Поставки."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Променете ја големината на фонтот"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Читачи на екран"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио и текст на екранот"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Титлови"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аудио"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Општи"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Приказ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Текст и екран"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Затемнете го екранот"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Црвена и зелена"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Црвена и зелена"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Сина и жолта"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Намали ја осветленоста"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Намалување на осветленоста"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Затемнете го екранот повеќе од неговата минимална осветленост"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Затемнете го таблетот повеќе од неговата минимална осветленост"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Затемнете го екранот за да ви биде читањето поудобно.&lt;br/&gt;&lt;br/&gt; Ова може да биде корисно кога: &lt;ol&gt; &lt;li&gt; минималната осветленост на телефонот е сепак пресветла&lt;/li&gt; &lt;li&gt; го користите телефонот во темни ситуации, како на пример, навечер или во темна соба пред легнување&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"лице"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"отпечаток, додај отпечаток"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"затемнет екран, екран на допир, батерија, паметна осветленост, динамична осветленост, автоматска осветленост"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"затемнет екран, режим во мирување, батерија, истек на време, внимание, приказ, екран, неактивност"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"ротирај, преврти, ротација, портрет, пејзаж, ориентација, вертикална, хоризонтална"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"надгради, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, распоред, известувања, блокирај, стиши, вибрации, во мирување, работа, фокус, звук, изклучен звук, ден, работен ден, викенд, ноќ од викенд, настан"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"екран, време на заклучување, исклучување екран, заклучен екран"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Мелодии"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Други звуци и вибрации"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Известувања"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Разговор"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Неодамна испратени"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Преглед на сите од минатите 7 дена"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Напредни"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Општи"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Известувања за работен профил"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Приспособливи известувања"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Приоритет на приспособливи известувања"</string>
@@ -3566,9 +3590,9 @@
     <string name="gentle_notifications_display_summary_shade_lock" msgid="3936088046873705625">"Прикажи во списокот со известувања и на заклучен екран"</string>
     <string name="gentle_notifications_display_summary_shade_status" msgid="3363137853729359907">"Прикажи во списокот со известувања и на статусната лента"</string>
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Прикажи во списокот со известувања, на статусната лента и на заклучен екран"</string>
-    <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Сокриј тивки известувања во статусната лента"</string>
+    <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Сокриј бесчујни известувања во статусната лента"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Трепкај со сијаличката"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Известувања на заклучен екран"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Приватност"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Прескокнување заклучен екран"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Кога ќе се отклучи со лик, оди на последниот користен екран"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Заклучен екран, прескокни, заобиколи"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="other">околу <xliff:g id="NUMBER_1">%d</xliff:g> известувања неделно</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Никогаш"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Пристап до известувања"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Известувања во уреди и апликации"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Контролирајте кои известувања се појавуваат во апликациите и уредите"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Пристапот до известувањата на работниот профил е блокиран"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Апликациите не можат да читаат известувања"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Исклучи"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Откажи"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Дозволени типови известувања"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Важни тековни известувања"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Известувања за разговор"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Известувања за предупредување"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Тивки известувања"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Реално време"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Комуникација во реално време од апликациите што се користат, навигацијата, телефонските повици и друго"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Разговори"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS и други начини на комуникација"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Стандардни"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Известувања што може да ѕвонат или вибрират во зависност од поставките"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Тивки"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Известувања што никогаш не пуштаа звук ниту вибрираат"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Видете ги сите апликации"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Изменете ги поставките за известувања за секоја апликација што може да испраќа известувања"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Апликации прикажани на уредот"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR помошни услуги"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ниедна инсталирана апликација не побара да се извршува како VR помошните услуги."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Дозволете пристап до VR услугата за <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Отвори стандардно"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"За отворање линкови"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Отворај поддржани линкови"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Поддржаните линкови се отвораат во апликацијава"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Линкови за отворање во апликацијава"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Отвори без прашање"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Поддржани линкови"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Останати стандарди"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Други стандардни поставки"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Додајте линк"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Апликацијата може да потврдува линкови за нивно автоматско отворање. "<annotation id="url">"Дознајте повеќе"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> потврден линк</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> потврдени линка</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Линковиве се потврдени и автоматски се отвараат во апликацијава.</item>
+      <item quantity="other">Линковиве се потврдени и автоматски се отвараат во апликацијава.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Во ред"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Се проверува за други поддржани линкови…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Откажи"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> поддржан линк</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> поддржани линка</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Додај"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Се отвора во <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> употребени во <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"внатрешна меморија"</string>
     <string name="storage_type_external" msgid="125078274000280821">"надворешна меморија"</string>
@@ -4242,8 +4288,8 @@
     <string name="screen_zoom_conversation_timestamp_4" msgid="2046797647382623313">"Вто 18:03"</string>
     <string name="disconnected" msgid="3469373726996129247">"Не е поврзано"</string>
     <string name="keyboard_disconnected" msgid="796053864561894531">"Не е поврзанa"</string>
-    <string name="data_usage_summary_format" msgid="6844301859713164522">"Искористени се <xliff:g id="AMOUNT">%1$s</xliff:g> од сообраќајот"</string>
-    <string name="data_usage_wifi_format" msgid="7644390582649568117">"<xliff:g id="AMOUNT">^1</xliff:g> искористени на Wi‑Fi"</string>
+    <string name="data_usage_summary_format" msgid="6844301859713164522">"Потрошено: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="data_usage_wifi_format" msgid="7644390582649568117">"<xliff:g id="AMOUNT">^1</xliff:g> потрошено преку Wi‑Fi"</string>
     <plurals name="notification_summary" formatted="false" msgid="7638388920823212470">
       <item quantity="one">Исклучено за <xliff:g id="COUNT">%d</xliff:g> апликација</item>
       <item quantity="other">Исклучено за <xliff:g id="COUNT">%d</xliff:g> апликации</item>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Камерата не е дозволена"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Слика од екранот не е дозволена"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Апликацијава не може да се отвори"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Ако имате прашања, контактирајте со IT-администраторот"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Повеќе детали"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Администраторот може да ги следи и да управува со апликациите и податоците поврзани со вашиот работен профил, заедно со поставките, дозволите, корпоративниот пристап, мрежната активност и информациите за локацијата на уредот."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Администраторот може да ги следи и да управува со апликациите и податоците поврзани со корисников, заедно со поставките, дозволите, корпоративниот пристап, мрежната активност и информациите за локацијата на уредот."</string>
@@ -4348,14 +4395,14 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ограничувања</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Пресметаниот сообраќај на операторот може да се разликува од пресметаниот сообраќај на вашиот уред"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Го исклучува сообраќајот што се користи во мрежите на операторот"</string>
-    <string name="data_used_template" msgid="8229342096562327646">"Потрошено <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Го исклучува сообраќајот што се користи во мрежите на операторот"</string>
+    <string name="data_used_template" msgid="8229342096562327646">"Потрошено: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Извести за потрошен интернет"</string>
     <string name="data_warning" msgid="2925054658166062884">"Предупредување за интернет"</string>
     <string name="data_warning_footnote" msgid="5991901765915710592">"Предупредувањето за потрошен сообраќај и ограничувањето на сообраќајот ги мери вашиот уред. Овие податоци може да се разликуваат од податоците на операторот."</string>
     <string name="set_data_limit" msgid="9010326815874642680">"Ограничување на интернет"</string>
     <string name="data_limit" msgid="8731731657513652363">"Ограничување за интернет"</string>
-    <string name="data_usage_template" msgid="3822452362629968010">"Потрошено <xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="3822452362629968010">"Потрошено: <xliff:g id="ID_1">%1$s</xliff:g> (<xliff:g id="ID_2">%2$s</xliff:g>)"</string>
     <string name="configure" msgid="1499586749829665889">"Конфигурирај"</string>
     <string name="data_usage_other_apps" msgid="5649047093607329537">"Други апликации вклучени во употребата"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="3316296488378947221">
@@ -4365,7 +4412,7 @@
     <string name="data_usage_title" msgid="4039024073687469094">"Примарни податоци"</string>
     <string name="data_usage_wifi_title" msgid="1060495519280456926">"Wi‑Fi-сообраќај"</string>
     <string name="data_used" msgid="7770571947591789895">"Потрошено: <xliff:g id="ID_1">^1</xliff:g>"</string>
-    <string name="data_used_formatted" msgid="7913920278059077938">"Искористени: <xliff:g id="ID_1">^1</xliff:g> <xliff:g id="ID_2">^2</xliff:g>"</string>
+    <string name="data_used_formatted" msgid="7913920278059077938">"Потрошено: <xliff:g id="ID_1">^1</xliff:g> <xliff:g id="ID_2">^2</xliff:g>"</string>
     <string name="data_overusage" msgid="3680477320458707259">"Надминат сообраќај: <xliff:g id="ID_1">^1</xliff:g>"</string>
     <string name="data_remaining" msgid="6316251496381922837">"Уште <xliff:g id="ID_1">^1</xliff:g>"</string>
     <string name="data_usage_chart_brief_content_description" msgid="5548074070258881530">"Графикон што го покажува потрошениот сообраќај помеѓу <xliff:g id="START_DATE">%1$s</xliff:g> и <xliff:g id="END_DATE">%2$s</xliff:g>."</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(деинсталирано за корисникот <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(оневозможено за корисникот <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Автоматско пополнување"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"автоматско, пополнување, автоматско пополнување"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Лозинки"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"автоматско, пополнување, автоматско пополнување, лозинка"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Проверете дали е ова апликација на која ѝ верувате&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=„Автоматско пополнување на Google“&gt;%1$s&lt;/xliff:g&gt; го користи она што е на екранот за да утврди што може автоматски да се пополни."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Автоматско пополнување"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Степен на евиденција"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Променете го режимот на работа на мрежата"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Претпочитан тип мрежа"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Оператор"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Верзија на „Поставки“"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Верзија на поставките од оператор"</string>
     <string name="call_category" msgid="641461844504128789">"Повикување"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Видеоповици преку оператор"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Избирање систем"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Извадете и повторно вметнете ја SIM-картичката. Ако и понатаму се соочувате со проблемот, рестартирајте го уредот."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Обидете се повторно да ја вклучите SIM-картичката. Ако и понатаму се соочувате со проблемот, рестартирајте го уредот."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Активирање на мрежата"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Префрлање оператор"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> е активен"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Допрете за да ги ажурирате поставките на SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Се префрливте на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Исклучен"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-картички"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Прикажи ги мрежите во авионски режим"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Најдете и поврзете се на мрежи во авионски режим."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Најдете и поврзете се со Wi‑Fi мрежи"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"авион, безбедно за во авион"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Повици &amp; SMS-пораки"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Повици преку Wi-Fi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"недостапно"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Привремено недостапен"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Нема SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Поставки"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Поставки за мрежа"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Поврзувајте се на јавни мрежи"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"мрежна врска, интернет, безжичен, мобилен, Wi-Fi, мобилна, мобилен оператор, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Прикажи ги мрежите во авионски режим"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Се прикажуваат мрежите во авионски режим"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Вклучете ги мрежите"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Исклучете ги мрежите"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Да се ресетира интернетот?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Ова ќе го заврши телефонскиот повик"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Ова ќе го заврши телефонскиот повик"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Се ресетира интернетот…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Поправи ја поврзливоста"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Достапни се мрежи во авионски режим"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"За промена на мрежата, прекинете ја врската со етернетот"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Не може да се промени мрежата додека е поврзано"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Мрежи за користење во авионски режим"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Поврзано"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Не може автоматски да се поврзе на интернет"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Боја"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Други"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Општо"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Покажи ги сите апликации"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Паметно проследување"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Паметното проследување е овозможено"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Внесете телефонски број"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Телефонскиот број недостасува."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Во ред"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Дозволете 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Користете 2G-мобилни врски. За итни повици, 2G е секогаш вклучена."</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 7f05490..5267ca0 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"സ്ക്രീനിലെ ടെക്സ്റ്റ് ചെറുതോ വലുതോ ആക്കുക."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"ചെറുതാക്കുക"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"വലുതാക്കുക"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"സ്വയമേ തിരിയൽ ഉപയോഗിക്കുക"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"സാമ്പിൾ ടെക്‌സ്റ്റ്"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"ഓസ് നഗരത്തിലെ അതിശയിപ്പിക്കുന്ന മന്ത്രവാദി"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ഫിംഗർപ്രിന്റ് സജ്ജമാക്കൽ</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"ഫിംഗർപ്രിന്റ് ഉപയോഗിച്ച് അൺലോക്ക് ചെയ്യുക"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"ഫിംഗർപ്രിന്റ് സജ്ജീകരിക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"നിങ്ങളുടെ ഫോൺ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ ഫിംഗർപ്രിന്റ് സെൻസറിൽ സ്പർശിച്ചാൽ മാത്രം മതി. ആരുടെയൊക്കെ ഫിംഗർപ്രിന്റുകൾ ചേർക്കുന്നു എന്ന കാര്യത്തിൽ നിങ്ങൾ ജാഗ്രത പുലർത്തുക. ചേർത്തിട്ടുള്ള ഒരു ഫിംഗർപ്രിന്റിന് പോലും ഈ കാര്യങ്ങളൊക്കെ ചെയ്യാനാകും."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"ശക്തമായ പാറ്റേൺ, പിൻ എന്നിവയേക്കാൾ കുറവായിരിക്കാം നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിച്ചുള്ള സുരക്ഷ."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"നിയന്ത്രണം നിങ്ങൾക്കാണ്"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"ശ്രദ്ധിക്കുക"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"ഫിംഗർപ്രിന്റ് റെക്കോർഡ് ചെയ്യുന്ന ഡാറ്റ സുരക്ഷിതമായി സംഭരിക്കുന്നു, ഒരിക്കലും നിങ്ങളുടെ ഫോണിൽ നിന്ന് പുറത്ത് പോകുകയുമില്ല. ക്രമീകരണത്തിൽ ഏതുസമയത്തും നിങ്ങളുടെ ഡാറ്റ ഇല്ലാതാക്കാനാകും."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"നിങ്ങളുടെ ഫിംഗർപ്രിന്റ്, ശക്തമായ പാറ്റേണിറ്റെയോ പിൻ നമ്പറിന്റെയോ അത്ര സുരക്ഷിതമായിരിക്കണമെന്നില്ല."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"മെച്ചപ്പെട്ട ഫിംഗർപ്രിന്റ് മോഡലുകൾ സൃഷ്‌ടിക്കാൻ അടുത്തിടെയുള്ള നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ചിത്രങ്ങൾ ഫോൺ ഇടയ്ക്കിടെ ഉപയോഗിക്കും."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യുന്നതിനോ വാങ്ങലിന് അംഗീകാരം നൽകാനോ നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കുക.\n\nശ്രദ്ധിക്കുക: ഈ ഉപകരണം അൺലോക്കുചെയ്യുന്നതിന് നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കാൻ കഴിയില്ല. കൂടുതൽ വിവരങ്ങൾക്ക്, നിങ്ങളുടെ സ്ഥാപനത്തിന്റെ അഡ്‌മിനെ ബന്ധപ്പെടുക."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"നിങ്ങളുടെ ഫോൺ അൺലോക്ക് ചെയ്യുന്നതിനോ വാങ്ങലിന് അംഗീകാരം നൽകാനോ നിങ്ങളുടെ ഫിംഗർപ്രിന്‍റ് ഉപയോഗിക്കുക.\n\nശ്രദ്ധിക്കുക: ശക്തമായ പാറ്റേൺ, പിൻ എന്നിവയേക്കാൾ ഫിംഗർപ്രിന്‍റിന് സുരക്ഷ കുറവായിരിക്കും."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"റദ്ദാക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"വേണ്ട"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"ഒഴിവാക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"തുടരൂ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"അംഗീകരിക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ഒഴിവാക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"അടുത്തത്"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"ഫിംഗർപ്രിന്‍റ് ഒഴിവാക്കണോ?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"ഒഴിവാക്കൂ"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"റദ്ദാക്കൂ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"സെൻസർ സ്പർശിക്കുക"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"ഫിംഗർപ്രിന്റ് ഐക്കണിൽ സ്‌പർശിച്ച് പിടിക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"ഫോണിന്റെ പിൻവശത്താണ് അതുള്ളത്. ചൂണ്ടുവിരൽ ഉപയോഗിക്കുക."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"അത് സ്ക്രീനിലുണ്ട്. തിളങ്ങുന്ന വൃത്തത്തോട് കൂടിയ ഫിംഗർപ്രിന്റ് തിരയൂ."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"വിരലടയാള സെൻസർ നിങ്ങളുടെ സ്ക്രീനിലുണ്ട്. അത് കണ്ടെത്താൻ സ്ക്രീനിലുടനീളം നിങ്ങളുടെ വിരൽ നീക്കുക."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"ഉപകരണത്തിലെ ചിത്രീകരണവും ഫിംഗർപ്രിന്റ് സെൻസർ ലൊക്കേഷനും"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"പേര്"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ശരി"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"ഇല്ലാതാക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"സെൻസർ സ്പർശിക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"സെൻസറിൽ വിരൽ വച്ച് വൈബ്രേഷൻ അനുഭവപ്പെട്ട ശേഷം വിരൽ മാറ്റുക."</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"വിരലെടുക്കുക, വീണ്ടും സ്പർശിക്കുക"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"നിങ്ങളുടെ ഫിംഗർപ്രിന്റിന്റെ വ്യത്യസ്ത ഭാഗങ്ങൾ ചേർക്കുന്നതിന് നിങ്ങളുടെ വിരൽ ഉയർത്തിക്കൊണ്ടിരിക്കുക"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ഫിംഗർപ്രിന്റ് ചേർത്തു"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"നിങ്ങൾ ഈ ഐക്കൺ കാണുമ്പോൾ, തിരിച്ചറിയലിനോ വാങ്ങലിന് അംഗീകാരം നൽകാനോ നിങ്ങളുടെ ഫിംഗർപ്രിന്‍റ് ഉപയോഗിക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"ഇത് പിന്നീട് ചെയ്യുക"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Search"</string>
     <string name="display_settings" msgid="7197750639709493852">"ഡിസ്പ്ലേ"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"സ്‌ക്രീൻ സ്വയമേവ തിരിക്കുക"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"ഓഫാണ്"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"ഓണാണ്"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"ഓണാണ് - ഫേസ് ബേസ്‌ഡ്"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"മുഖം തിരിച്ചറിയൽ ഓണാക്കൂ"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"നിറങ്ങൾ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"സ്വാഭാവികം"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"ബൂസ്‌റ്റ് ചെയ്‌‌തത്"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ഓണാണ് / നിങ്ങൾ അതിൽ നോക്കുന്നുണ്ടെങ്കിൽ സ്ക്രീൻ ഓഫാക്കില്ല"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"ഓഫാണ്"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"ക്യാമറ ആക്‌സസ് ആവശ്യമാണ്"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"ഉപകരണ വ്യക്തിപരമാക്കൽ സേവനങ്ങൾക്കുള്ള അനുമതികൾ മാനേജ് ചെയ്യാൻ ടാപ്പ് ചെയ്യുക"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"നിങ്ങൾ അതിൽ നോക്കുന്നുണ്ടെങ്കിൽ സ്ക്രീൻ ഓഫാകുന്നതിൽ നിന്ന് തടയുന്നു"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"ആരെങ്കിലും സ്ക്രീനിൽ നോക്കുന്നുണ്ടോ എന്ന് കാണാൻ സ്‌ക്രീൻ ശ്രദ്ധ മുൻക്യാമറ ഉപയോഗിക്കുന്നു. ഇത് ഉപകരണത്തിലാണ് പ്രവർത്തിക്കുന്നത്, ചിത്രങ്ങൾ ഒരിക്കലും സംഭരിക്കുകയോ Google-ലേക്ക് അയയ്ക്കുകയോ ചെയ്യില്ല."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"സ്ക്രീൻ ശ്രദ്ധ ഓണാക്കുക"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"സ്ക്രീൻ ഓഫായിരിക്കുന്ന സമയത്ത്, പുതിയ അറിയിപ്പുകൾ വരുമ്പോൾ, ഇത് സ്ക്രീൻ ഓണാക്കുന്നു"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"സമയവും വിവരവും എപ്പോഴും കാണിക്കുക"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ഉയർന്ന ബാറ്ററി ഉപയോഗം"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"ബോൾഡ് ടെക്സ്റ്റ്"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"ബോൾഡ് ടെക്സ്റ്റ്"</string>
     <string name="title_font_size" msgid="570613010306330622">"ഫോണ്ട് വലുപ്പം"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ടെക്സ്റ്റ് ചെറുതോ വലുതോ ആക്കുക"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"സിം കാർഡ് ലോക്ക് ക്രമീകരണങ്ങൾ"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"മറ്റ് ഉപയോക്താക്കൾ"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ഉപകരണ സ്റ്റോറേജ്"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"പോർട്ടബിൾ സ്റ്റോറേജ്"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"അലാറങ്ങളും റിമെെൻഡറുകളും"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"അലാറങ്ങളോ റിമെെൻഡറുകളോ സജ്ജീകരിക്കാൻ അനുവദിക്കുക"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"അലാറങ്ങളും റിമെെൻഡറുകളും"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"അലാറങ്ങളോ സമയാധിഷ്‌ഠിതമായ മറ്റ് ഇവന്റുകളോ ഷെഡ്യൂൾ ചെയ്യാൻ ഈ ആപ്പിനെ അനുവദിക്കുക. നിങ്ങൾ ഉപകരണം ഉപയോഗിക്കാതിരിക്കുന്ന സമയത്തും ഉണരാനും റൺ ചെയ്യാനും ഇത് ആപ്പിനെ അനുവദിക്കും. ഈ അനുമതി പിൻവലിക്കുന്നത് ആപ്പിന്റെ പ്രവർത്തനത്തിൽ തകരാറ് സംഭവിക്കാൻ കാരണമായേക്കാമെന്നത് ശ്രദ്ധിക്കുക പ്രത്യേകിച്ച്, ആപ്പ് ഷെഡ്യൂൾ ചെയ്‌ത ഒരു അലാറവും തുടർന്ന് പ്രവർത്തിക്കില്ല."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"ഷെഡ്യൂൾ, അലാറം, റിമെെൻഡർ, ഇവന്റ്"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g>-യുടെ <xliff:g id="USED">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g>-ൽ ഉപയോഗിച്ചത്"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"ലൊക്കേഷൻ സേവനങ്ങൾ"</string>
     <string name="location_title" msgid="5819154746934945021">"എന്റെ ലൊക്കേഷൻ"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ഔദ്യോഗിക പ്രൊഫൈലിനായുള്ള ലൊക്കേഷൻ"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"ലൊക്കേഷനിലേക്കുള്ള ആപ്പിന്റെ ആക്സസ്"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ലൊക്കേഷൻ ഓഫാണ്"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> ആകെ <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ആപ്പുകളിൽ <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ആപ്പുകൾക്ക് ലൊക്കേഷനിലേക്ക് ആക്‌സ‌സ് ഉണ്ട്</item>
       <item quantity="one"> ആകെ <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> ആപ്പുകളിൽ <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> ആപ്പുകൾക്ക് ലൊക്കേഷനിലേക്ക് ആക്‌സ‌സ് ഉണ്ട്</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"സമീപകാലത്തെ ലൊക്കേഷൻ ആക്‌സസ്"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"വിശദാംശങ്ങൾ കാണുക"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"ആപ്പുകളൊന്നും അടുത്തിടെ ലൊക്കേഷൻ അഭ്യർത്ഥിച്ചിട്ടില്ല"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"സമീപകാലത്ത് ആപ്പുകളൊന്നും ലൊക്കേഷൻ ആക്‌സസ് ചെയ്‌തിട്ടില്ല"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ഉയർന്ന ബാറ്ററി ഉപയോഗം"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"കുറഞ്ഞ ബാറ്ററി ഉപയോഗം"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"വൈഫൈ സ്‌കാനിംഗും Bluetooth സ്‌കാനിംഗും"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"വൈഫൈ സ്‌കാനിംഗ്"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"വൈഫൈ ഓഫാണെങ്കിൽ പോലും ആപ്പുകളെയും സേവനങ്ങളെയും ഏത് സമയത്തും വൈഫൈ നെറ്റ്‌വർക്കുകൾ സ്‌കാൻ ചെയ്യാൻ അനുവദിക്കുക. ഉദാഹരണത്തിന്, ലൊക്കേഷൻ‌ അടിസ്ഥാനമാക്കിയുള്ള ഫീച്ചറുകളും സേവനങ്ങളും മെച്ചപ്പെടുത്താൻ ഇത് ഉപയോഗിക്കാം."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth സ്‌കാനിംഗ്"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth ഓഫ് ആണെങ്കിൽ പോലും ആപ്പുകളെയും സേവനങ്ങളെയും ഏത് സമയവും അടുത്തുള്ള ഉപകരണം സ്‌കാൻ ചെയ്യാൻ അനുവദിക്കുക. ഉദാഹരണത്തിന്, ലൊക്കേഷൻ‌ അടിസ്ഥാനമാക്കിയുള്ള ഫീച്ചറുകളും സേവനങ്ങളും മെച്ചപ്പെടുത്താൻ ഇത് ഉപയോഗിക്കാം."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"ലൊക്കേഷൻ സേവനങ്ങൾ"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ജോലിക്കുള്ള ലൊക്കേഷൻ സേവനങ്ങൾ"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ലൊക്കേഷൻ ഉപയോഗിച്ചുള്ള സമയമേഖല കണ്ടെത്തൽ"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ലൊക്കേഷൻ ഉപയോഗിച്ചുള്ള സമയമേഖല കണ്ടെത്തൽ"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"നിലവിലുള്ള സമയമേഖല കണ്ടെത്തുന്നതിന് ഉപകരണത്തിന്റെ ലൊക്കേഷൻ ഉപയോഗിക്കാൻ അനുവദിക്കുന്നു. വൈഫൈ സ്‌കാനിംഗ് പോലുള്ള മറ്റ് ലൊക്കേഷൻ ക്രമീകരണം സമയമേഖല കണ്ടെത്തലിന്റെ കൃത്യതയെ ബാധിക്കും."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ഓണാണ്"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ഓഫാണ്"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"സ്വയമേവയുള്ള സമയമേഖല കണ്ടെത്തൽ പ്രവർത്തനരഹിതമാക്കി"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"സ്വയമേവയുള്ള സമയമേഖല ഓഫാണ്"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ലൊക്കേഷൻ ഉപയോഗിച്ചുള്ള സമയമേഖല കണ്ടെത്തൽ പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ലൊക്കേഷൻ ഉപയോഗിച്ചുള്ള സമയമേഖല കണ്ടെത്തൽ പിന്തുണയ്ക്കുന്നില്ല"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ലൊക്കേഷൻ ഉപയോഗിച്ചുള്ള സമയമേഖല കണ്ടെത്തലിൽ മാറ്റങ്ങൾ അനുവദനീയമല്ല"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"സ്‌റ്റോറേജ് മായ്‌ക്കുക"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"അപ്ഡേറ്റുകൾ അൺഇൻസ്റ്റാളുചെയ്യുക"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"ചില പ്രവർത്തനങ്ങൾ സ്ഥിരമായതാക്കി ഈ അപ്ലിക്കേഷൻ സമാരംഭിക്കാൻ നിങ്ങൾ തിരഞ്ഞെടുത്തു."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"നിങ്ങൾ തിരഞ്ഞെടുത്ത ചില ആക്റ്റിവിറ്റികൾ ഡിഫോൾട്ടായി ഈ ആപ്പിൽ തുറക്കും."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"വിജറ്റുകൾ സൃഷ്‌ടിക്കാനും അവയുടെ ഡാറ്റ ആക്‌സസ്സുചെയ്യാനും ഈ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നത് നിങ്ങൾ തിരഞ്ഞെടുത്തു."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"ഡിഫോൾട്ടുകളൊന്നും സജ്ജീകരിച്ചിട്ടില്ല."</string>
-    <string name="clear_activities" msgid="341345438786077236">"സ്ഥിരമായവ മായ്ക്കുക"</string>
+    <string name="clear_activities" msgid="488089228657585700">"ഡിഫോൾട്ട് മുൻഗണനകൾ മായ്ക്കുക"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"ഈ അപ്ലിക്കേഷൻ നിങ്ങളുടെ സ്‌ക്രീനിനുവേണ്ടി രൂപകൽപ്പനചെ‌യ്തതായിരിക്കില്ല. നിങ്ങളുടെ സ്‌ക്രീനിൽ ഇത് ക്രമീകരിക്കുന്ന വിധം നിങ്ങൾക്കിവിടെ നിയന്ത്രിക്കാം."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"സമാരംഭിക്കുമ്പോൾ ആവശ്യപ്പെടുക"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"സ്‌കെയിൽ അപ്ലിക്കേഷൻ"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ആവശ്യങ്ങൾക്ക് അനുസരിച്ച് നിങ്ങൾക്ക് ഈ ഉപകരണം ഇഷ്ടാനുസൃതമാക്കാം. ഈ ഉപയോഗസഹായി ഫീച്ചറുകൾ പിന്നീട് ക്രമീകരണത്തിൽ മാറ്റാവുന്നതാണ്."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ഫോണ്ട് വലുപ്പം മാറ്റുക"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"സ്‌ക്രീൻ റീഡറുകൾ"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ഓഡിയോയും സ്‌ക്രീനിലെ ടെക്‌സ്‌റ്റും"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"അടിക്കുറിപ്പുകൾ"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ഓഡിയോ"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"പൊതുവായവ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ഡി‌സ്‌പ്ലേ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ടെക്‌സ്‌റ്റും ഡിസ്‌പ്ലേയും"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"സ്ക്രീൻ കൂടുതൽ ഇരുണ്ടതാക്കുക"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ചുവപ്പ്-പച്ച"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ചുവപ്പ്-പച്ച"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"നീല-മഞ്ഞ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"തെളിച്ചം കുറയ്ക്കുക"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"തെളിച്ചം കുറയ്ക്കുക"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"നിങ്ങളുടെ ഫോൺ സ്ക്രീനിനെ, അതിന്റെ ഏറ്റവും കുറഞ്ഞ തെളിച്ചത്തെക്കാൾ ഇരുണ്ടതാക്കുക"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് സ്ക്രീനിനെ, അതിന്റെ ഏറ്റവും കുറഞ്ഞ തെളിച്ചത്തേക്കാൾ ഇരുണ്ടതാക്കുക"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"വായനാസുഖത്തിന് നിങ്ങളുടെ സ്ക്രീൻ കൂടുതൽ ഇരുണ്ടതാക്കുക.&lt;br/&gt;&lt;br/&gt; ഇനിപ്പറയുന്ന സന്ദർഭങ്ങളിൽ ഇത് ഉപയോഗപ്രദമാകും: &lt;ol&gt; &lt;li&gt; നിങ്ങളുടെ ഫോണിന്റെ ഡിഫോൾട്ട് ആയ ഏറ്റവും കുറഞ്ഞ തെളിച്ചം പോലും കൂടുതലായിരിക്കുമ്പോൾ&lt;/li&gt; &lt;li&gt; ഉറങ്ങുന്നതിന് മുമ്പ്, രാത്രിയിലോ ഇരുട്ടുള്ള മുറിയിലോ പോലെ, ഇരുട്ടുള്ള സന്ദർഭങ്ങളിൽ നിങ്ങൾ ഫോൺ ഉപയോഗിക്കുമ്പോൾ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"മുഖം"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"ഫിംഗർപ്രിന്റ്, ഫിംഗർപ്രിന്റ് ചേർക്കുക"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"സ്‌ക്രീൻ മങ്ങിക്കൽ, ടച്ച്‌സ്‌ക്രീൻ, ബാറ്ററി, സ്‌മാർട്ട് തെളിച്ചം, ചലനാത്മക തെളിച്ചം, സ്വയമേവ ഉള്ള തെളിച്ചം"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"മങ്ങിയ സ്ക്രീൻ, സ്ലീപ്പ് മോഡ്, ബാറ്ററി, ടൈംഔട്ട്, സ്ക്രീൻ ശ്രദ്ധ, ഡിസ്‌പ്ലേ, സ്‌ക്രീൻ, നിഷ്ക്രിയത്വം"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"തിരിക്കുക, ഫ്ലിപ്പ്, തിരിക്കൽ, പോർ‌ട്രെയ്റ്റ്, ലാൻഡ്‌സ്കേപ്പ്, ഓറിയന്റേഷൻ, ലംബം, സമാന്തരം"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"അപ്‌ഗ്രേഡ്, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, ഷെഡ്യൂൾ, അറിയിപ്പുകൾ, തടയുക, നിശബ്‌ദത, വൈബ്രേറ്റ്, സ്ലീപ്പ്, ജോലി, ഫോക്കസ്, ശബ്‌ദം, മ്യൂട്ട്, ദിവസം, പ്രവർത്തി ദിവസം, വാരാന്ത്യം, പ്രവർത്തിദിന രാവ്, ഇവന്റ്"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"സ്‌ക്രീൻ, ലോക്ക് സമയം, ടൈംഔട്ട്, ലോക്ക്‌സ്ക്രീൻ"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"റിംഗ്‌ടോണുകൾ"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"മറ്റ് ശബ്ദങ്ങളും വൈബ്രേഷനുകളും"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"അറിയിപ്പുകൾ"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"സംഭാഷണം"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"അടുത്തിടെ അയച്ചവ"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"കഴിഞ്ഞ 7 ദിവസത്തെ എല്ലാം കാണുക"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"വിപുലമായത്"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"പൊതുവായവ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"ഔദ്യോഗിക അറിയിപ്പുകൾ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"അനുയോജ്യമായ അറിയിപ്പുകൾ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"അനുയോജ്യമായ അറിയിപ്പുകൾക്കുള്ള മു‌ൻഗണന"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"പുൾ ഡൗൺ ഷെയ്‌ഡിലും സ്‌റ്റാറ്റസ് ബാറിലും ലോക്ക് സ്ക്രീനിലും പ്രദർശിപ്പിക്കുക"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"നിശബ്‌ദ അറിയിപ്പുകൾ സ്‌റ്റാറ്റസ് ബാറിൽ മറയ്ക്കുക"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ലൈറ്റ് മിന്നുക"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"ലോക്ക്‌സ്ക്രീനിലെ അറിയിപ്പുകൾ"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"സ്വകാര്യത"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ലോക്ക് സ്‌ക്രീൻ ഒഴിവാക്കുക"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്കിന് ശേഷം അവസാനം ഉപയോഗിച്ച സ്‌ക്രീനിലേക്ക് നേരിട്ട് പോവുക"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ലോക്ക് സ്‌ക്രീൻ, ലോക്ക് സ്‌ക്രീൻ, ഒഴിവാക്കുക, മറികടക്കുക"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">പ്രതിവാരം ~<xliff:g id="NUMBER_0">%d</xliff:g> അറിയിപ്പ്</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"ഒരിക്കലും"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"അറിയിപ്പ് ആക്‌സസ്"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"ഉപകരണ, ആപ്പ് അറിയിപ്പുകൾ"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"നിങ്ങളുടെ ആപ്പുകളിലും ഉപകരണങ്ങളിലും ഏതൊക്കെ അറിയിപ്പുകൾ കാണിക്കണമെന്നത് നിയന്ത്രിക്കുക"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"ഔദ്യോഗിക പ്രൊഫൈൽ അറിയിപ്പുകളിലേക്കുള്ള ആക്‌സസ്സ് ബ്ലോക്കുചെയ്‌തു"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"അപ്ലിക്കേഷനുകൾക്ക് അറിയിപ്പുകൾ വായിക്കാനായില്ല"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"ഓഫാക്കുക"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"റദ്ദാക്കുക"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"അനുവദനീയമായ അറിയിപ്പ് തരങ്ങൾ"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"പ്രധാനപ്പെട്ട സജീവമായ അറിയിപ്പുകൾ"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"സംഭാഷണ അറിയിപ്പുകൾ"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"മുന്നറിയിപ്പ് നൽകുന്ന അറിയിപ്പുകൾ"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"നിശബ്‌ദ അറിയിപ്പുകൾ"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"തത്സമയം"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"ഉപയോഗത്തിലായിരിക്കുന്ന ആപ്പുകൾ, നാവിഗേഷൻ, ഫോൺ കോളുകൾ എന്നിവയിലും മറ്റും നിന്നുള്ള തത്സമയ ആശയവിനിമയങ്ങൾ"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"സംഭാഷണങ്ങൾ"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS-ഉം മറ്റ് ആശയവിനിമയങ്ങളും"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"ഡിഫോൾട്ട്"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"ക്രമീകരണം അടിസ്ഥാനമാക്കി അറിയിപ്പുകൾ റിംഗ് ചെയ്തേക്കാം അല്ലെങ്കിൽ വൈബ്രേറ്റ് ചെയ്തേക്കാം"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"നിശബ്‌ദം"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"ശബ്‌ദമോ വൈബ്രേഷനോ ഇല്ലാത്ത അറിയിപ്പുകൾ"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"എല്ലാ ആപ്പുകളും കാണുക"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"അറിയിപ്പുകൾ അയയ്ക്കുന്ന ഓരോ ആപ്പിന്റെയും അറിയിപ്പ് ക്രമീകരണം മാറ്റുക"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"ഉപകരണത്തിൽ കാണിക്കുന്ന ആപ്പുകൾ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR സഹായി സേവനങ്ങൾ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"VR സഹായി സേവനമായി റൺ ചെയ്യുന്നതിന് ഇൻസ്റ്റാൾ ചെയ്തിട്ടുള്ള ആപ്‌സൊന്നും അഭ്യർത്ഥിച്ചിട്ടില്ല."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> എന്ന സേവനത്തിന് VR സേവന ആക്‌സസ് അനുവദിക്കണോ?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"ഡിഫോൾട്ടായി തുറക്കുക"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"ലിങ്കുകൾ തുറക്കൽ"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"പിന്തുണയ്‌ക്കുന്ന ലിങ്കുകൾ തുറക്കുക"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"പിന്തുണയുള്ള ലിങ്കുകൾ ഈ ആപ്പിൽ തുറക്കും"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"ഈ ആപ്പിൽ തുറക്കാനുള്ള ലിങ്കുകൾ"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"ആവശ്യപ്പെടാതെ തുറക്കുക"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"പിന്തുണയ്‌ക്കുന്ന ലിങ്കുകൾ"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"മറ്റ് സ്ഥിരമായവ"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"മറ്റ് ഡിഫോൾട്ട് മുൻഗണനകൾ"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"ലിങ്ക് ചേർക്കുക"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"ആപ്പിൽ സ്വയമേവ തുറക്കാൻ ആപ്പിന് ലിങ്കുകൾ പരിശോധിച്ചുറപ്പിക്കാനാകും. "<annotation id="url">"കൂടുതലറിയുക"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other">പരിശോധിച്ചുറപ്പിച്ച <xliff:g id="COUNT_1">%d</xliff:g> ലിങ്കുകൾ</item>
+      <item quantity="one">പരിശോധിച്ചുറപ്പിച്ച <xliff:g id="COUNT_0">%d</xliff:g> ലിങ്ക്</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">പരിശോധിച്ചുറപ്പിച്ച ലിങ്കുകൾ ആയതിനാൽ സ്വയമേവ ഈ ആപ്പിൽ തുറക്കും.</item>
+      <item quantity="one">പരിശോധിച്ചുറപ്പിച്ച ലിങ്ക് ആയതിനാൽ സ്വയമേവ ഈ ആപ്പിൽ തുറക്കും.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ശരി"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"പിന്തുണയുള്ള മറ്റ് ലിങ്കുകൾക്കായി പരിശോധിക്കുന്നു…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"റദ്ദാക്കുക"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other">പിന്തുണയുള്ള <xliff:g id="COUNT_1">%d</xliff:g> ലിങ്കുകൾ</item>
+      <item quantity="one">പിന്തുണയുള്ള <xliff:g id="COUNT_0">%d</xliff:g> ലിങ്ക്</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"ചേർക്കുക"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> എന്നതിൽ തുറക്കുന്നു"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> എന്നതിൽ <xliff:g id="SIZE">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"ഉള്ളിലെ മെമ്മറി"</string>
     <string name="storage_type_external" msgid="125078274000280821">"ബാഹ്യ സ്റ്റോറേജ്"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"ക്യാമറ അനുവദനീയമല്ല"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"സ്‌ക്രീൻഷോട്ട് അനുവദനീയമല്ല"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"ഈ ആപ്പ് തുറക്കാനാവില്ല"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"നിങ്ങൾക്ക് ചോദ്യങ്ങളുണ്ടെങ്കിൽ‍‌, ഐടി അഡ്‌മിനെ ബന്ധപ്പെടുക"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"കൂടുതൽ‍ വിശദാംശങ്ങൾ"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"ക്രമീകരണവും അനുമതികളും കോർപ്പറേറ്റ് ആക്‌സസ്സും നെറ്റ്‌വർക്ക് ആക്‌റ്റിവിറ്റിയും ഉപകരണത്തിന്റെ ലൊക്കേഷൻ വിവരങ്ങളും ഉൾപ്പെടെ, നിങ്ങളുടെ ഔദ്യോഗിക പ്രൊഫൈലുമായി ബന്ധപ്പെട്ട ആപ്‌സും ഡാറ്റയും നിരീക്ഷിക്കാനും മാനേജുചെയ്യാനും അഡ്‌മിന് കഴിയും."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"ക്രമീകരണവും അനുമതികളും കോർപ്പറേറ്റ് ആക്‌സസ്സും നെറ്റ്‌വർക്ക് ആക്‌റ്റിവിറ്റിയും ഉപകരണത്തിന്റെ ലൊക്കേഷൻ വിവരങ്ങളും ഉൾപ്പെടെ, ഈ ഉപയോക്താവുമായി ബന്ധപ്പെട്ട ആപ്പുകളും ഡാറ്റയും നിരീക്ഷിക്കാനും മാനേജുചെയ്യാനും അഡ്‌മിന് കഴിയും."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">ഒരു നിയന്ത്രണം</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ഉപകരണം കണക്കാക്കുന്നതിൽ നിന്നും വ്യത്യസ്തമായിട്ടായിരിക്കാം സേവനദാതാക്കള്‍ കണക്കാക്കുന്നത്"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"കാരിയർ നെറ്റ്‌വർക്കുകൾ ഉപയോഗിക്കുന്ന ഡാറ്റ ഒഴികെയുള്ളവ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"കാരിയർ നെറ്റ്‌വർക്കുകൾ ഉപയോഗിക്കുന്ന ഡാറ്റ ഒഴികെയുള്ളവ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ഡാറ്റാ മുന്നറിയിപ്പ് സജ്ജീകരിക്കുക"</string>
     <string name="data_warning" msgid="2925054658166062884">"ഡാറ്റാ മുന്നറിയിപ്പ്"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g> എന്നയാൾക്ക് ‌അൺഇൻസ്റ്റാൾചെയ്തു)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g> എന്നയാൾക്ക് കാണാനാവില്ല)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"സ്വയം പൂരിപ്പിക്കൽ സേവനം"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"സ്വയമേവ, പൂരിപ്പിക്കൽ, സ്വയമേവ പൂരിപ്പിക്കൽ"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"പാസ്‌വേഡുകൾ"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"സ്വയമേവ, പൂരിപ്പിക്കൽ, സ്വയമേവ പൂരിപ്പിക്കൽ, പാസ്‌വേഡ്"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;ഈ ആപ്പിനെ നിങ്ങൾ വിശ്വസിക്കുന്നുണ്ടെന്ന് ഉറപ്പുവരുത്തുക&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; സ്വയമേവ പൂരിപ്പിക്കേണ്ടത് എന്താണെന്ന് നിർണ്ണയിക്കുന്നതിന് നിങ്ങളുടെ സ്‌ക്രീനിൽ ഉള്ളത് ഉപയോഗിക്കുന്നു."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"സ്വയമേവ പൂരിപ്പിക്കൽ"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"ലോഗിംഗ് ലെവൽ‌"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"നെറ്റ്‌വർക്ക് പ്രവർത്തിക്കുന്ന മോഡ് മാറ്റുക"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"മുൻഗണന നൽകുന്ന നെറ്റ്‌വർക്ക് തരം"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"കാരിയര്‍"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ക്രമീകരണ പതിപ്പ്"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"സേവനദാതാവിന്റെ ക്രമീകരണ പതിപ്പ്"</string>
     <string name="call_category" msgid="641461844504128789">"കോൾചെയ്യുന്നു"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"കാരിയർ വീഡിയോ കോളിംഗ്"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"സിസ്‌റ്റം സെലക്‌ട്"</string>
@@ -4924,7 +4972,7 @@
     <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> എന്നതിലേക്ക് മാറുന്നു"</string>
     <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"കാരിയറെ മാറ്റാനാകുന്നില്ല"</string>
     <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ഒരു പിശക് കാരണം കാരിയറെ മാറ്റാനാകുന്നില്ല."</string>
-    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ഓഫാക്കണോ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ഓഫാക്കണോ?"</string>
     <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM ഓഫാക്കണോ?"</string>
     <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"സിം ഓഫാക്കുന്നു<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
     <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"സേവനദാതാവിനെ പ്രവർത്തനരഹിതമാക്കാനാകില്ല"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM നീക്കം ചെയ്‌ത് വീണ്ടും ഇടുക. പ്രശ്‌നം തുടരുകയാണെങ്കിൽ ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യുക."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM വീണ്ടും ഓണാക്കാൻ ശ്രമിക്കുക. പ്രശ്‌നം തുടരുകയാണെങ്കിൽ ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യുക."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"നെറ്റ്‌വർക്ക് സജീവമാക്കൽ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"കാരിയർ മാറുന്നു"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> സജീവമാണ്"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"സിം ക്രമീകരണം അപ്ഡേറ്റ് ചെയ്യാൻ ടാപ്പ് ചെയ്യുക"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> എന്നതിലേക്ക് മാറി"</string>
@@ -4959,7 +5008,7 @@
     <string name="switch_sim_dialog_no_switch_text" msgid="7053939850026876088">"മൊബൈൽ ഡാറ്റ, കോൾ ഫീച്ചറുകൾ, SMS എന്നിവ പിന്നീട് ഉപയോഗിക്കാൻ നിങ്ങളുടെ നെറ്റ്‌വർക്ക് ക്രമീകരണത്തിലേക്ക് പോകുക"</string>
     <string name="sim_card_label" msgid="5632157635124050923">"സിം കാർഡ്"</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"ഡൗൺലോഡ് ചെയ്‌ത ഈ സിം മായ്ക്കണോ?"</string>
-    <string name="erase_sim_dialog_text" msgid="753031064269699885">"ഈ സിം മായ്ക്കുന്നതിലൂടെ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> സേവനം ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കം ചെയ്യപ്പെടും.\n\n <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> സേവനം റദ്ദാക്കില്ല."</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"ഈ സിം മായ്ക്കുന്നതിലൂടെ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> സേവനം ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കം ചെയ്യപ്പെടും.\n\n <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> എന്നതിനുള്ള സേവനം റദ്ദാക്കില്ല."</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"മായ്ക്കുക"</string>
     <string name="erasing_sim" msgid="7877703231075699139">"സിം മായ്ക്കുന്നു…"</string>
     <string name="erase_sim_fail_title" msgid="2024446702985862427">"സിം മായ്ക്കാനാകില്ല"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"ഓഫാണ്"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"ഇന്റർനെറ്റ്"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"സിമ്മുകൾ"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"ഫ്ലൈറ്റ് മോഡ് നെറ്റ്‌വർക്കുകൾ കാണിക്കുക"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"ഫ്ലൈറ്റ് മോഡിലുള്ള നെറ്റ്‌വർക്കുകൾ കണ്ടെത്തി കണക്റ്റ് ചെയ്യുക."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"വൈഫൈ നെറ്റ്‌വർക്കുകൾ കണ്ടെത്തി അവയിലേക്ക് കണക്റ്റ് ചെയ്യുക"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"വിമാനം, വിമാന-സുരക്ഷിതം"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"കോളുകളും &amp; SMS-കളും"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"വൈഫൈ കോളിംഗ്"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ലഭ്യമല്ല"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"താൽക്കാലികമായി ലഭ്യമല്ല"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"സിം ഇല്ല"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"മുൻഗണനകൾ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"നെറ്റ്‌വർക്ക് മുൻഗണനകൾ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"പൊതു നെറ്റ്‌വർക്കിലേക്ക് കണക്റ്റ് ചെയ്യുക"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"നെറ്റ്‌വർക്ക് കണക്ഷൻ, ഇന്‍റര്‍നെറ്റ്, വയർലെസ്, ഡാറ്റ, വൈഫൈ, വൈഫൈ, വൈഫൈ, സെല്ലുലാർ, മൊബൈൽ, സെൽ കാരിയർ, 4g, 3g, 2g, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ഫ്ലൈറ്റ് മോഡ് നെറ്റ്‍‌വർക്കുകൾ കാണുക"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"ഫ്ലൈറ്റ് മോഡ് നെറ്റ്‌വർക്കുകൾ കാണുന്നു"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"നെറ്റ്‌വർക്കുകൾ ഓണാക്കുക"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"നെറ്റ്‌വർക്കുകൾ ഓഫാക്കുക"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"നിങ്ങളുടെ ഇന്റർനെറ്റ് റീസെറ്റ് ചെയ്യണോ?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"ഇത് നിങ്ങളുടെ ഫോൺ കോൾ അവസാനിപ്പിക്കും"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ഇത് നിങ്ങളുടെ ഫോൺ കോൾ അവസാനിപ്പിക്കും"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"നിങ്ങളുടെ ഇന്റർനെറ്റ് റീസെറ്റ് ചെയ്യുന്നു…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"കണക്റ്റിവിറ്റി ശരിയാക്കുക"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"ഫ്ലൈറ്റ് മോഡ് നെറ്റ്‌വർക്കുകൾ ലഭ്യമാണ്"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"മറ്റ് നെറ്റ്‌വർക്കുകളിലേക്ക് മാറാൻ, ഇതർനെറ്റ് വിച്ഛേദിക്കുക"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"കണക്റ്റ് ചെയ്‌തിരിക്കുമ്പോൾ നെറ്റ്‌വർക്കുകൾ പരസ്പരം മാറാനാകില്ല"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ഫ്ലൈറ്റ് മോഡ് നെറ്റ്‍വർക്കുകൾ"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"കണക്റ്റ് ചെയ്തു"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"ഇന്റർനെറ്റ് സ്വയമേവ കണക്റ്റാകില്ല"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"നിറം"</string>
     <string name="category_name_others" msgid="2366006298768550310">"മറ്റുള്ളവ"</string>
     <string name="category_name_general" msgid="7737273712848115886">"പൊതുവായവ"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"എല്ലാ ആപ്പുകളും കാണുക"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"സ്‌മാർട്ട് കൈമാറൽ"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"സ്‌മാർട്ട് കൈമാറൽ പ്രവർത്തനക്ഷമമാക്കി"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ഫോൺ നമ്പർ നൽകുക"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ഫോൺ നമ്പർ കാണുന്നില്ല."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ശരി"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G അനുവദിക്കുക"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G സെല്ലുലാർ കണക്ഷനുകൾ ഉപയോഗിക്കുക. എമർജൻസി കോളുകൾക്ക്, 2G എല്ലായ്‌പ്പോഴും ഓണാണ്."</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 0382859..c84449a 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Жижигрүүлэх"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Томруулах"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Автоматаар эргүүлэхийг ашиглах"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Царайнд суурилсан Автоматаар эргүүлэх тохиргоо хэн нэгнийг дэлгэц рүү харж байгаа эсэх болон хэрхэн харж байгааг харахын тулд урд талын камерыг ашигладаг. Энэ нь хэвтэнгээ унших болон зургийг Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Learn more&lt;/a&gt;-д хадгалахгүй, илгээхгүй байх боломж олгодог"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Жишээ текст"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Озын Гайхамшигт шидтэн"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Бүлэг 11: Озын Гайхамшигт Маргад эрдэнийн хот"</string>
@@ -403,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> хурууны хээний тохиргоо</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Хурууны хээгээр түгжээ тайлах"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Хурууны хээгээ тохируулна уу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Хурууныхаа хээг ашиглах"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Утасныхаа түгжээг тайлах, худалдан авалтыг зөвшөөрөх эсвэл аппуудад нэвтрэхийн тулд ердөө хурууны хээ мэдрэгчид хүрэхэд болно. Хурууных нь хээг нэмэх хүнээ болгоомжтой сонгоно уу. Нэмсэн ганц хээ эдгээр зүйлийн алийг нь ч хийх боломжтой."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Таны хурууны хээ хүчтэй хээ эсвэл ПИН-ээс хамгаалалт сул байж болзошгүй."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Хяналт таны гарт"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Санаж яваарай"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Хурууны хээгээр бүртгэсэн өгөгдлийг таны утсанд аюулгүйгээр бүрмөсөн хадгална. Та өгөгдлөө хүссэн үедээ Тохиргоо хэсэгт устгах боломжтой."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Таны хурууны хээ хүчтэй хээ эсвэл ПИН-ээс хамгаалалт сул байж болзошгүй."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Таны утас сайжруулсан хурууны хээний загвар үүсгэхийн тулд саяхны хурууны хээний зургийг үе үе ашиглана."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Утасныхаа түгжээг тайлах, худалдан авалт зөвшөөрөхийн тулд хурууны хээгээ ашиглана уу.\n\nСанамж: Та хурууны хээгээр энэ төхөөрөмжийн түгжээг тайлах боломжгүй. Дэлгэрэнгүй мэдээлэл авахын тулд байгууллагынхаа админтай холбогдоно уу."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Утасныхаа түгжээг тайлах, худалдан авалт зөвшөөрөхөд хурууны хээгээ ашиглана уу.\n\nСанамж: Таны хурууны хээ нь хүчтэй зурган түгжээ эсвэл PIN-с хамгаалалт муутай байж болзошгүй."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Цуцлах"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Үгүй баярлалаа"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Алгасах"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Үргэлжлүүлэх"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Зөвшөөрөх"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Алгасах"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Дараагийн"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Хурууны хээг алгасах уу?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Алгасах"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Цуцлах"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Мэдрэгчид хүрнэ үү"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Хурууны хээний дүрс тэмдэгт хүрээд удаан дарна уу"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Мэдрэгч таны утасны ард байдаг. Долоовор хуруугаа ашиглана уу."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Энэ нь дэлгэц дээр байна. Гялалзаж буй дугуй хэлбэртэй хурууны хээг олно уу."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Хурууны хээ мэдрэгч таны дэлгэц дээр байна. Үүнийг олохын тулд дэлгэц дээр хуруугаа гүйлгэнэ үү."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Төхөөрөмж болон хурууны хээний мэдрэгчийн байршлын зураг"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Нэр"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ТИЙМ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Устгах"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Мэдрэгчид хүрнэ үү"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Мэдрэгч дээр хуруугаа тавиад, чичиргээ мэдрэгдэхэд аваарай"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Хөндийрүүлээд, дахин хүрнэ үү"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Хурууныхаа хээг бүрэн гаргахын тулд хуруугаа хөндийрүүлсэн хэвээр байлгана уу"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Хурууны хээ нэмсэн"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Та энэ дүрс тэмдгийг харсан үедээ өөрийгөө мөн болохыг баталгаажуулах эсвэл худалдан авалтыг зөвшөөрөхийн тулд хурууны хээгээ ашиглана уу"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Дараа хийх"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Асаалттай / Хэрэв та дэлгэц рүү харж байвал унтрахгүй"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Унтраалттай"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Камерын хандалт шаардлагатай"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Төхөөрөмжийг хувийн болгон тохируулах үйлчилгээний зөвшөөрлийг удирдахын тулд товшино уу"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Таныг дэлгэц рүү харж байгаа үед үүнийг унтрахаас сэргийлдэг"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Соргог дэлгэц нь хэн нэгнийг дэлгэц рүү харж байгаа эсэхийг харахын тулд урд талын камерыг ашигладаг. Энэ нь төхөөрөмж дээр ажилладаг бөгөөд зургийг хэзээ ч хадгалдаггүйгээс гадна Google-д илгээдэггүй."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Соргог дэлгэцийг асаах"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Дэлгэц бараан үед энэ нь шинэ мэдэгдэл ирэхэд асдаг"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Цаг, мэдээллийг үргэлж үзүүлэх"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Сайжруулсан батарей ашиглалт"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Тод текст"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Тод текст"</string>
     <string name="title_font_size" msgid="570613010306330622">"Фонтын хэмжээ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Текстийг том эсвэл жижиг болгох"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM картын түгжээний тохиргоо"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Бусад хэрэглэгчид"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Төхөөрөмжийн хадгалах сан"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Зөөврийн санах ой"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Сэрүүлэг болон сануулагч"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Сэрүүлэг эсвэл сануулагч тохируулахыг зөвшөөрөх"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Сэрүүлэг болон сануулагч"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Энэ аппад сэрүүлэг эсвэл бусад цагт тулгуурласан үйл явдлын хуваарь гаргахыг зөвшөөрнө үү. Энэ нь таныг төхөөрөмжийг ашиглаагүй байсан ч аппад сэрэх болон ажиллахыг нь зөвшөөрнө. Энэ зөвшөөрлийг цуцалснаар аппыг доголдоход хүргэж болзошгүй бөгөөд ялангуяа тухайн аппын хуваарь гаргасан аливаа сэрүүлэг цаашид ажиллахгүй болохыг анхаарна уу."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"хуваарь, сэрүүлэг, сануулагч, үйл явдал"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g>-ын <xliff:g id="USED">%1$s</xliff:g>-г ашигласан"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g>-с ашигласан"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Байршлын үйлчилгээ"</string>
     <string name="location_title" msgid="5819154746934945021">"Миний Байршил"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Ажлын профайлын байршил"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Байршилд хандах аппын хандалт"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Байршил унтраалттай байна"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> аппын <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> нь байршилд хандах боломжтой</item>
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> аппын <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> нь байршилд хандах боломжтой</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Саяхны байршлын хандалт"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Дэлгэрэнгүйг харах"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Саяхан байршлын мэдээлэл хүссэн апп байхгүй"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Байршилд саяхан хандсан апп алга"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Батерейны зарцуулалт өндөр"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Батерейны зарцуулалт бага"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi болон Bluetooth-н скан"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi скан"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Апп, үйлчилгээнд Wi‑Fi унтраалттай үед ч Wi‑Fi сүлжээг хүссэн үедээ скан хийхийг зөвшөөрнө үү. Үүнийг байршилд суурилсан онцлог, үйлчилгээнүүдийг сайжруулахад ашиглаж магадгүй."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth скан"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Апп, үйлчилгээнд Bluetooth унтраалттай үед ч ойролцоох төхөөрөмжийг хүссэн үедээ скан хийхийг зөвшөөрнө үү. Үүнийг байршилд суурилсан онцлог, үйлчилгээнүүдийг сайжруулахад ашиглаж магадгүй."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Байршлын үйлчилгээ"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Ажилд зориулсан байршлын үйлчилгээ"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Байршлын цагийн бүс илрүүлэх горим"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Байршлын цагийн бүс илрүүлэх горим"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Төхөөрөмжийн байршлыг одоогийн цагийн бүсийг илрүүлэхэд ашиглахыг зөвшөөрнө. Wi-Fi скан зэрэг байршлын бусад тохиргоо нь цагийн бүс илрүүлэх горимын оновчлолд нөлөөлөх боломжтой."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Асаалттай"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Унтраалттай"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Цагийн бүсийг автоматаар илрүүлэх горимыг идэвхгүй болгосон"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Автомат цагийн бүс унтраалттай байна"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Байршлын цагийн бүс илрүүлэх горимыг идэвхгүй болгосон"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Байршлын цаг бүс илрүүлэх горимыг дэмждэггүй"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Байршлын цагийн бүс илрүүлэх горимыг өөрчлөхийг зөвшөөрөхгүй"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Идэвхжүүлэх"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Хадгалах санг цэвэрлэх"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Шинэчлэлтүүдийг устгах"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Та энэ апп-г зарим үйлдлийн хувьд ажиллуулахаар сонгосон."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Таны сонгосон зарим үйл ажиллагааг энэ аппад өгөгдмөлөөр нээдэг."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Та энэ апп-д виджэт үүсгэж өгөгдөлд нь хандалт хийхийг зөвшөөрсөн."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Үндсэн тохиргоог хийгээгүй."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Үндсэн тохиргоог арилгах"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Өгөгдмөл сонголтыг арилгах"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Энэ апп таны дэлгэцэнд тохируулан зохиогдоогүй байж болно. Та эндээс хэрхэн таны дэлгэцэнд зохицохыг нь удирдаж болно."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Хэзээ ажиллахыг асуух"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Далайцын апп"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Та энэ төхөөрөмжийг өөрийнхөө шаардлагад нийцүүлэн тохируулах боломжтой. Эдгээр сонголтуудыг дараа нь Тохиргоо хэсэгт өөрчлөх боломжтой."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Фонтын хэмжээг өөрчлөх"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Дэлгэц уншигч"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио &amp; дэлгэцийн текст"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Тайлбар"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аудио"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Ерөнхий"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Дэлгэц"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Текст болон дэлгэц"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Дэлгэцийг бараан болгох"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Улаан-ногоон"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Улаан-ногоон"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Цэнхэр-шар"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Гэрэлтүүлгийг багасгах"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Гэрэлтүүлгийг багасгах"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Дэлгэцийг таны утасны хамгийн бага гэрэлтүүлгээс бараан болгох"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Дэлгэцийг таны таблетын хамгийн бага гэрэлтүүлгээс бараан болгох"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Дэлгэцээ бараан болгож, уншихад илүү тухтай болгоорой.&lt;br/&gt;&lt;br/&gt; Энэ нь дараах тохиолдолд хэрэгтэй байж болно: &lt;ol&gt; &lt;li&gt; Таны утасны өгөгдмөл хамгийн бага гэрэлтүүлэг хэт тод хэвээр байх үед&lt;/li&gt; &lt;li&gt; Та шөнө, эсвэл орондоо орохоосоо өмнө харанхуй өрөөнд байх зэргээр харанхуй нөхцөл байдалд утсаа ашиглаж байгаа үед&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3097,7 +3124,7 @@
     <string name="user_guest" msgid="4545590092001460388">"Зочин"</string>
     <string name="user_exit_guest_title" msgid="2653103120908427236">"Зочныг хасах"</string>
     <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Зочныг хасах уу?"</string>
-    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Энэ сешний бүх апп болон дата устах болно."</string>
+    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Энэ харилцан үйлдлийн бүх апп болон дата устах болно."</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Хасах"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Утасны дуудлага авах"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"Утасны дуудлага &amp; SMS авах"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"царай"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"хурууны хээ, хурууны хээ нэмэх"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"бүдэг дэлгэц, мэдрэмтгий дэлгэц, батарей, ухаалаг гэрэлтүүлэг, динамик гэрэлтүүлэг, Автомат гэрэлтүүлэг"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"бүдэг дэлгэц, идэвхгүй, батарей, завсарлага, соргог, нүүр, дэлгэц, идэвхгүй горим"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"эргүүлэх, хөнтрөх, эргэлт, босоо, хөндлөн, чиглэл, босоо, хөндлөн"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"дэвшүүлэх, андройд"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"бүү саад бол, хуваарь, мэдэгдэл, блоклох, чимээгүй болгох, чичиргэх, унтах, ажил, төвлөрөх, дуу, дууг хаах, өдөр, ажлын өдөр, амралтын өдөр, энгийн үдэш, арга хэмжээ"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"дэлгэц, түгжих цаг, завсарлага, түгжигдсэн дэлгэц"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Хонхны ая"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Бусад ая, чичиргээ"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Мэдэгдэл"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Харилцан яриа"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Саяхан илгээсэн"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Сүүлийн 7 хоногийн бүх aппыг харах"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Нарийвчилсан"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Ерөнхий"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Ажлын мэдэгдэл"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Орчинтой тохирсон мэдэгдлүүд"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Орчинтой тохирсон мэдэгдлийн давуу эрх"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Доош татдаг сүүдэр, статусын хэсэг болон түгжигдсэн дэлгэцэд харагдана."</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Статус самбарын чимээгүй мэдэгдлийг нуух"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Анивчих гэрэл"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Түгжсэн дэлгэц дээрх мэдэгдэл"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Нууцлал"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Түгжигдсэн дэлгэцийг алгасах"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Царайгаар тайлсны дараа хамгийн сүүлд ашигласан дэлгэц рүү шууд очно уу"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Түгжигдсэн дэлгэц, Түгжигдсэн дэлгэц, Алгасах, Тойрох"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="one">Долоо хоногт ~<xliff:g id="NUMBER_0">%d</xliff:g> мэдэгдэл</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Хэзээ ч үгүй"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Мэдэгдлийн хандалт"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Төхөөрөмж, аппын мэдэгдлүүд"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Таны аппууд болон төхөөрөмжүүд дээр аль мэдэгдлийг харуулахыг хянах"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Ажлын профайлын мэдэгдэлд хандахыг блоклосон байна"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Аппууд мэдэгдлийг уншиж чадахгүй"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Унтраах"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Цуцлах"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Зөвшөөрөгдсөн мэдэгдлийн төрөл"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Үргэлжилж буй чухал мэдэгдэл"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Харилцан ярианы мэдэгдэл"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Сэрэмжлүүлэх мэдэгдэл"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Чимээгүй мэдэгдэл"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Тухайн агшин"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Ашиглалтад буй аппуудын тухайн агшны харилцаа холбоо, навигац, утасны дуудлага болон бусад"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Харилцан яриа"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS болон бусад харилцаа холбоо"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Өгөгдмөл"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Тохиргоонд тулгуурлан хонх дуугаргах эсвэл чичирхийлж болзошгүй мэдэгдлүүд"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Чимээгүй"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Хэзээ ч дуу чимээ гаргадаггүй эсвэл чичирхийлдэггүй мэдэгдлүүд"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Бүх аппыг харах"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Мэдэгдэл илгээх боломжтой апп тус бүрийн мэдэгдлийн тохиргоог өөрчлөх"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Төхөөрөмж дээр харагддаг аппууд"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR туслагч үйлчилгээ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Суулгасан апп-с VR туслагч үйлчилгээгээр ажиллах хүсэлт гаргаагүй байна."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR үйлчилгээг <xliff:g id="SERVICE">%1$s</xliff:g>-д хандахыг зөвшөөрөх үү?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Өгөгдмөлөөр нээх"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Холбоосыг нээх"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Дэмждэг холбоосыг нээх"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Энэ аппад нээх дэмждэг холбооснууд"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Энэ аппад нээх холбооснууд"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Асуулгүйгээр нээх"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Дэмждэг холбоос"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Бусад стандарт өгөгдөл"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Бусад өгөгдмөл сонголт"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Холбоос нэмэх"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Апп холбооснуудыг аппад автоматаар нээхийн тулд баталгаажуулах боломжтой. "<annotation id="url">"Нэмэлт мэдээлэл авах"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other">Баталгаажсан <xliff:g id="COUNT_1">%d</xliff:g> холбоос</item>
+      <item quantity="one">Баталгаажсан <xliff:g id="COUNT_0">%d</xliff:g> холбоос</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Эдгээр холбоос баталгаажсан бөгөөд энэ аппад автоматаар нээгдэнэ.</item>
+      <item quantity="one">Энэ холбоос баталгаажсан бөгөөд энэ аппад автоматаар нээгдэнэ.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Дэмжсэн бусад холбоосыг шалгаж байна…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Цуцлах"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other">Дэмжсэн <xliff:g id="COUNT_1">%d</xliff:g> холбоос</item>
+      <item quantity="one">Дэмжсэн <xliff:g id="COUNT_0">%d</xliff:g> холбоос</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Нэмэх"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g>-д нээгдэнэ"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g>-ыг <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>-д ашигласан"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"дотоод сан"</string>
     <string name="storage_type_external" msgid="125078274000280821">"гадаад сан"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Камер ашиглах боломжгүй"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Дэлгэцийн зураг дарах боломжгүй"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Энэ аппыг нээх боломжгүй"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Хэрэв танд асуух зүйл байгаа бол IT админтайгаа холбогдоно уу"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Илүү дэлгэрэнгүй"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Тохиргоо, зөвшөөрөл, байгууллагын хандалт, сүлжээний үйл ажиллагаа болон төхөөрөмжийн байршлын мэдээлэл зэрэг таны ажлын профайлтай холбоотой апп, өгөгдлийг таны админ удирдаж, хянах боломжтой."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Тохиргоо, зөвшөөрөл, байгууллагын хандалт, сүлжээний үйл ажиллагаа болон төхөөрөмжийн байршлын мэдээлэл зэрэг энэ хэрэглэгчтэй холбоотой апп, өгөгдлийг таны админ удирдаж, хянах боломжтой."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="one">1 хязгаарлалт</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Оператор компанийн дата тооцоололт нь төхөөрөмжийн тооцоололтоос өөр байж болно"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Оператор компанийн сүлжээгээр ашигласан өгөгдлийг оруулдаггүй"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Оператор компанийн сүлжээгээр ашигласан өгөгдлийг оруулдаггүй"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ашигласан"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Датаны сануулгыг тохируулах"</string>
     <string name="data_warning" msgid="2925054658166062884">"Дата хэрэглээний сануулга"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g> хэрэглэгчээс устгасан)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g> хэрэглэгчид идэвхгүй болгосон)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Автоматаар бөглөх үйлчилгээ"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"авто, бөглөх, автоматаар бөглөх"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Нууц үг"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"автомат, бөглөх, автоматаар бөглөх хэсэг, нууц үг"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Энэ апп-д итгэдэг эсэхээ шалгана уу&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google автоматаар бөглөх&gt;%1$s&lt;/xliff:g&gt; таны дэлгэцэд автоматаар бөглөх зүйлийг илрүүлэхийн тулд ашигладаг."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Автоматаар бөглөх хэсэг"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Нэвтрэх түвшин"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Сүлжээний ажиллах горимыг өөрчлөх"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Давуу эрхтэй сүлжээний төрөл"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Оператор компани"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Тохиргооны хувилбар"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Оператор компанийн тохиргооны хувилбар"</string>
     <string name="call_category" msgid="641461844504128789">"Дуудлага"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Оператор компанийн видео дуудлага"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Систем сонгох"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM-г салгаад, дахин хийнэ үү. Хэрэв асуудал үргэлжилсээр байвал төхөөрөмжөө дахин эхлүүлнэ үү."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM-г дахин асааж үзнэ үү. Хэрэв асуудал үргэлжилсээр байвал төхөөрөмжөө дахин эхлүүлнэ үү."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Сүлжээг идэвхжүүлэх"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Оператор компанийг сэлгэх"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> идэвхтэй байна"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM-н тохиргоог шинэчлэхийн тулд товшино уу"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> руу сэлгэсэн"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Унтраалттай"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Интернэт"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Нислэгийн горимын сүлжээг харуулах"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Нислэгийн горимын сүлжээг хайж, холбогдоно уу."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Wi-Fi сүлжээг олж, холбогдоно уу"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"нислэг, нислэг аюулгүй"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Дуудлага, SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi дуудлага"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"боломжгүй"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Түр хугацаанд боломжгүй"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM байхгүй"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Сонголт"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Сүлжээний тохиргоо"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Олон нийтийн Wi-Fi сүлжээнд холбогдох"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"сүлжээний холболт, интернэт, утасгүй интернэт, дата, wifi, wi-fi, wi fi, үүрэн холбоо, мобайл, үүрэн холбооны оператор, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Нислэгийн горимын сүлжээг харах"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Нислэгийн горимын сүлжээг харж байна"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Сүлжээг асаах"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Сүлжээг унтраах"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Интернэтээ шинэчлэх үү?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Энэ нь таны утасны дуудлагыг дуусгана"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Энэ нь таны утасны дуудлагыг дуусгана"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Таны интернэтийг шинэчилж байна…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Холболтыг засах"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Нислэгийн горимын сүлжээ боломжтой"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Сүлжээг сэлгэхийн тулд этернэтийг салгана уу"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Холбогдсон үед сүлжээ сэлгэх боломжгүй"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Нислэгийн горимын сүлжээ"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Холбогдсон"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Интернэт автоматаар холбогдохгүй"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Өнгө"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Бусад"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Ерөнхий"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Бүх аппыг харах"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Ухаалаг шилжүүлэлт"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Ухаалаг шилжүүлэлтийг идэвхжүүлсэн"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Утасны дугаар оруулна уу"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Утасны дугаар дутуу байна."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G-г зөвшөөрөх"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G үүрэн холбоо ашиглана уу. Яаралтай дуудлагад зориулж 2G-г байнга асаалттай байлгадаг."</string>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 1c2f039..ddf5ad4 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"स्क्रीन वरील मजकूर आणखी लहान किंवा आणखी मोठा करा."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"आणखी लहान करा"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"आणखी मोठे करा"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ऑटो-रोटेट वापरा"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"नमुना मजकूर"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Oz चा अद्भूत जादूगार"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> फिंगरप्रिंट सेटअप</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"फिंगरप्रिंटने अनलॉक करा"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"तुमचे फिंगरप्रिंट सेट करा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"तुमचे फिंगरप्रिंट वापरा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"तुमचा फोन अनलॉक करण्यासाठी, खरेदीला परवानगी देण्यासाठी किंवा ॲप्समध्ये साइन इन करण्‍यासाठी फक्त फिंगरप्रिंट सेन्सरला स्पर्श करा. तुम्ही कोणाच्या फिंगरप्रिंट जोडता याबद्दल सावध रहा. जोडलेली एक प्रिंटदेखील यांपैकी कोणतीही गोष्ट करू शकते."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"क्लिष्ट पॅटर्न किंवा पिनच्या तुलनेत तुमची फिंगरप्रिंट ही कमी सुरक्षित असू शकते."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"तुम्ही नियंत्रण करत आहात"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"लक्षात ठेवा"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"फिंगरप्रिंट ने रेकॉर्ड केलेला डेटा सुरक्षितपणे स्टोअर केला जातो आणि तुमच्या फोनमध्ये कायम राहतो. तुम्ही तुमचा डेटा सेटिंग्ज मध्ये कधीही हटवू शकता."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"क्लिष्ट पॅटर्न किंवा पिनच्या तुलनेत तुमची फिंगरप्रिंट ही कमी सुरक्षित असू शकते."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"तुमचा फोन अधूनमधून सुधारित फिंगरप्रिंट मॉडल तयार करण्यासाठी तुमच्या अलीकडील फिंगरप्रिंट इमेज वापरेल."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"फोन अनलॉक करण्यासाठी किंवा खरेदींना मंजूरी देण्यासाठी तुमचे फिंगरप्रिंट वापरा.\n\nटीप: तुम्ही हे डिव्हाइस अनलॉक करण्यासाठी तुम्‍ही तुमचे फिंगरप्रिंट वापरू शकत नाही. अधिक माहितीसाठी संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"फोन अनलॉक करण्यासाठी किंवा खरेदीला मंजुरी देण्यासाठी तुमची फिंगरप्रिंट वापरा.\n\nटीप: क्लिष्ट पॅटर्न किंवा पिनच्या तुलनेत तुमची फिंगरप्रिंट ही कमी सुरक्षित असू शकते."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"रद्द करा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"नाही, नको"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"वगळा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"सुरू ठेवा"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"सहमत आहे"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"वगळा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"पुढील"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"फिंगरप्रिंट पायरी वगळायची?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"वगळा"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"रद्द करा"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"सेन्सरला स्पर्श करा"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"फिंगरप्रिंट आयकनला स्पर्श करा आणि धरून ठेवा"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"ते तुमच्या फोनच्या मागील भागावर आहे. तुमची तर्जनी वापरा."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"तो स्क्रीनवर आहे. चमकणारे वर्तुळ असलेले फिंगरप्रिंट शोधा."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"फिंगरप्रिंट सेन्सर तुमच्या स्क्रीनवर आहे. ते शोधण्यासाठी तुमचे बोट स्क्रीनवर फिरवा."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"डिव्हाइस आणि फिंगरप्रिंट सेन्सर स्थानासह चित्रे"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"नाव"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ठीक आहे"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"हटवा"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"सेंसरला स्पर्श करा"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"तुमचे बोट सेन्सरवर ठेवा आणि व्हायब्रेशन जाणवल्यावर काढा"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"उचला, नंतर पुन्हा स्पर्श करा"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"तुमच्‍या फिंगरप्रिंटचे वेगवेगळे भाग जोडण्यासाठी तुमचे बोट उचलत रहा"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"फिंगरप्रिंट जोडली"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"हा आयकन दिसेल तेव्हा ओळख पडताळणीसाठी किंवा खरेदी मंजूर करण्यासाठी तुमची फिंगरप्रिंट वापरा"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"हे नंतर करा"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Search"</string>
     <string name="display_settings" msgid="7197750639709493852">"डिस्प्ले"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"ऑटो-रोटेट स्क्रीन"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"बंद"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"सुरू"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"सुरू - चेहऱ्यावर आधारित"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"फेस डिटेक्शन सुरू करा"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"रंग"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"नैसर्गिक"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"बूस्ट केलेला"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"सुरू करा / तुम्ही स्क्रीनकडे पाहत असल्यास स्क्रीन बंद होणार नाही"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"बंद आहे"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"कॅमेराच्या अ‍ॅक्सेस आवश्यक आहे"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"डिव्हाइस पर्सनलायझेशन सेवा च्या परवानग्या व्यवस्थापित करण्यासाठी टॅप करा"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"तुम्ही स्क्रीनकडे पाहत असताना तुमच्या स्क्रीनला बंद होण्यापासून थांबवते"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"कोणी स्क्रीनकडे पाहत असल्यास स्क्रीन अटेंशन पुढील कॅमेरा वापरते. ते डिव्हाइसवर काम करते आणि इमेज कधीही स्टोअर केल्या जात नाहीत किंवा Google ला पाठवल्या जात नाहीत."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"स्क्रीन अटेंशन सुरू करा"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"स्क्रीन गडद असल्यास, नवीन सूचनांसाठी ती सुरू होते"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"वेळ आणि माहिती कायम दाखवा"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"वाढलेला बॅटरी वापर"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"ठळक मजकूर"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"ठळक मजकूर"</string>
     <string name="title_font_size" msgid="570613010306330622">"फॉंट आकार"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"मजकूर आणखी लहान-मोठा करा"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"सिम कार्ड लॉक सेटिंग्ज"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"इतर वापरकर्ते"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"डिव्हाइस स्टोरेज"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"पोर्टेबल संचयन"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"अलार्म आणि रिमाइंडर"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"अलार्म किंवा रिमाइंडर सेट करण्याची अनुमती द्या"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"अलार्म आणि रिमाइंडर"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"या अ‍ॅपला अलार्म किंवा इतर वेळेवर आधारित इव्हेंट शेड्युल करण्याची अनुमती द्या. तुम्ही डिव्हाइस वापरत नसतानादेखील हे अ‍ॅपला सुरू आणि रन होण्याची अनुमती देते. लक्षात ठेवा की, ही परवानगी मागे घेतल्याने ॲप खराब होऊ शकते, विशेषतः अ‍ॅपने शेड्युल केलेले कोणतेही अलार्म यापुढे काम करणार नाहीत."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"शेड्युल, अलार्म, रिमाइंडर, इव्‍हेंट"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> पैकी <xliff:g id="USED">%1$s</xliff:g> वापरले"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> पैकी वापरले"</string>
@@ -1728,30 +1746,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"स्‍थान सेवा"</string>
     <string name="location_title" msgid="5819154746934945021">"माझे स्थान"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"कार्य प्रोफाईलसाठी स्थान"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"ॲपचा स्थान अ‍ॅक्सेस"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"स्‍थान बंद आहे"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> पैकी <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ॲप्सना स्थानाचा अ‍ॅक्सेस आहे</item>
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> पैकी <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> ॲपला स्थानाचा अ‍ॅक्सेस आहे</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"अलीकडील स्थान अ‍ॅक्सेस"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"तपशील पहा"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"अलीकडे कोणत्याही अ‍ॅप्सनी स्थानाची विनंती केलेली नाही"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"अलीकडे अ‍ॅक्सेस केलेल्या अ‍ॅप्सचे स्थान नाही"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"उच्च बॅटरी वापर"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"अल्प बॅटरी वापर"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"वाय-फाय आणि ब्लूटूथ स्कॅनिंग"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"वाय-फाय स्कॅनिंग"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"वाय-फाय बंद असले तरीही अ‍ॅप्स आणि सेवांना वाय-फाय नेटवर्क कधीही स्कॅन करण्याची अनुमती द्या. याचा वापर स्थान आधारित वैशिष्ट्ये आणि सेवा सुधारणे अशा कामांसाठी केला जाऊ शकतो."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ब्लूटूथ स्कॅनिंग"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ब्लूटूथ बंद असले, तरीही अ‍ॅप्स आणि सेवांना जवळपासची डिव्हाइस कधीही स्कॅन करण्याची अनुमती द्या. याचा वापर उदाहरणार्थ, स्थान आधारित वैशिष्ट्ये आणि सेवा सुधारण्यासाठी केला जाऊ शकतो."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"स्‍थान सेवा"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ऑफिससाठीच्या स्थान सेवा"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"स्थानाचे टाइमझोन डिटेक्शन"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"स्थानाचे टाइमझोन डिटेक्शन"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"सध्याचा टाइमझोन डिटेक्ट करण्यासाठी डिव्हाइसचे स्थान वापरण्याची परवानगी द्या. वाय-फाय स्कॅनिंग सारखी इतर स्थान सेटिंग्ज टाइमझोन डिटेक्शनच्या अचूकतेवर परिणाम करू शकतात."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"सुरू करा"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"बंद करा"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ऑटोमॅटिक टाइमझोन डिटेक्शन बंद केले आहे"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ऑटोमॅटिक टाइम झोन बंद आहे"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"स्थानाचे टाइमझोन डिटेक्शन बंद केले आहे"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"स्थानाच्या टाइमझोन डिटेक्शनला सपोर्ट नाही"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"स्थानाच्या टाइमझोन डिटेक्शनमधील बदलांना अनुमती नाही"</string>
@@ -1930,10 +1949,10 @@
     <string name="enable_text" msgid="8570798764647110430">"सुरू करा"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"स्‍टोरेज साफ करा"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"अपडेट अनइंस्टॉल करा"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"तुम्ही काही क्रियांसाठी डीफॉल्टनुसार हा अ‍ॅप लाँच करणे निवडले आहे."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"तुम्ही निवडलेल्या काही अ‍ॅक्टिव्हिटी बाय डीफॉल्ट या अ‍ॅपमध्ये उघडतात."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"तुम्ही या ॲपला विजेट तयार करण्याची आणि त्यांच्या डेटामध्ये प्रवेश करण्याची अनुमती देण्यासाठी निवडले आहे."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"कोणताही डीफॉल्ट सेट केलेला नाही."</string>
-    <string name="clear_activities" msgid="341345438786077236">"डीफॉल्ट साफ करा"</string>
+    <string name="clear_activities" msgid="488089228657585700">"डीफॉल्ट प्राधान्ये साफ करा"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"आपल्या स्क्रीनसाठी या ॲपची रचना केली जाऊ शकत नाही. तुम्ही येथे आपल्या स्क्रीनवर तो कसा समायोजित करतो हे नियंत्रित करू शकता."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"लाँच केल्यानंतर विचारा"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"अ‍ॅप स्केल करा"</string>
@@ -2145,7 +2164,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"तुम्ही तुमच्या गरजेनुसार हे डिव्हाइस कस्टमाइझ करू शकता. ही अ‍ॅक्सेसिबिलिटी वैशिष्ट्ये नंतर सेटिंग्जमध्ये बदलता येतात."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"फाँटचा आकार बदला"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"स्क्रीन वाचक"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ऑडिओ आणि स्क्रीनवरील मजकूर"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"कॅप्शन"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ऑडिओ"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"सर्वसाधारण"</string>
     <string name="display_category_title" msgid="6638191682294461408">"डिस्प्ले"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"मजकूर आणि डिस्प्ले"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"स्क्रीन आणखी गडद करा"</string>
@@ -2298,7 +2319,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"लाल-हिरवा"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"लाल-हिरवा"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"निळा-पिवळा"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ब्राइटनेस कमी करा"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"ब्राइटनेस कमी करा"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"स्क्रीन तुमच्या फोनच्या किमान ब्राइटनेसपेक्षा अधिक गडद करा"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"स्क्रीन तुमच्या टॅबलेटच्या किमान ब्राइटनेसपेक्षा अधिक गडद करा"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"वाचण्यासाठी अधिक सुलभ होण्याकरिता तुमची स्क्रीन आणखी गडद करा.&lt;br/&gt;&lt;br/&gt; याची तुम्हाला पुढील परिस्थितींमध्ये मदत होऊ शकते: &lt;ol&gt; &lt;li&gt; तुमच्या फोनचा किमान ब्राइटनेस अजूनही खूप ब्राइट आहे&lt;/li&gt; &lt;li&gt; तुम्ही तुमचा फोन अंधार असलेल्या परिस्थितीमध्ये वापरत आहात, जसे की रात्री किंवा झोपण्याआधी अंधार असलेली खोली&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3335,8 +3356,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"चेहरा"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"फिंगरप्रिंट, फिंगरप्रिंट जोडा"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"मंद स्क्रीन, टचस्क्रीन, बॅटरी, स्मार्ट ब्राइटनेस, डायनॅमिक ब्राइटनेस, ऑटो ब्राइटनेस"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"मंद स्क्रीन, स्लीप, बॅटरी, टाइमआउट, अटेंशन, डिस्प्ले, स्क्रीन, निष्क्रियता"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"फिरवा, फ्लिप करा, रोटेशन, पोर्ट्रेट, लँडस्केप, ओरिएंटेशन, उभे, आडवे"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"अपग्रेड करा, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"डीएनडी, शेड्यूल, सूचना, ब्लॉक, शांतता, व्हायब्रेट, झोप, काम, फोकस, ध्वनी, म्यूट, दिवस, कार्य दिवस, शनिवार व रविवार, आठवड्याची शेवटची रात्र, इव्हेंट"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"स्क्रीन, लॉक टाइम, टाइमआउट, लॉकस्क्रीन"</string>
@@ -3505,9 +3528,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"रिंगटोन"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"इतर आवाज आणि कंपने"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"सूचना"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"संभाषण"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"नुकतेच पाठवलेले"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"गेल्या ७ दिवसांपासूनचे सर्व पाहा"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"प्रगत"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"साधारण"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"कार्य सूचना"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"अ‍ॅडॅप्टिव्ह सूचना"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"अ‍ॅडाप्टिव्ह सूचना प्राधान्य"</string>
@@ -3569,7 +3593,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"पूल-डाउन शेडमध्ये, स्टेटस बारमध्ये आणि लॉक स्क्रीनवर दाखवा"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"स्टेटस बारमधील सायलंट सूचना लपवा"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ब्लिंक लाइट"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"लॉकस्क्रीनवरील सूचना"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"गोपनीयता"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"लॉक स्क्रीन वगळा"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"फेस अनलॉक नंतर, थेट शेवटच्या वापरलेल्या स्क्रीनवर जा"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"लॉक स्क्रीन, लॉकस्क्रीन, वगळा, बायपास"</string>
@@ -3658,7 +3682,8 @@
       <item quantity="one">~दर आठवड्याला <xliff:g id="NUMBER_0">%d</xliff:g> सूचना</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"कधीही नाही"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"सूचना अ‍ॅक्सेस"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"डिव्हाइस आणि ॲप सूचना"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"तुमची अ‍ॅप्स आणि डिव्‍हाइसवर कोणत्या सूचना दिसतात हे नियंत्रित करा"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"कार्य प्रोफाइल सूचनांचा ॲक्‍सेस ब्‍लॉक आहे"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"अ‍ॅप्स सूचनांचे वाचन करु शकत नाहीत"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3677,17 +3702,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"बंद करा"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"रद्द करा"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"सूचनेचे अनुमती असलेले प्रकार"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"सुरू राहणाऱ्या महत्त्वाच्या सूचना"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"संभाषणाशी संबंधित सूचना"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"इशारा देणाऱ्या सूचना"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"सायलंट सूचना"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"रीअल-टाइम"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"वापरात असलेली ॲप्स, नेव्हिगेशन, फोन कॉल आणि आणखी बरेच काहीकडील रीअल-टाइम संवाद"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"संभाषणे"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"एसएमएस आणि इतर संवाद"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"डीफॉल्ट"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"सेटिंग्जच्या आधारावर रिंग किंवा व्हायब्रेट होणाऱ्या सूचना"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"सायलंट"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"कधीही आवाज किंवा व्हायब्रेशन न करणाऱ्या सूचना"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"सर्व अ‍ॅप्स पहा"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"सूचना पाठवू शकणार्‍या प्रत्येक अ‍ॅपसाठी सूचना सेटिंग्ज बदला"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"डिव्हाइसवर दिसणारी ॲप्स"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR मदतकर्ता सेवा"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"कोणत्याही इंस्टॉल ॲप्सनी VR मदतकर्ता सेवा म्हणून चालविण्यासाठी विनंती केली नाही."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> साठी VR सेवा प्रवेशाची अनुमती द्यायची?"</string>
@@ -3975,9 +4000,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"डीफॉल्टनुसार उघडा"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"उघडणाऱ्या लिंक"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"समर्थित लिंक उघडा"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"सपोर्ट असलेल्या लिंक या ॲपमध्ये उघडतात"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"हे ॲप उघडण्यासाठी लिंक"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"न विचारता उघडा"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"समर्थित लिंक"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"इतर डीफॉल्‍ट"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"इतर डीफॉल्ट प्राधान्ये"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"लिंक जोडा"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"अ‍ॅपमध्ये आपोआप उघडण्यासाठी ॲप लिंकची पडताळणी करू शकते. "<annotation id="url">"अधिक जाणून घ्या"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> पडताळणी केलेल्या लिंक</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> पडताळणी केलेली लिंक</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">या लिंकची पडताळणी केलेली आहे आणि आपोआप या अ‍ॅपमध्ये उघडतात.</item>
+      <item quantity="one">या लिंकची पडताळणी केलेली आहे आणि आपोआप या अ‍ॅपमध्ये उघडते.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ओके"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"इतर सपोर्ट असलेल्या लिंक शोधत आहे…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"रद्द करा"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> सपोर्ट असलेल्या लिंक</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> सपोर्ट असलेली लिंक</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"जोडा"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> मध्ये उघडते"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> मध्‍ये <xliff:g id="SIZE">%1$s</xliff:g> वापरले"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"अंतर्गत स्टोरेज"</string>
     <string name="storage_type_external" msgid="125078274000280821">"बाह्य स्टोरेज"</string>
@@ -4272,7 +4318,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"कॅमेर्‍याला अनुमती नाही"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"स्‍क्रीनशॉटला अनुमती नाही"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"हे अ‍ॅप उघडू शकत नाही"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"तुम्हाला कोणतेही प्रश्न असल्यास, तुमच्या आयटी अ‍ॅडमिनशी संपर्क साधा"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"अधिक तपशील"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"तुमचा प्रशासक सेटिंग्ज, परवानग्या, कॉर्पोरेट अ‍ॅक्सेस, नेटवर्क ॲक्टिव्हिटी आणि डीव्हाइसची स्थान माहिती यांसह तुमच्या कार्य प्रोफाइलशी संबधित ॲप्सचे आणि डेटाचे परीक्षण व व्यवस्थापन करू शकतो."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"तुमचा प्रशासक सेटिंग्ज, परवानग्या, कॉर्पोरेट अ‍ॅक्सेस, नेटवर्क ॲक्टिव्हिटी आणि डीव्हाइसची स्थान माहिती यांसह तुमच्या कार्य प्रोफाइलशी संबधित ॲप्सचे आणि डेटाचे परीक्षण व व्यवस्थापन करू शकतो."</string>
@@ -4349,14 +4396,14 @@
       <item quantity="one">1 निर्बंध</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"वाहक डेटा गणना तुमच्या डिव्हाइसपेक्षा भिन्न असू शकते"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"वाहकाच्या नेटवर्कद्वारे वापरलेल्या डेटाचा समावेश करत नाही"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"वाहक नेटवर्कनी वापरलेला डेटा वगळते"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> वापरला"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"डेटा चेतावणी सेट करा"</string>
     <string name="data_warning" msgid="2925054658166062884">"डेटा चेतावणी"</string>
     <string name="data_warning_footnote" msgid="5991901765915710592">"डेटा चेतावणी आणि डेटा मर्यादा तुमच्या डिव्हाइसद्वारे मोजली जाते. ही गणना वाहक डेटापेक्षा भिन्न असू शकते."</string>
     <string name="set_data_limit" msgid="9010326815874642680">"डेटा मर्यादा सेट करा"</string>
     <string name="data_limit" msgid="8731731657513652363">"डेटा मर्यादा"</string>
-    <string name="data_usage_template" msgid="3822452362629968010">"<xliff:g id="ID_1">%1$s</xliff:g> दरम्यान <xliff:g id="ID_2">%2$s</xliff:g> वापरले"</string>
+    <string name="data_usage_template" msgid="3822452362629968010">"<xliff:g id="ID_2">%2$s</xliff:g> दरम्यान <xliff:g id="ID_1">%1$s</xliff:g> वापरले"</string>
     <string name="configure" msgid="1499586749829665889">"कॉंफिगर करा"</string>
     <string name="data_usage_other_apps" msgid="5649047093607329537">"वापरामध्ये समाविष्‍ट केलेली इतर अ‍ॅप्स"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="3316296488378947221">
@@ -4686,7 +4733,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g> वापरकर्त्‍यासाठी विस्‍थापित)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g> वापरकर्त्‍यासाठी अक्षम केले)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"ऑटोफिल सेवा"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"स्वयं, भरा, स्वयंभरण"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"पासवर्ड"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"ऑटो, फिल, ऑटोफिल, पासवर्ड"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;तुमचा या ॲपवर विश्वास असल्याची खात्री करा&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ऑटोफिल काय होऊ शकते हे ठरवण्यासाठी तुमच्या स्क्रीनवर काय आहे याचा वापर करते."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"ऑटोफिल"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"लॉगिंग पातळी"</string>
@@ -4893,7 +4941,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"नेटवर्क कार्य करण्‍याचा मोड बदला"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"प्राधान्‍यकृत नेटवर्क प्रकार"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"वाहक"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"सेटिंग्जची आवृत्ती"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"वाहक सेटिंग्ज आवृत्ती"</string>
     <string name="call_category" msgid="641461844504128789">"कॉलिंग"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"वाहक व्हिडिओ कॉलिंग"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"सिस्टम निवडा"</string>
@@ -4942,6 +4990,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"सिम काढा आणि ते पुन्हा घाला. समस्या कायम राहिल्यास, तुमचे डिव्हाइस रीस्टार्ट करा."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"सिम पुन्हा सुरू करून पाहा. समस्या सुरू राहिल्यास, तुमचे डिव्हाइस रीस्टार्ट करा."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"नेटवर्क अ‍ॅक्टिव्हेशन"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"वाहक स्विच करणे"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> अ‍ॅक्टिव्ह आहे"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"सिमची सेटिंग्ज अपडेट करण्यासाठी टॅप करा"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> वर स्विच केले"</string>
@@ -5037,7 +5086,7 @@
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"तुमचा वाहक वाय-फाय कॉलिंगवर आणीबाणी कॉल करण्यासाठी सपोर्ट करत नाही.\nतुमचे डिव्हाइस आणीबाणी कॉल करण्यासाठी सेल्युलर नेटवर्कवर आपोआप स्विच होते.\n फक्त सेल्युलर नेटवर्कच्या परिसरात आणीबाणी कॉल करता येतात."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"कॉलची गुणवत्ता वाढवण्यासाठी वाय-फाय वापरा"</string>
     <string name="backup_calling_settings_title" msgid="519714752900364326">"बॅकअप कॉलिंग"</string>
-    <string name="backup_calling_setting_summary" msgid="599493254305348733">"<xliff:g id="BACKUP_CALLING_OPERATOR_TEXT">%1$s</xliff:g> उपलब्ध नसल्यास किंवा रोमिंग असल्यास, <xliff:g id="BACKUP_CALLING_CARRIER_TEXT">%1$s</xliff:g> कॉलसाठी तुमचे मोबाइल डेटा सिम वापरा."</string>
+    <string name="backup_calling_setting_summary" msgid="599493254305348733">"<xliff:g id="BACKUP_CALLING_OPERATOR_TEXT">%1$s</xliff:g> उपलब्ध नसल्यास किंवा रोमिंगमध्ये असल्यास, <xliff:g id="BACKUP_CALLING_CARRIER_TEXT">%1$s</xliff:g> कॉलसाठी तुमचे मोबाइल डेटा सिम वापरा."</string>
     <string name="keywords_backup_calling" msgid="8592800915478816800">"बॅकअप कॉलिंग"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"येणारा MMS मेसेज"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS मेसेज पाठवू शकत नाही"</string>
@@ -5102,8 +5151,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"बंद करा"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"इंटरनेट"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"सिम"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"विमान मोड नेटवर्क दाखवा"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"विमान मोडमध्ये नेटवर्क शोधा आणि त्यांच्याशी कनेक्ट करा."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"वाय-फाय नेटवर्क शोधा आणि कनेक्ट करा"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"विमान, विमान सुरक्षित"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"कॉल आणि एसएमएस"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"वाय-फाय कॉलिंग"</string>
@@ -5117,22 +5165,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"उपलब्ध नाही"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"तात्पुरते उपलब्ध नाही"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"सिम नाही"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"प्राधान्ये"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"नेटवर्क प्राधान्ये"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक नेटवर्कशी कनेक्ट करा"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्शन, इंटरनेट, वायरलेस, डेटा, वायफाय, वाय-फाय, वाय फाय, सेल्युलर, मोबाइल, सेल वाहक, 4g, 3g, 2g, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"विमान मोड नेटवर्क पहा"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"विमान मोडमध्ये उपलब्ध असलेली नेटवर्क पाहत आहे"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"नेटवर्क सुरू करा"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"नेटवर्क बंद करा"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"तुमचे इंटरनेट रीसेट करायचे आहे का?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"यामुळे तुमचा फोन कॉल बंद होईल"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"यामुळे तुमचा फोन कॉल बंद होईल"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"तुमचे इंटरनेट रीसेट करत आहे…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"कनेक्टिव्हिटीसंबंधित समस्यांचे निराकरण करा"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"विमान मोडमध्ये नेटवर्क उपलब्ध आहेत"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"नेटवर्क स्विच करण्यासाठी, इथरनेट केबल डिस्कनेक्ट करा"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"कनेक्ट केलेले असताना नेटवर्क स्विच करू शकत नाही"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"विमान मोड नेटवर्क"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"कनेक्ट केले आहे"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"इंटरनेट ऑटो-कनेक्ट होणार नाही"</string>
@@ -5153,6 +5200,10 @@
     <string name="category_name_color" msgid="937514550918977151">"रंग"</string>
     <string name="category_name_others" msgid="2366006298768550310">"इतर"</string>
     <string name="category_name_general" msgid="7737273712848115886">"साधारण"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"सर्व अ‍ॅप्स पाहा"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"स्मार्ट फॉरवर्डिंग"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"स्मार्ट फॉरवर्डिंग सुरू केले"</string>
@@ -5166,4 +5217,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"फोन नंबर एंटर करा"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"फोन नंबर आढळला नाही."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ओके"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G ला अनुमती द्या"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G मोबाइल कनेक्शन वापरा. आणीबाणी कॉलसाठी, 2G कायम सुरू असते."</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 7bd2fd6..8eea30a 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Kecilkan atau besarkan teks pada skrin."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Kecilkan"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Besarkan"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Gunakan Autoputar"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Teks contoh"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Ahli Sihir Oz yang Menakjubkan"</string>
@@ -96,7 +95,7 @@
     <string name="bluetooth_device" msgid="2217973503732544291">"Peranti Bluetooth tanpa nama"</string>
     <string name="progress_scanning" msgid="2564746192843011826">"Mencari"</string>
     <string name="bluetooth_no_devices_found" msgid="7704539337219953182">"Tiada peranti Bluetooth berdekatan ditemui."</string>
-    <string name="bluetooth_notif_ticker" msgid="209515545257862858">"Permintaan menjadi pasangan Bluetooth"</string>
+    <string name="bluetooth_notif_ticker" msgid="209515545257862858">"Permintaan gandingan Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="1196532269131348647">"Permintaan pasangan"</string>
     <string name="bluetooth_notif_message" msgid="5584717784198086653">"Sentuh untuk berpasangan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_show_received_files" msgid="685424727760622632">"Fail yang diterima"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> cap jari disediakan</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Buka kunci dengan cap jari"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Sediakan cap jari anda"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Gunakan cap jari anda"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Hanya sentuh penderia cap jari untuk membuka kunci telefon anda, membenarkan pembelian atau melog masuk ke apl. Berhati-hati apabila menambahkan cap jari. Satu cap jari yang ditambahkan dapat melakukan mana-mana perkara ini."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Cap jari anda mungkin kurang selamat berbanding dengan corak atau PIN yang kukuh."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Kawalan di tangan anda"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Jangan lupa"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Data yang dirakam oleh Cap Jari disimpan dengan selamat dan tidak sekali-kali dihantar keluar daripada telefon anda. Anda boleh memadamkan data anda pada bila-bila masa dalam Tetapan."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Cap jari anda mungkin kurang selamat berbanding dengan corak atau PIN yang kukuh."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Sekali-sekala, telefon anda akan menggunakan imej cap jari anda yang terbaharu untuk membuat model cap jari yang dipertingkatkan."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Gunakan cap jari anda untuk membuka kunci telefon atau membenarkan pembelian.\n\nPerhatian: Anda tidak boleh menggunakan cap jari untuk membuka kunci peranti ini. Untuk mendapatkan maklumat lanjut, hubungi pentadbir organisasi anda."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Gunakan cap jari anda untuk membuka kunci telefon atau membenarkan pembelian.\n\nPerhatian: Cap jari anda mungkin kurang selamat berbanding corak atau PIN yang kukuh."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Batal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Tidak perlu"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Langkau"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Teruskan"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Setuju"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Langkau"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Seterusnya"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Langkau cap jari?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Langkau"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Batal"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Sentuh penderia"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Sentuh &amp; tahan ikon cap jari"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Penderia terletak di bahagian belakang telefon anda. Gunakan jari telunjuk."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Terdapat pada skrin. Cari cap jari dengan bulatan yang bercahaya."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Penderia cap jari terdapat pada skrin anda. Gerakkan jari anda merentasi skrin untuk mencari penderia cap jari."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustrasi yang memaparkan peranti dan lokasi penderia cap jari"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nama"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Padam"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Sentuh penderia"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Letakkan jari anda pada penderia, kemudian angkat jari itu selepas anda merasa getaran"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Angkat jari, kemudian sentuh lagi"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Angkat jari berulang kali untuk menambahkan beberapa bahagian cap jari anda"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Cap jari ditambahkan"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Apabila anda melihat ikon ini, gunakan cap jari anda untuk pengenalan atau untuk membenarkan pembelian"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Lakukan kemudian"</string>
@@ -727,7 +741,7 @@
     <string name="bluetooth_preference_paired_dialog_internet_option" msgid="4337953030661626289">"Sambungan Internet"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="8247634441638919886">"Papan kekunci"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="8194423860397844579">"Kenalan dan sejarah panggilan"</string>
-    <string name="bluetooth_pairing_dialog_title" msgid="6106058683134173178">"Berpasangan dengan peranti ini?"</string>
+    <string name="bluetooth_pairing_dialog_title" msgid="6106058683134173178">"Gandingkan dengan peranti ini?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="5472835166206721325">"Kongsi buku telefon?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="7516277926581535299">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingin mengakses kenalan dan sejarah panggilan anda."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="1545098121090892788">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingin bpsgn dgn Bluetooth. Apbl dsmbungkn, peranti akn mpunyai akses kps knln dan sjrh pggiln anda."</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Carian"</string>
     <string name="display_settings" msgid="7197750639709493852">"Paparan"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Autoputar skrin"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Mati"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Hidup"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Di - Berasaskan wajah"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Dayakan Pengesanan Wajah"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Warna"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Asli"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Ditingkatkan"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Hidup / Skrin tidak akan dimatikan jika anda melihat pada skrin"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Mati"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Akses kamera diperlukan"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Ketik untuk mengurus kebenaran bagi Perkhidmatan Pemeribadian Peranti"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Menghalang skrin daripada dimatikan jika anda memandang skrin"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Perhatian skrin menggunakan kamera depan untuk melihat sama ada seseorang sedang memandang skrin. Ciri ini berfungsi pada peranti dan imej tidak sekali-kali disimpan atau dihantar kepada Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Hidupkan perhatian skrin"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Apabila skrin gelap, skrin akan dihidupkan untuk pemberitahuan baharu"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Sentiasa papar masa &amp; maklumat"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Penggunaan bateri bertambah"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Teks Huruf Tebal"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Teks huruf tebal"</string>
     <string name="title_font_size" msgid="570613010306330622">"Saiz fon"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Besarkan atau kecilkan teks"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Tetapan kunci kad SIM"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Pengguna lain"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Storan peranti"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Storan mudah alih"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Penggera dan peringatan"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Benarkan untuk menetapkan penggera atau peringatan"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Penggera dan peringatan"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Benarkan apl ini untuk menjadualkan penggera atau peristiwa berdasarkan pemasaan yang lain. Tindakan ini akan membenarkan apl untuk bangkit dan berfungsi walaupun anda tidak menggunakan peranti. Harap maklum bahawa pembatalan kebenaran ini mungkin menyebabkan apl tidak berfungsi, khususnya mana-mana penggera yang telah dijadualkan oleh apl tidak lagi akan berfungsi."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"jadual, penggera, peringatan, peristiwa"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> digunakan daripada <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Digunakan daripada <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Perkhidmatan lokasi"</string>
     <string name="location_title" msgid="5819154746934945021">"Lokasi Saya"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokasi untuk profil kerja"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Akses apl kepada lokasi"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokasi dimatikan"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> daripada <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apl mempunyai akses kepada lokasi</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> daripada <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> apl mempunyai akses kepada lokasi</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Akses lokasi terbaharu"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Lihat butiran"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Tiada aplikasi yang telah meminta lokasi baru-baru ini"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Tiada apl yang mengakses lokasi baru-baru ini"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Penggunaan bateri tinggi"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Penggunaan bateri rendah"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Pengimbasan Wi‑Fi dan Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Pengimbasan Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Benarkan apl dan perkhidmatan mengimbas untuk mengesan rangkaian Wi-Fi pada bila-bila masa, meskipun apabila Wi-Fi dimatikan. Ini dapat digunakan, contohnya, untuk meningkatkan ciri berasaskan lokasi dan perkhidmatan."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Pengimbasan Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Benarkan apl dan perkhidmatan mengimbas untuk mengesan peranti berdekatan pada bila-bila masa, meskipun apabila Bluetooth dimatikan. Ini dapat digunakan, contohnya, untuk meningkatkan ciri berasaskan lokasi dan perkhidmatan."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Perkhidmatan Lokasi"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Perkhidmatan lokasi untuk kerja"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Pengesanan zon waktu lokasi"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Pengesanan zon waktu lokasi"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Membolehkan lokasi peranti digunakan untuk mengesan zon waktu semasa. Tetapan lokasi lain seperti pengimbasan Wi-Fi boleh mempengaruhi ketepatan pengesanan zon waktu."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Hidup"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Mati"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Pengesanan zon waktu automatik dilumpuhkan"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Zon waktu automatik dimatikan"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Pengesanan zon waktu lokasi dilumpuhkan"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Pengesanan zon waktu lokasi tidak disokong"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Perubahan pengesanan zon waktu lokasi tidak dibenarkan"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Dayakan"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Kosongkan storan"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Nyahpasang kemas kini"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Anda telah memilih untuk melancarkan aplikasi ini secara lalai untuk beberapa tindakan."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Beberapa aktiviti yang anda pilih dibuka dalam apl ini secara lalai."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Anda telah memilih untuk membenarkan apl ini membuat widget dan mengakses datanya."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Tiada lalai ditetapkan."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Padam bersih lalai"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Kosongkan pilihan lalai"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Aplikasi ini mungkin tidak direka untuk skrin anda. Anda boleh mengawal bagaimana ia disesuaikan pada skrin anda di sini."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Tanya apabila dilancarkan"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Ukur aplikasi"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Anda boleh menyesuaikan peranti ini mengikut keperluan anda. Ciri kebolehaksesan ini boleh diubah kemudian dalam Tetapan."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Tukar saiz fon"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Pembaca skrin"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio &amp; teks pada skrin"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Sari kata"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Umum"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Paparan"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Teks dan paparan"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Jadikan skrin lebih gelap"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Merah-hijau"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Merah-hijau"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Biru-Kuning"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Kurangkan Kecerahan"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Kurangkan kecerahan"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Jadikan skrin lebih gelap daripada kecerahan minimum telefon anda"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Jadikan skrin lebih gelap daripada kecerahan minimum tablet anda"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Jadikan skrin anda lebih gelap supaya lebih selesa untuk dibaca.&lt;br/&gt;&lt;br/&gt; Tindakan ini dapat membantu ketika: &lt;ol&gt; &lt;li&gt; Kecerahan minimum lalai telefon anda masih terlalu terang&lt;/li&gt; &lt;li&gt; Anda menggunakan telefon anda dalam keadaan gelap, seperti pada waktu malam atau di bilik gelap sebelum tidur&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"wajah"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"cap jari, tambah cap jari"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"malapkan skrin, skrin sentuh, bateri, kecerahan pintar, kecerahan dinamik, kecerahan Automatik"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"malapkan skrin, tidur, bateri, tamat masa, perhatian, paparan, skrin, tanpa aktiviti"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"putar, balikkan, putaran, potret, landskap, orientasi, menegak, mendatar"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"tingkatkan, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, jadual, pemberitahuan, sekat, kesenyapan, getar, tidur, kerja, fokus, bunyi, redam, hari, hari dalam minggu, hujung minggu, malam minggu, acara"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"skrin, masa kunci, tamat masa, skrin kunci"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Nada dering"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Bunyi dan getaran lain"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Pemberitahuan"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Perbualan"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Terbaharu dihantar"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Lihat semua daripada 7 hari yang lalu"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Terperinci"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Umum"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Pemberitahuan kerja"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Pemberitahuan boleh suai"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Keutamaan pemberitahuan mudah suai"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Paparkan dalam bidai tarik turun, bar status &amp; pada skrin kunci"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Sembunyikan pemberitahuan senyap dalam bar status"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Lampu berkelip"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Pemberitahuan pada skrin kunci"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privasi"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Langkau skrin kunci"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Selepas wajah buka kunci, teruskan ke skrin terakhir digunakan"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Skrin kunci, Langkau, Pintas"</string>
@@ -3638,7 +3662,7 @@
     <string name="allow_interruption" msgid="5237201780159482716">"Benarkan gangguan"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"Benarkan apl membuat bunyi, bergetar dan/atau memaparkan pemberitahuan pada skrin"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"Keutamaan"</string>
-    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Ditunjukkan di sebelah atas bahagian perbualan, muncul sebagai gelembung terapung, memaparkan gambar profil pada skrin kunci"</string>
+    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Ditunjukkan di sebelah atas bahagian perbualan, terpapar sebagai gelembung terapung, gambar profil dipaparkan pada skrin kunci"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"<xliff:g id="APP_NAME">%1$s</xliff:g> tidak menyokong kebanyakan ciri perbualan. Anda tidak boleh menetapkan perbualan sebagai keutamaan dan perbualan tidak akan muncul sebagai gelembung terapung."</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"Dalam bidai tarik turun, runtuhkan pemberitahuan kepada satu baris"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"Tiada bunyi atau getaran"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> pemberitahuan seminggu</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Jangan sekali-kali"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Akses pemberitahuan"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Pemberitahuan peranti &amp; apl"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Kawal pemberitahuan yang akan ditunjukkan pada apl dan peranti anda"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Akses ke pemberitahuan profil kerja disekat"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Apl tidak boleh membaca pemberitahuan"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Matikan"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Batal"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Jenis pemberitahuan yang dibenarkan"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Pemberitahuan penting yang sedang berlangsung"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Pemberitahuan perbualan"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Pemberitahuan makluman"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Pemberitahuan senyap"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Masa nyata"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Komunikasi masa nyata daripada apl yang sedang digunakan, navigasi, panggilan telefon dan banyak lagi"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Perbualan"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS dan komunikasi lain"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Lalai"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Pemberitahuan yang mungkin berdering atau bergetar berdasarkan tetapan"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Senyap"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Pemberitahuan yang tidak sekali-kali berbunyi atau bergetar"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Lihat semua apl"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Tukar tetapan pemberitahuan untuk setiap apl yang boleh menghantar pemberitahuan"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Apl yang ditunjukkan pada peranti"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Perkhidmatan pembantu VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Tiada apl terpasang yang telah meminta untuk dijalankan sebagai perkhidmatan pembantu VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Benarkan akses perkhidmatan VR untuk <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Buka secara lalai"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Membuka pautan"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Buka pautan yang disokong"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Pautan yang disokong dibuka dalam apl ini"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Pautan untuk membuka apl ini"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Buka tanpa bertanya"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Pautan yang disokong"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Lalai yang lain"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Pilihan lalai lain"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Tambah pautan"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Apl boleh mengesahkan pautan untuk membuka pautan secara automatik dalam apl. "<annotation id="url">"Ketahui lebih lanjut"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> pautan yang disahkan</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> pautan yang disahkan</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Pautan ini telah disahkan dan dibuka secara automatik dalam apl ini.</item>
+      <item quantity="one">Pautan ini telah disahkan dan dibuka secara automatik dalam apl ini.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Menyemak pautan lain yang disokong…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Batal"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> pautan yang disokong</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> pautan yang disokong</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Tambah"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Dibuka dalam <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> digunakan dalam <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"storan dalaman"</string>
     <string name="storage_type_external" msgid="125078274000280821">"storan luaran"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Kamera tidak dibenarkan"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Tangkapan skrin tidak dibenarkan"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Apl ini tidak boleh dibuka"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Jika anda ingin mengemukakan pertanyaan, hubungi pentadbir IT anda"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Lagi butiran"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Pentadbir anda boleh memantau dan mengurus apl serta data yang berkaitan dengan profil kerja anda, termasuk tetapan, kebenaran, akses korporat, aktiviti rangkaian dan maklumat lokasi peranti."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Pentadbir anda boleh memantau dan mengurus apl serta data yang berkaitan dengan pengguna ini, termasuk tetapan, kebenaran, akses korporat, aktiviti rangkaian dan maklumat lokasi peranti."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 sekatan</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Cara pengiraan data pembawa mungkin berbeza daripada pengiraan peranti"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Kecualikan data yang digunakan oleh rangkaian pembawa"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Kecualikan data yang digunakan oleh rangkaian pembawa"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Tetapkan amaran data"</string>
     <string name="data_warning" msgid="2925054658166062884">"Amaran data"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(dinyahpasang untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(dilumpuhkan untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Perkhidmatan autolengkap"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"auto, lengkap, autolengkap"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Kata laluan"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"auto, isi, autolengkap, kata laluan"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Pastikan anda mempercayai apl ini&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; menggunakan item yang terdapat pada skrin anda untuk menentukan perkara yang boleh dilengkapkan secara automatik."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Autolengkap"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Tahap pengelogan"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Tukar mod pengendalian rangkaian"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Jenis rangkaian pilihan"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Pembawa"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versi tetapan"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versi tetapan pembawa"</string>
     <string name="call_category" msgid="641461844504128789">"Memanggil"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Panggilan video pembawa"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Pilihan sistem"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Keluarkan SIM dan masukkan kad itu kembali. Jika masalah berlanjutan, mulakan semula peranti anda."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Cuba hidupkan SIM sekali lagi. Jika masalah berlanjutan, mulakan semula peranti anda."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Pengaktifan rangkaian"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Pertukaran pembawa"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktif"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Ketik untuk mengemas kini tetapan SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Bertukar kepada <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Mati"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Tunjukkan rangkaian mod pesawat"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Cari dan sambung ke rangkaian dalam mod pesawat."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Cari dan sambung kepada rangkaian Wi-Fi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"pesawat, selamat pesawat"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Panggilan &amp; SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Panggilan Wi-Fi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"tidak tersedia"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tidak tersedia buat sementara waktu"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Tiada SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Pilihan"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Pilihan rangkaian"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Sambungkan kepada rangkaian awam"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"sambungan rangkaian, internet, wayarles, data, wifi, wi-fi, wi fi, selular, mudah alih, pembawa selular, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Lihat rangkaian mod pesawat"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Melihat rangkaian mod pesawat"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Hidupkan rangkaian"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Matikan rangkaian"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Tetapkan semula Internet anda?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Tindakan ini akan menamatkan panggilan telefon anda"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Tindakan ini akan menamatkan panggilan telefon anda"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Menetapkan semula Internet anda…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Betulkan kesambungan"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Rangkaian mod pesawat tersedia"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Untuk menukar rangkaian, putuskan sambungan ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Tidak boleh menukar rangkaian semasa bersambung"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Rangkaian mod pesawat"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Disambungkan"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet tidak akan bersambung secara automatik"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Warna"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Lain-lain"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Umum"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Lihat semua apl"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Pemajuan Pintar"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Pemajuan Pintar Didayakan"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Masukkan nombor Telefon"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Tiada nombor telefon."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Benarkan 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Gunakan sambungan selular 2G. Untuk panggilan kecemasan, 2G sentiasa dihidupkan."</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 56cd69c..bf05dd7 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -36,7 +36,7 @@
     <string name="radioInfo_service_out" msgid="1868347333892403287">"ဆက်သွယ်မှုဧရိယာပြင်ပ"</string>
     <string name="radioInfo_service_emergency" msgid="6838935881091760942">"အရေးပေါ်ခေါ်ဆိုမှုများသာ"</string>
     <string name="radioInfo_service_off" msgid="6184928420860868571">"ရေဒီယို ပိတ်ထားသည်"</string>
-    <string name="radioInfo_roaming_in" msgid="8892550453644088692">"ပြင်ပကွန်ရက်နှင့် ချိတ်ဆက်ခြင်း"</string>
+    <string name="radioInfo_roaming_in" msgid="8892550453644088692">"ပြင်ပကွန်ရက်သုံးခြင်း"</string>
     <string name="radioInfo_roaming_not" msgid="3137594549464975054">"ပြင်ပကွန်ရက်နှင့် ချိတ်ဆက်မထားပါ"</string>
     <string name="radioInfo_data_disconnected" msgid="362604130117666924">"ချိတ်ဆက်မှုပြတ်တောက်သည်"</string>
     <string name="radioInfo_data_connecting" msgid="7280819598028917888">"ချိတ်ဆက်နေသည်"</string>
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"မျက်နှာပြင်ပေါ်ရှိ စာလုံးကို ပိုသေးအောင် သို့မဟုတ် ပိုကြီးအောင် လုပ်ပါ။"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"ပိုသေးအောင် ပြုလုပ်ပါ"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"ပိုကြီးအောင် ပြုလုပ်ပါ"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"အလိုအလျောက်လှည့်ခြင်းကို အသုံးပြုခြင်း"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"နမူနာ စာသား"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Oz ၏အံ့ဖွယ်ဝိဇ္ဇာ"</string>
@@ -244,9 +243,9 @@
     <string name="radio_controls_summary" msgid="9028430178697624501">"Wi-Fi ၊ ဘလူးတုသ်၊ လေယာဉ်ပေါ်အသုံးပြုစနစ်၊ မိုဘိုင်းလ်ကွန်ရက်များနှင့် VPN များကို စီမံခန့်ခွဲရန်"</string>
     <string name="cellular_data_summary" msgid="6551434804367912367">"မိုဘိုင်းကွန်ရက်တွင် ဒေတာသုံးခွင့်ပြုပါ"</string>
     <string name="allow_data_usage_title" msgid="2645963379925196671">"ရိုမင်း လုပ်ချိန်မှာ ဒေတာ သုံးစွဲမှု ခွင့်ပြုရန်"</string>
-    <string name="roaming" msgid="3055365654530847985">"ပြင်ပကွန်ရက်နှင့် ချိတ်ဆက်ခြင်း"</string>
-    <string name="roaming_enable" msgid="7845716016861535340">"ရုန်းမင်းဖြစ်နေလျှင် ဒေတာဝန်ဆောင်မှုများကို ချိတ်ဆက်ပါ"</string>
-    <string name="roaming_disable" msgid="729512894708689604">"ရုန်းမင်းဖြစ်နေလျှင် ဒေတာဝန်ဆောင်မှုများကို ချိတ်ဆက်ပါ"</string>
+    <string name="roaming" msgid="3055365654530847985">"ပြင်ပကွန်ရက်သုံးခြင်း"</string>
+    <string name="roaming_enable" msgid="7845716016861535340">"ပြင်ပကွန်ရက်သုံးလျှင် ဒေတာဝန်ဆောင်မှုများကို ချိတ်ဆက်ပါ"</string>
+    <string name="roaming_disable" msgid="729512894708689604">"ပြင်ပကွန်ရက်သုံးလျှင် ဒေတာဝန်ဆောင်မှုများကို ချိတ်ဆက်ပါ"</string>
     <string name="roaming_reenable_message" msgid="5150423860521673540">"ဒေတာဆက်သွယ်မှုပြတ်တောက်သွားပါသည် အဘယ်ကြောင့်ဆိုသော် သင့်အိမ်၏ကွန်ယက်မှထွက်ကာ ဒေတာရုန်းမင်းကွန်ယက်ကိုလဲပိတ်ထားသောကြောင့်ဖြစ်သည်"</string>
     <string name="roaming_turn_it_on_button" msgid="6999283810847157816">"ဖွင့်မည်"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"ပြင်ပကွန်ရက်နှင့် ချိတ်ဆက်သော အသုံးပြုခများ ကျသင့်နိုင်သည်။"</string>
@@ -405,15 +404,21 @@
       <item quantity="one">လက်ဗွေ <xliff:g id="COUNT_0">%1$d</xliff:g> ခု သတ်မှတ်ရန်</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"လက်ဗွေသုံး၍ ဖွင့်ပါ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"သင်၏လက်ဗွေကို စနစ်ထည့်သွင်းခြင်း"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"သင့်လက်ဗွေကို သုံးပါ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန်၊ ဝယ်ယူမှုများကို ခွင့်ပြုရန် သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန် လက်ဗွေအာရုံခံကိရိယာကိုသာ ထိလိုက်ပါ။ မည်သူ၏ လက်ဗွေ ထည့်သွင်းမည်ကို သေချာစဉ်းစားပါ။ ထည့်လိုက်သည့် လက်ဗွေတစ်ခုသည် ဤအရာများအားလုံးကို လုပ်ဆောင်နိုင်ပါမည်။"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"သင်၏ လက်ဗွေသည် ခိုင်မာမှုရှိသော ပုံစံ သို့မဟုတ် ပင်နံပါတ်လောက် မလုံခြုံနိုင်ပါ။"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"သင့်ထိန်းချုပ်မှုအောက်တွင် ရှိပါသည်"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"သတိပြုရန်"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"‘လက်ဗွေ’ ဖြင့် မှတ်တမ်းတင်ထားသည့် ဒေတာကို သင့်ဖုန်းတွင်သာ လုံခြုံစွာ သိမ်းထားသည်။ သင့်ဒေတာကို ‘ဆက်တင်များ’ တွင် အချိန်မရွေး ဖျက်နိုင်သည်။"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"သင်၏ လက်ဗွေသည် ခိုင်မာမှုရှိသော ပုံစံ သို့မဟုတ် ပင်နံပါတ်လောက် မလုံခြုံနိုင်ပါ။"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"သင့်ဖုန်းက ပိုမိုကောင်းမွန်သည့် လက်ဗွေနမူနာများပြုလုပ်ရန် သင်၏ မကြာသေးမီက လက်ဗွေပုံများကို အခါအားလျော်စွာ အသုံးပြုပါမည်။"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန် သို့မဟုတ် ဝယ်ယူမှုများကို ခွင့်ပြုပေးရန် သင့်လက်ဗွေကို အသုံးပြုပါ။\n\nမှတ်ချက်- ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန် သင့်လက်ဗွေကို အသုံးမပြုနိုင်ပါ။ အသေးစိတ်အချက်များအတွက် သင့်အဖွဲ့အစည်း၏ စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန် သို့မဟုတ် ဝယ်ယူမှုများကို ခွင့်ပြုပေးရန် သင့်လက်ဗွေကို အသုံးပြုပါ။\n\nမှတ်ချက်- သင့်လက်ဗွေသည် ခိုင်မာသည့်ပုံစံ သို့မဟုတ် ပင်နံပါတ်တို့လောက် လုံခြုံမှုမရှိပါ။"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"မလုပ်တော့"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"မလိုပါ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"ကျော်ရန်"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ဆက်လုပ်ရန်"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"သဘောတူရန်"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ကျော်ပါ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ရှေ့သို့"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"လက်ဗွေထည့်သွင်းမှု ကျော်မလား။"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"ကျော်ရန်"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"မလုပ်တော့"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"အာရုံခံကိရိယာကို ထိပါ"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"လက်ဗွေသင်္ကေတကို တို့ထိ၍ဖိထားပါ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"၎င်းသည် သင့်ဖုန်း၏ ကျောဘက်တွင်ရှိပါသည်။ လက်ညှိုးကို အသုံးပြုပါ။"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"ဖန်သားပြင်ပေါ်တွင် ရှိပါသည်။ တောက်ပနေသောစက်ဝိုင်းနှင့် လက်ဗွေကို ရှာဖွေပါ။"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"လက်ဗွေအာရုံခံကိရိယာသည် သင့်စခရင်ပေါ်တွင်ရှိသည်။ ၎င်းကိုရှာရန် သင့်လက်ချောင်းကို စခရင်ပေါ်တွင် ရွှေ့ပါ။"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"စက်နှင့် လက်ဗွေအာရုံခံကိရိယာကို တည်နေရာနှင့်အတူ သရုပ်ဖော်ပုံ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"အမည်"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"ဖျက်ရန်"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"အာရုံခံကိရိယာကို ထိပါ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"သင့်လက်ချောင်းကို အာရုံခံကိရိယာပေါ်သို့ တင်လိုက်ပြီး တုန်ခါမှုကို ခံစားရချိန်တွင် ပြန်ရုပ်လိုက်ပါ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"မြှောက်ပါ၊ ထို့နောက် ပြန်ထိပါ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"လက်ဗွေ၏ အစိတ်အပိုင်းအမျိုးမျိုးကို ထည့်ရန်အတွက် သင့်လက်ချောင်းကို အကြိမ်ကြိမ် ပြန်မြှောက်ပါ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"လက်ဗွေကို ထည့်ပြီးပါပြီ"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"ဤသင်္ကေတကို မြင်ပါက အထောက်အထားတင်ပြရန် သို့မဟုတ် ဝယ်ယူမှုများကို အတည်ပြုရန် သင့်လက်ဗွေကို အသုံးပြုပါ"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"နောက်မှလုပ်ရန်"</string>
@@ -451,9 +465,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"သင့်တက်ဘလက်ကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို ထည့်သွင်းရန် ဖုန်းမျက်နှာပြင် လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"သင့်ကိရိယာကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို ထည့်သွင်းရန် ဖုန်းမျက်နှာပြင် လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"သင့်ဖုန်းကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို ထည့်သွင်းရန် ဖုန်းမျက်နှာပြင် လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
-    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"သင့်တက်ဘလက်ကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
-    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"သင့်ကိရိယာကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
-    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"သင့်ဖုန်းကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"သင့်တက်ဘလက်ကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝမက်ထရစ် အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"သင့်ကိရိယာကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝမက်ထရစ် အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"သင့်ဖုန်းကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝမက်ထရစ် အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"ပင်နံပါတ်သတ်မှတ်မှု ကျော်မလား။"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"စကားဝှက် ထည့်ခြင်း ကျော်မလား။"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ပုံစံ ထည့်သွင်းမှု ကျော်မလား။"</string>
@@ -558,11 +572,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"မျက်နှာမှတ် သော့ဖွင့်ခြင်း + စကားဝှက်"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"မျက်နှာမှတ် သော့ဖွင့်ခြင်းမပါဘဲ ရှေ့ဆက်ရန်"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"သင့်မျက်နှာကို အသုံးပြုပြီး သင့်ဖုန်းကို လော့ခ်ဖွင့်နိုင်ပါသည်။ လုံခြုံရေးအရ ဤနည်းလမ်းက အရန်မျက်နှာပြင်လော့ခ်တစ်ခု လိုအပ်ပါသည်။"</string>
-    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ + ပုံစံ"</string>
-    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ + ပင်နံပါတ်"</string>
-    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ + စကားဝှက်"</string>
-    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ မပါဘဲ ရှေ့ဆက်ရန်"</string>
-    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ သုံး၍ ဖုန်းကို ဖွင့်နိုင်သည်။ လုံခြုံရေးအရ ဤနည်းလမ်းအတွက် အရန်ဖုန်းမျက်နှာပြင်လော့ခ်စနစ်တစ်ခု လိုအပ်သည်။"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ဇီဝမက်ထရစ် အချက်အလက်များ + ပုံစံ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ဇီဝမက်ထရစ် အချက်အလက်များ + ပင်နံပါတ်"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ဇီဝမက်ထရစ် အချက်အလက်များ + စကားဝှက်"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ဇီဝမက်ထရစ် အချက်အလက်များ မပါဘဲ ရှေ့ဆက်ရန်"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ဇီဝမက်ထရစ် အချက်အလက်များ သုံး၍ ဖုန်းကို ဖွင့်နိုင်သည်။ လုံခြုံရေးအရ ဤနည်းလမ်းအတွက် အရန်ဖုန်းမျက်နှာပြင်လော့ခ်စနစ်တစ်ခု လိုအပ်သည်။"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"စီမံခန့်ခွဲသူ၊ အသွင်ဝှက်ခြင်း မူဝါဒ သို့မဟုတ် အထောက်အထား သိုလှောင်ခန်းက ပိတ်ထားပါသည်"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"မရှိ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ပွတ်ဆွဲရန်"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"ရှာဖွေခြင်း"</string>
     <string name="display_settings" msgid="7197750639709493852">"ဖန်သားပြင် ပြသမှု"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"မျက်နှာပြင်ကို အော်တိုလှည့်ရန်"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"ပိတ်ရန်"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"ဖွင့်ရန်"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"ဖွင့်ရန် - မျက်နှာအခြေခံ"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"မျက်နှာကိုမှတ်မိခြင်း ဖွင့်ရန်"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"အရောင်များ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"သဘာဝ"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"အရောင်တင်ထားသည်"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ဖွင့်ထားသည် / ၎င်းကို သင်ကြည့်နေလျှင် မျက်နှာပြင် ပိတ်မည်မဟုတ်ပါ"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"ပိတ်ထားသည်"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"ကင်မရာသုံးခွင့် လိုအပ်သည်"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"\'စိတ်ကြိုက် စက်ဝန်ဆောင်မှုများ\' အတွက် ခွင့်ပြုချက်များကို စီမံခန့်ခွဲရန် တို့ပါ"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"ကြည့်နေပါက ဖန်သားပြင်ပိတ်သွားခြင်း မဖြစ်စေပါ"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"\'ဖန်သားပြင်ကို အာရုံစိုက်ခြင်း\' က တစ်ယောက်ယောက် ဖန်သားပြင်ကို ကြည့်နေခြင်းရှိမရှိ ရှေ့ကင်မရာ အသုံးပြု၍ စစ်ဆေးသည်။ ၎င်းသည် စက်ပစ္စည်းပေါ်တွင် လုပ်ဆောင်ခြင်းဖြစ်ပြီး ပုံများကို သိမ်းခြင်း သို့မဟုတ် Google သို့ပို့ခြင်းတို့ မပြုလုပ်ပါ။"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"\'ဖန်သားပြင်အာရုံစိုက်မှု\' ဖွင့်ခြင်း"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"ဖန်သားပြင်မှောင်နေသည့်အခါ ၎င်းက အကြောင်းကြားချက်အသစ်များအတွက် ပွင့်ပေးသည်"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"အချိန်နှင့် အချက်အလက်အမြဲပြရန်"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ဘက်ထရီ အသုံးပြုမှု များလာသည်"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"စာလုံးထူ စာသား"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"စာလုံးထူ စာသား"</string>
     <string name="title_font_size" msgid="570613010306330622">"စာလုံးအရွယ်အစား"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"စာလုံးကို ပိုကြီးအောင် သို့မဟုတ် ပိုသေးအောင်ပြုလုပ်ပါ"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"ဆင်းမ်ကဒ် လော့ခ်ဆက်တင်များ"</string>
@@ -1401,7 +1414,7 @@
     <string name="status_esim_id" msgid="5158916796362809133">"EID"</string>
     <string name="status_service_state" msgid="1693424422121058791">"ဝန်ဆောင်မှု အခြေအနေ"</string>
     <string name="status_signal_strength" msgid="7644525712554444359">"ထုတ်လွင့်မှုအား"</string>
-    <string name="status_roaming" msgid="1253597174715663778">"ပြင်ပကွန်ရက်နှင့် ချိတ်ဆက်ခြင်း"</string>
+    <string name="status_roaming" msgid="1253597174715663778">"ပြင်ပကွန်ရက်သုံးခြင်း"</string>
     <string name="status_operator" msgid="4335640583552058491">"ကွန်ရက်"</string>
     <string name="status_wifi_mac_address" msgid="4447611754614388914">"Wi-Fi ၏ MAC လိပ်စာ"</string>
     <string name="status_device_wifi_mac_address" msgid="1896121694334176494">"စက်ပစ္စည်း Wi‑Fi MAC လိပ်စာ"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"အခြားအသုံးပြုသူများ"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"စက်ပစ္စည်းသိုလှောင်မှု"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"သယ်ယူသွားနိုင်သော သိုလှောင်ရုံ"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"နှိုးစက်နှင့် သတိပေးချက်များ"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"နှိုးစက် (သို့) သတိပေးချက်များ သတ်မှတ်ခွင့်ပြုရန်"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"နှိုးစက်နှင့် သတိပေးချက်များ"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"နှိုးစက်သတ်မှတ်ရန် (သို့) အချိန်သတ်မှတ်ချက်ပါသည့် အစီအစဉ်များဆွဲရန် ဤအက်ပ်ကို ခွင့်ပြုပါ။ ၎င်းက စက်ကို သင်အသုံးမပြုသော်လည်း အက်ပ်ကို နှိုးရန်နှင့် အလုပ်လုပ်နေရန် ခွင့်ပြုမည်။ ဤခွင့်ပြုချက်ကို ရုတ်သိမ်းခြင်းက အက်ပ်ကို ချွတ်ယွင်းစေမည်ဖြစ်ကြောင်း သတိပြုပါ၊ အထူးသဖြင့် အက်ပ်က သတ်မှတ်ထားသော မည်သည့်နှိုးစက်မျှ အလုပ်မလုပ်တော့ပါ။"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"အချိန်ဇယား၊ နှိုးစက်၊ သတိပေးချက်၊ အစီအစဉ်"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g> အသုံးပြုပြီး၏"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> အား အသုံးပြုပြီး၏"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"တည်နေရာဝန်ဆောင်မှုများ"</string>
     <string name="location_title" msgid="5819154746934945021">"ကျွန်ုပ်၏တည်နေရာ"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"အလုပ်ပရိုဖိုင်အတွက် တည်နေရာ"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"တည်နေရာကို အက်ပ်အသုံးပြုခွင့်"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"တည်နေရာကို ပိတ်ထားသည်"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> အက်ပ် <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ခုအနက် <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ခုက တည်နေရာ ဝင်သုံးခွင့်ရှိပါသည်</item>
       <item quantity="one"> အက်ပ် <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> ခုအနက် <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> ခုက တည်နေရာ ဝင်သုံးခွင့်ရှိပါသည်</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"မကြာသေးမီက တည်နေရာအသုံးပြုခွင့်"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"အသေးစိတ်ကြည့်ရန်"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"လတ်တလောတွင် မည်သည့်အပလီကေးရှင်းမှ တည်နေရာကို တောင်းခံမှုမရှိပါ။"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"မည်သည့်အက်ပ်မျှ တည်နေရာကို လတ်တလော ဝင်သုံးမထားပါ"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ဘက်ထရီအသုံးပြုမှုမြင့်သော"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ဘက်ထရီအသုံးပြုမှုနိမ့်သော"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi နှင့် ဘလူးတုသ် ရှာဖွေခြင်း"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi ရှာဖွေခြင်း"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi-Fi ကို ပိတ်ထားလျှင်ပင် အနီးအနားရှိ Wi-Fi ကွန်ရက်များကို အချိန်မရွေးရှာဖွေရန် အက်ပ်များအား ခွင့်ပြုပါ။ ဥပမာအားဖြင့် ၎င်းကို တည်နေရာအခြေပြု ဝန်ဆောင်မှုနှင့် အခြားဝန်ဆောင်မှုများ တိုးတက်လာစေရန် အသုံးပြုနိုင်ပါသည်။"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ဘလူးတုသ်ရှာဖွေနေသည်"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ဘလူးတုသ်ကို ပိတ်ထားလျှင်ပင် အနီးအနားရှိ စက်ပစ္စည်းများကို အချိန်မရွေးရှာဖွေရန် အက်ပ်များအား ခွင့်ပြုပါ။ ဥပမာအားဖြင့် ၎င်းကို တည်နေရာအခြေပြု ဝန်ဆောင်မှုနှင့် အခြားဝန်ဆောင်မှုများ တိုးတက်လာစေရန် အသုံးပြုနိုင်ပါသည်။"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"တည်နေရာဝန်ဆောင်မှုများ"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"အလုပ်အတွက် တည်နေရာဝန်ဆောင်မှုများ"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"တည်နေရာဖြင့် ဒေသစံတော်ချိန်ရှာဖွေခြင်း"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"တည်နေရာဖြင့် ဒေသစံတော်ချိန်ရှာဖွေခြင်း"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"လက်ရှိဒေသစံတော်ချိန်ကို ရှာဖွေရာတွင် အသုံးပြုရန် ဤစက်၏တည်နေရာကို ခွင့်ပြုပါ။ Wi-Fi ရှာဖွေခြင်း ကဲ့သို့သော အခြား တည်နေရာပြ ဆက်တင်များက ဒေသစံတော်ချိန်ရှာဖွေခြင်း၏ တိကျမှန်ကန်မှုကို သက်ရောက်မှုရှိနိုင်သည်။"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ဖွင့်ထားသည်"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ပိတ်ထားသည်"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ဒေသစံတော်ချိန် အလိုအလျောက် ရှာဖွေခြင်းကို ပိတ်ထားသည်"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"အလိုအလျောက် ဒေသစံတော်ချိန်ကို ပိတ်ထားသည်"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"တည်နေရာဖြင့် ဒေသစံတော်ချိန်ရှာဖွေခြင်းကို ပိတ်ထားသည်"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"တည်နေရာဖြင့် ဒေသစံတော်ချိန်ရှာဖွေခြင်းကို ပံ့ပိုးမထားပါ"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"တည်နေရာဖြင့် ဒေသစံတော်ချိန်ရှာဖွေခြင်း အပြောင်းအလဲများကို ခွင့်ပြုမထားပါ"</string>
@@ -1817,9 +1836,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"မျက်နှာမှတ် သော့ဖွင့်ရန် စကားဝှက်ထည့်ပါ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"မျက်နှာမှတ် သော့ဖွင့်ရန် ပုံစံသတ်မှတ်ပါ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"မျက်နှာမှတ် သော့ဖွင့်ရန် ပင်နံပါတ်ထည့်ပါ"</string>
-    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ဇီဝအချက်များသုံးရန် စကားဝှက်သတ်မှတ်ပါ"</string>
-    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ဇီဝအချက်များသုံးရန် ပုံစံသတ်မှတ်ပါ"</string>
-    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ဇီဝအချက်များသုံးရန် ပင်နံပါတ်သတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ဇီဝမက်ထရစ် သုံးရန် စကားဝှက်သတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ဇီဝမက်ထရစ် သုံးရန် ပုံစံသတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ဇီဝမက်ထရစ် သုံးရန် ပင်နံပါတ်သတ်မှတ်ပါ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"စကားဝှက် မေ့နေပါလား။"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"ပုံစံ မေ့နေပါသလား။"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"ပင်နံပါတ် မေ့နေပါသလား။"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"ရနိုင်သည်"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"သိုလှောင်ခန်း ရှင်းလင်းရန်"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"အဆင့်မြင့်မှုများကိုဖယ်ထုတ်မည်လား?"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"မူလကတည်းမှ တစ်ချို့လုပ်ဆောင်ချက်များအတွက် ဤအပလီကေးရှင်းကို ဖွင့်ရန်သင်ရွေး ချယ်ထားပြီးသားဖြစ်သည်"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"သင်ရွေးချယ်ထားသော အချို့လုပ်ဆောင်ချက်များကို ဤအက်ပ်တွင် မူရင်းသတ်မှတ်ချက်အရ ဖွင့်သည်။"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"၀ဒ်ဂျက်များ ဖန်တီးရန်နှင့် ၎င်းတို့၏ အချက်အလက်များရယူရန် ဤအပလီကေးရှင်းကို ခွင့်ပြုကြောင်း သင်ရွေးချယ်ထားသည်။"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"မူရင်း သတ်မှတ်မထားပါ။"</string>
-    <string name="clear_activities" msgid="341345438786077236">"မူရင်းများကို ရှင်းလင်းခြင်း"</string>
+    <string name="clear_activities" msgid="488089228657585700">"မူရင်းသတ်မှတ်ချက်များကို ရှင်းရန်"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"သင့်ဖန်သားပြင်အတွက် ဤအပ်ပလီကေးရှင်းမှာ လိုက်ဖက်အောင် လုပ်ထားခြင်း မရှိနိုင်ပါ။ ဤနေရာတွင် သင့်ဖန်သားပြင်နှင့်ကိုက်ညီအောင် ထိန်းချုပ်နိုင်ပါသည်။"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"ဖွင့်သည့်အခါ မေးမြန်းရန်။"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"စကေးအပလီကေးရှင်း"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"သင့်လိုအပ်ချက်များနှင့် ကိုက်ညီမှုရှိစေရန် ဤစက်ပစ္စည်းကို သင့်စိတ်ကြိုက်ပြင်ဆင်နိုင်သည်။ သုံးရလွယ်သည့် ဤဝန်ဆောင်မှုများကို ဆက်တင်များထဲ၌ နောက်ပိုင်းတွင် ပြောင်းလဲနိုင်သည်။"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"စာလုံးအရွယ်အစားပြောင်းပါ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"မျက်နှာပြင် ဖတ်စနစ်များ"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"အသံနှင့် ဖန်သားပြင်ပေါ်ရှိ စာသား"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"စာတန်းများ"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"အသံ"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"အထွေထွေ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ဖန်သားပြင် ပြသမှု"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"စာသားနှင့် ပြကွက်"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ဖန်သားပြင်ကို ပိုမှောင်အောင်လုပ်ခြင်း"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"အနီ-အစိမ်း"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"အနီ-အစိမ်း"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"အပြာ-အဝါ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"တောက်ပမှုကို လျှော့ခြင်း"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"တောက်ပမှုကို လျှော့ခြင်း"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ဖန်သားပြင်ကို သင့်ဖုန်း၏ အနိမ့်ဆုံးတောက်ပမှုထက် ပိုမှောင်အောင်လုပ်သည်"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ဖန်သားပြင်ကို သင့်တက်ဘလက်၏ အနိမ့်ဆုံးတောက်ပမှုထက် ပိုမှောင်အောင်လုပ်သည်"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"စာဖတ်ရာတွင် အနေတော်ဖြစ်စေရန် သင့်ဖန်သားပြင်ကို ပိုမှောင်အောင်လုပ်ပါ။&lt;br/&gt;&lt;br/&gt; ၎င်းက အောက်ပါတို့တွင် အသုံးဝင်သည်- &lt;ol&gt; &lt;li&gt; သင့်ဖုန်း၏ မူလ အနိမ့်ဆုံးတောက်ပမှုက အလွန်လင်းနေသောအခါ&lt;/li&gt; &lt;li&gt; ညအချိန် (သို့) မအိပ်မီ အမှောင်ခန်းကဲ့သို့ မှောင်သည့်အခြေအနေမျိုးတွင် ဖုန်းသုံးနေသောအခါ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -2913,7 +2934,7 @@
     <string name="data_usage_enable_mobile" msgid="1996943748103310201">"မိုဘိုင်းဒေတာ"</string>
     <string name="data_usage_enable_3g" msgid="2818189799905446932">"2G-3Gဒေတာ"</string>
     <string name="data_usage_enable_4g" msgid="1526584080251993023">"4Gဒေတာ"</string>
-    <string name="data_roaming_enable_mobile" msgid="5745287603577995977">"ပြင်ပကွန်ရက်နှင့် ချိတ်ဆက်ခြင်း"</string>
+    <string name="data_roaming_enable_mobile" msgid="5745287603577995977">"ပြင်ပကွန်ရက်သုံးခြင်း"</string>
     <string name="data_usage_forground_label" msgid="5762048187044975428">"အရှေ့ပိုင်း:"</string>
     <string name="data_usage_background_label" msgid="5363718469293175279">"နောက်ခံ:"</string>
     <string name="data_usage_app_settings" msgid="5693524672522122485">"အက်ပ်ဆက်တင်များ"</string>
@@ -3103,7 +3124,7 @@
     <string name="user_guest" msgid="4545590092001460388">"ဧည့်သည်"</string>
     <string name="user_exit_guest_title" msgid="2653103120908427236">"ဧည့်သည်ကို ဖယ်ထုတ်ရန်"</string>
     <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"ဧည့်သည်ကို ဖယ်ထုတ်လိုက်ရမလား?"</string>
-    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"ဒီချိတ်ဆက်မှု ထဲက အက်ပ်များ အားလုံး နှင့် ဒေတာကို ဖျက်ပစ်မည်။"</string>
+    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"ဤချိတ်ဆက်မှုမှ အက်ပ်နှင့် ဒေတာအားလုံးကို ဖျက်ပါမည်။"</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"ဖယ်ထုတ်ပါ"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"ဖုန်းခေါ်ဆိုမှုများ ဖွင့်မည်"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"ဖုန်းခေါ်ဆိုမှုနှင့် SMS ဖွင့်မည်"</string>
@@ -3323,7 +3344,7 @@
     <string name="keywords_assist_gesture_launch" msgid="7710762655355161924">"ဟန်"</string>
     <string name="keywords_face_unlock" msgid="545338452730885392">"မျက်နှာ၊ လော့ခ်ဖွင့်ခြင်း၊ အထောက်အထား စိစစ်ခြင်း၊ လက်မှတ်ထိုးဝင်ခြင်း"</string>
     <string name="keywords_imei_info" msgid="8848791606402333514">"imei, meid, min, prl ဗားရှင်း၊ imei sv"</string>
-    <string name="keywords_sim_status" msgid="8784456547742075508">"ကွန်ရက်၊ မိုဘိုင်းကွန်ရက် အခြေအနေ၊ ဝန်ဆောင်မှု အခြေအနေ၊ လိုင်းဆွဲအား၊ မိုဘိုင်းကွန်ရက် အမျိုးအစား၊ ပြင်ပကွန်ရက်နှင့် ချိတ်ဆက်ခြင်း၊ iccid၊ eid"</string>
+    <string name="keywords_sim_status" msgid="8784456547742075508">"ကွန်ရက်၊ မိုဘိုင်းကွန်ရက် အခြေအနေ၊ ဝန်ဆောင်မှု အခြေအနေ၊ လိုင်းဆွဲအား၊ မိုဘိုင်းကွန်ရက် အမျိုးအစား၊ ပြင်ပကွန်ရက်သုံးခြင်း၊ iccid၊ eid"</string>
     <string name="keywords_model_and_hardware" msgid="4723665865709965044">"အမှတ်စဉ်၊ ဟာ့ဒ်ဝဲ ဗားရှင်း"</string>
     <string name="keywords_android_version" msgid="1629882125290323070">"android လုံခြုံရေး ပက်ချ် အဆင့်၊ baseband ဗားရှင်း၊ kernel ဗားရှင်း"</string>
     <string name="keywords_dark_ui_mode" msgid="6465231409128452489">"အပြင်အဆင်၊ ဖျော့သော၊ မှောင်သော၊ မုဒ်"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"မျက်နှာ"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"လက်ဗွေ၊ လက်ဗွေထည့်ရန်"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"မျက်နှာပြင် အမှိန်၊ တို့ထိမျက်နှာပြင်၊ ဘက်ထရီ၊ အဆင့်မြင့် တောက်ပမှု၊ အားကောင်းသော တောက်ပမှု၊ အလိုအလျောက် တောက်ပမှု"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"ဖန်သားပြင် အရောင်မှိန်ခြင်း၊ နားခြင်း၊ ဘက်ထရီ၊ ခဏရပ်ချိန်၊ သတိပြုရန်၊ ဖန်သားပြင်မြင်ကွင်း၊ ဖန်သားပြင်၊ အသုံးပြုမှုမရှိခြင်း"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"လှည့်သည်၊ လှန်ခြင်း၊ လှည့်ခြင်း၊ ဒေါင်လိုက်၊ အလျားလိုက်၊ အနေအထား၊ ဒေါင်လိုက်၊ ရေပြင်ညီ"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"အဆင့်မြှင့်တင်ရန်၊ android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd၊ အစီအစဉ်၊ အကြောင်းကြားချက်များ၊ အသံတိတ်၊ တုန်ခါခြင်း၊ နားခြင်း၊ အလုပ်၊ ပြတ်သားအောင် ချိန်ခြင်း၊ အသံ၊ အသံတိတ်ရန်၊ နေ့၊ ကြားရက်၊ စနေတနင်္ဂနွေ၊ ကြားရက်ည၊ အစီအစဉ်"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"မျက်နှာပြင်၊ လော့ခ်ချချိန်၊ သက်တမ်းကုန်ချိန်၊ လော့ခ်မျက်နှာပြင်"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ဖုန်းမြည်သံများ"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"အခြားအသံနှင့် တုန်ခါမှုများ"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"အကြောင်းကြားချက်များ"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"စကားဝိုင်း"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"လတ်တလော ပို့ထားသည်"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ပြီးခဲ့သည့် ၇ ရက်မှ အရာအားလုံးကို ကြည့်ရန်"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"အဆင့်မြင့်"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"အထွေထွေ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"အလုပ်သတိပေးချက်များ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"အလိုက်သင့် အကြောင်းကြားချက်များ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"အကြောင်းကြားချက် အလိုက်သင့်ဦးစားပေးမှု"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"ဆွဲချစာရင်း၊ အခြေအနေပြနေရာနှင့် လော့ခ်ချထားသည့် မျက်နှာပြင်တွင် ပြသပါ"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"အခြေအနေပြဘားရှိ အသံတိတ် အကြောင်းကြားချက်ကို ဖျောက်ပါ"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"မီး မှိတ်တုတ်မှိတ်တုတ်လုပ်ပါ"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"လော့ခ်ချထားချိန် အသိပေးချက်"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ကန့်သတ်ဆက်တင်"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"လော့ခ်ချမျက်နှာပြင် ကျော်ရန်"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"မျက်နှာမှတ်သော့ဖွင့်ပြီးပါက နောက်ဆုံးသုံးခဲ့သည့် မျက်နှာပြင်သို့ သွားပါ"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"လော့ခ်ချ မျက်နှာပြင်၊ လော့ခ်ချမျက်နှာပြင်၊ ကျော်ရန်"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">တစ်ပတ်လျှင် အကြောင်းကြားချက်~<xliff:g id="NUMBER_0">%d</xliff:g> ခု</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"ဘယ်တော့မှ"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"အကြောင်းကြားချက် ရယူခြင်း"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"စက်ပစ္စည်းနှင့် အက်ပ်အကြောင်းကြားချက်များ"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"သင့်အက်ပ်နှင့် စက်ပစ္စည်းများပေါ်တွင် မည်သည့်အကြောင်းကြားချက်များ ပြသမည်ကို ထိန်းချုပ်ပါ"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"အလုပ်ပရိုဖိုင် အကြောင်းကြားချက်များသို့ ဝင်ရောက်ခြင်းကို ပိတ်ထားသည်"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"အကြောင်းကြားချက်များကို အပလီကေးရှင်းများက မဖတ်နိုင်ပါ။"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3675,18 +3700,18 @@
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> အတွက်အကြောင်းကြားချက် အသုံးပြုခွင့်ကို ပိတ်လိုက်လျှင်၊ Do Not Disturb ကိုအသုံးပြုခွင့်လည်း ပိတ်လိုက်ပါမည်။"</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"ပိတ်ရန်"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"မလုပ်တော့"</string>
-    <string name="notification_listener_type_title" msgid="2791552789364336733">"အကြောင်းကြားချက် အမျိုးအစားများကို ခွင့်ပြုထားသည်"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"အရေးကြီးသည့် လက်ရှိအကြောင်းကြားချက်များ"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"စကားဝိုင်း အကြောင်းကြားချက်များ"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"သတိပေးသည့် အကြောင်းကြားချက်များ"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"အကြောင်းကြားချက်များကို အသံတိတ်ခြင်း"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notification_listener_type_title" msgid="2791552789364336733">"ခွင့်ပြုသည့် အကြောင်းကြားချက်များ"</string>
+    <string name="notif_type_ongoing" msgid="135675014223627555">"အချိန်နှင့် တစ်ပြေးညီ"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"အသုံးပြုနေသောအက်ပ်များမှ အချိန်နှင့် တစ်ပြေးညီ ဆက်သွယ်ရေး၊ လမ်းညွှန်မှု၊ ဖုန်းခေါ်ဆိုမှုများ စသည်"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"စကားဝိုင်းများ"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS စာတိုစနစ်နှင့် အခြားဆက်သွယ်ရေးများ"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"မူရင်း"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"ဆက်တင်များပေါ် အခြေခံ၍ အသံမြည်နိုင်သော (သို့) တုန်ခါနိုင်သော အကြောင်းကြားချက်များ"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"အသံတိတ်ခြင်း"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"အသံမမြည်သော (သို့) တုန်ခါမှုများမရှိသော အကြောင်းကြားချက်များ"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"အက်ပ်အားလုံးကို ကြည့်ခြင်း"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"အကြောင်းကြားချက်များပို့နိုင်သော အက်ပ်တစ်ခုစီအတွက် အကြောင်းကြားချက် ဆက်တင်များကို ပြောင်းပါ"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"စက်ပစ္စည်းပေါ်တွင်ပြထားသော အက်ပ်များ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR အထောက်အကူပြု ဝန်ဆောင်မှုများ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ထည့်သွင်းထားသည့် မည်သည့်အက်ပ်ကိုမျှ VR အထောက်အကူပြု ဝန်ဆောင်မှုများအဖြစ် ဖွင့်ရန် မတောင်းဆိုထားပါ။"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> အတွက် VR ဝန်ဆောင်မှု အသုံးပြုခွင့်ပြုမလား။"</string>
@@ -3954,9 +3979,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"သင်၏စက်ပစ္စည်းလော့ခ်ဖွင့်ရန် မျက်နှာကို သုံးခြင်းအပြင် စက်မစတင်မီ ပင်နံပါတ် တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသေးသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပင်နံပါတ် သတ်မှတ်ထားလိုပါသလား။"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"သင်၏စက်ပစ္စည်းလော့ခ်ဖွင့်ရန် မျက်နှာကို သုံးခြင်းအပြင် စက်မစတင်မီ လော့ခ်ဖွင့်ပုံစံ တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသေးသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် လော့ခ်ဖွင့်ပုံစံ သတ်မှတ်ထားလိုပါသလား။"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"သင်၏စက်ပစ္စည်းလော့ခ်ဖွင့်ရန် မျက်နှာကို သုံးခြင်းအပြင် စက်မစတင်မီ စကားဝှက်တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသေးသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် စကားဝှက် သတ်မှတ်ထားလိုပါသလား။"</string>
-    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ ပင်နံပါတ် တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်သည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည်မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပင်နံပါတ် သတ်မှတ်ထားလိုပါသလား။"</string>
-    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ ပုံစံတောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်သည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည်မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပုံစံ သတ်မှတ်ထားလိုပါသလား။"</string>
-    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ စကားဝှက်တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် စကားဝှက် သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝမက်ထရစ် အချက်အလက်များကို အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ ပင်နံပါတ် တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်သည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည်မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပင်နံပါတ် သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝမက်ထရစ် အချက်အလက်များ အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ ပုံစံတောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်သည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည်မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပုံစံ သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝမက်ထရစ် အချက်အလက်များ အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ စကားဝှက်တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် စကားဝှက် သတ်မှတ်ထားလိုပါသလား။"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Yes"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ကန့်သတ်ထားသည်"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"မူရင်းအတိုင်းဖွင့်ရန်"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"လင့်ခ်များကို ဖွင့်ခြင်း"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"ထောက်ပံ့ထားသည့် လင့်များကို ဖွင့်မည်"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"ပံ့ပိုးထားသည့်လင့်ခ်များကို ဤအက်ပ်တွင်ဖွင့်သည်"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"ဤအက်ပ်တွင်ဖွင့်ရန် လင့်ခ်များ"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"မမ​ေးမြန်းဘဲ ဖွင့်မည်"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"ပံ့ပိုးထားသည့်လင့်ခ်များ"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"အခြား မူရင်းများ"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"အခြား မူရင်းသတ်မှတ်ချက်များ"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"လင့်ခ်ထည့်ရန်"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"အက်ပ်တစ်ခုသည် လင့်ခ်များကို စိစစ်ပြီးသည့်နောက် ၎င်းတို့ကို အက်ပ်တွင် အလိုအလျောက်ဖွင့်နိုင်သည်။ "<annotation id="url">"ပိုမိုလေ့လာရန်"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other">စိစစ်ထားသော လင့်ခ် <xliff:g id="COUNT_1">%d</xliff:g> ခု</item>
+      <item quantity="one">စိစစ်ထားသော လင့်ခ် <xliff:g id="COUNT_0">%d</xliff:g> ခု</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">ဤလင့်ခ်များကို စိစစ်ထားပြီး ဤအက်ပ်တွင် အလိုအလျောက် ဖွင့်သည်။</item>
+      <item quantity="one">ဤလင့်ခ်ကို စိစစ်ထားပြီး ဤအက်ပ်တွင် အလိုအလျောက် ဖွင့်သည်။</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"အခြား ပံ့ပိုးထားသည့်လင့်ခ်များကို ရှာနေသည်…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"မလုပ်တော့"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other">ပံ့ပိုးထားသည့်လင့်ခ် <xliff:g id="COUNT_1">%d</xliff:g> ခု</item>
+      <item quantity="one">ပံ့ပိုးထားသည့်လင့်ခ် <xliff:g id="COUNT_0">%d</xliff:g> ခု</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"ထည့်ရန်"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> တွင် ဖွင့်သည်"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>ထဲတွင် <xliff:g id="SIZE">%1$s</xliff:g>သုံးထားသည်"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"စက်အတွင်းသိမ်းဆည်းရန်နေရာ"</string>
     <string name="storage_type_external" msgid="125078274000280821">"ပြင်ပသိုလှောင်ခန်း"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"ကင်မရာ အသုံးပြုခွင့်မရှိပါ"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"ဖန်သားပြင်ဓာတ်ပုံ ရိုက်ခွင့်မပြုပါ"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"ဤအက်ပ်ကို ဖွင့်၍မရပါ"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"မေးစရာများရှိလျှင် သင်၏ IT စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"နောက်ထပ် အသေးစိတ်များ"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"သင်၏စီမံခန့်ခွဲသူသည် ဆက်တင်များ၊ ခွင့်ပြုချက်များ၊ ပူးပေါင်းသုံးစွဲခွင့်များ၊ ကွန်ရက်လုပ်ဆောင်ချက်နှင့် စက်ပစ္စည်း၏ တည်နေရာ အချက်အလက်များအပါအဝင် သင်၏ အလုပ်ပရိုဖိုင်နှင့် ဆက်စပ်နေသည့် အက်ပ်နှင့် ဒေတာများကို စောင့်ကြည့်စီမံနိုင်ပါသည်။"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"သင်၏စီမံခန့်ခွဲသူသည် ဆက်တင်များ၊ ခွင့်ပြုချက်များ၊ ပူးပေါင်းသုံးစွဲခွင့်များ၊ ကွန်ရက်လုပ်ဆောင်ချက်နှင့် စက်ပစ္စည်း၏ တည်နေရာ အချက်အလက်များအပါအဝင် ဤအသုံးပြုသူနှင့် ဆက်စပ်နေသည့် အက်ပ်နှင့် ဒေတာများကို စောင့်ကြည့်စီမံနိုင်ပါသည်။"</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">ကန့်သတ်ချက် ၁ ခု</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ဝန်ဆောင်မှုပေးသူ၏ ဒေတာအသုံးပြုမှု တွက်ချက်ခြင်းသည် စက်ပစ္စည်း၏ တွက်ချက်ခြင်းနှင့် ကွဲပြားနိုင်သည်"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"ဝန်ဆောင်မှုပေးသူ၏ကွန်ရက်များက အသုံးပြုသော ဒေတာများ မပါဝင်ပါ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"ဝန်ဆောင်မှုပေးသူ၏ကွန်ရက်များက အသုံးပြုသော ဒေတာများ မပါဝင်ပါ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> အသုံးပြုထားသည်"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ဒေတာသတိပေးချက် သတ်မှတ်ရန်"</string>
     <string name="data_warning" msgid="2925054658166062884">"ဒေတာသတိပေးချက်"</string>
@@ -4415,7 +4462,7 @@
     <string name="notification_log_details_key" msgid="2690467272328709046">"ကီး"</string>
     <string name="notification_log_details_group" msgid="1765952974599794393">"အုပ်စု"</string>
     <string name="notification_log_details_group_summary" msgid="4364622087007803822">"(အကျဉ်းချုပ်)"</string>
-    <string name="notification_log_details_visibility" msgid="6811292866832243357">"မြင်နိင်စွမ်း"</string>
+    <string name="notification_log_details_visibility" msgid="6811292866832243357">"မြင်နိုင်မှု"</string>
     <string name="notification_log_details_public_version" msgid="3057653571018432759">"အများသုံးဗားရှင်း"</string>
     <string name="notification_log_details_priority" msgid="4772047133062255513">"ဦးစားပေးမှု"</string>
     <string name="notification_log_details_importance" msgid="8516198274667183446">"အရေးပါမှု"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(အသုံးပြုသူ <xliff:g id="USER">%s</xliff:g> အတွက် ဖြုတ်ထားသည်)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(အသုံးပြုသူ <xliff:g id="USER">%s</xliff:g> အတွက် ပိတ်ထားသည်)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"အော်တိုဖြည့် ဝန်ဆောင်မှု"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"အလိုအလျောက်၊ ဖြည့်စွက်ခြင်း၊ အလိုအလျောက် ဖြည့်စွက်ခြင်း"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"စကားဝှက်များ"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"အော်တို၊ ဖြည့်၊ အော်တိုဖြည့်၊ စကားဝှက်"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;သင်သည် ဤအက်ပ်ကို ယုံကြည်စိတ်ချရပါကြောင်း သေချာပါစေ&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; သည် သင်၏မျက်နှာပြင်ပေါ်ရှိ အရာများကို အသုံးပြု၍ မည်သည့်အရာများကို အော်တိုဖြည့်နိုင်ကြောင်း ဆုံးဖြတ်သည်။"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"အလိုအလျောက်ဖြည့်ရန်"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"မှတ်တမ်းတင်မှု အဆင့်"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ကွန်ရက် လုပ်ဆောင်မှုစနစ်ကို ပြောင်းပါ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"အသုံးပြုလိုသော ကွန်ရက် အမျိုးအစား"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ဝန်ဆောင်မှုပေးသူ"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ဆက်တင်ဗားရှင်း"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"ဖုန်းကုမ္ပဏီဆက်တင်များ ဗားရှင်း"</string>
     <string name="call_category" msgid="641461844504128789">"ခေါ်ဆိုနေသည်"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"ဝန်ဆောင်မှုပေးသူ ဗီဒီယိုခေါ်ဆိုခြင်း"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"စနစ်ကို ရွေးချယ်ရန်"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ဆင်းမ်ကို ဖယ်ရှားပြီး ပြန်ထည့်ကြည့်ပါ။ ပြဿနာရှိနေသေးပါက သင့်စက်ကို ပြန်လည်စတင်ပါ။"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ဆင်းမ်ကို ပြန်ဖွင့်ကြည့်ပါ။ ပြဿနာရှိနေသေးပါက သင့်စက်ကို ပြန်လည်စတင်ပါ။"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ကွန်ရက် စတင်အသုံးပြုခြင်း"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"ဝန်ဆောင်မှုပေးသူ ပြောင်းခြင်း"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ကို အသုံးပြုနေသည်"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"ဆင်းမ်ကတ်ဆက်တင်များ အပ်ဒိတ်လုပ်ရန် တို့ပါ"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> သို့ ပြောင်းလိုက်သည်"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"ပိတ်ထားသည်"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"အင်တာနက်"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"ဆင်းမ်များ"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"လေယာဉ်ပျံမုဒ် ကွန်ရက်များကို ပြသရန်"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"လေယာဉ်ပျံမုဒ်တွင် ကွန်ရက်များကို ရှာဖွေပြီး ချိတ်ဆက်သည်။"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Wi-Fi ကွန်ရက်များကို ရှာဖွေပြီး ချိတ်ဆက်သည်"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"လေယာဉ်ပျံ၊ လေယာဉ်ပျံမုဒ်တွင် လုံခြုံခြင်း"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"ခေါ်ဆိုမှုများနှင့် SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi ခေါ်ဆိုမှု"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"မရနိုင်ပါ"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ယာယီ မရနိုင်သေးပါ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM မရှိပါ"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ရွေးချယ်မှုများ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ကွန်ရက် သတ်မှတ်ချက်များ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"အများသုံးကွန်ရက်များသို့ ချိတ်ဆက်လိုက်သည်"</string>
-    <string name="keywords_internet" msgid="7674082764898690310">"ကွန်ရက်ချိတ်ဆက်မှု၊ အင်တာနက်၊ ကြိုးမဲ့၊ ဒေတာ၊ wifi၊ wi-fi၊ wi fi၊ ဆယ်လူလာ၊ မိုဘိုင်း၊ ဖုန်းဝန်ဆောင်မှုပေးသူ၊ 4g၊ 3g၊ 2g၊ lte"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"ကွန်ရက်ချိတ်ဆက်မှု၊ အင်တာနက်၊ ကြိုးမဲ့၊ ဒေတာ၊ wifi၊ wi-fi၊ wi fi၊ ဆယ်လူလာ၊ မိုဘိုင်း၊ ဖုန်းကုမ္ပဏီ၊ 4g၊ 3g၊ 2g၊ lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"လေယာဉ်ပျံမုဒ် ကွန်ရက်များကို ပြသရန်"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"လေယာဉ်ပျံမုဒ် ကွန်ရက်များကို ပြသနေသည်"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"ကွန်ရက်များ ဖွင့်ခြင်း"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"ကွန်ရက်များ ပိတ်ခြင်း"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"သင့်အင်တာနက်ကို ပြင်ဆင်သတ်မှတ်မလား။"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"၎င်းက သင့်ဖုန်းခေါ်ဆိုမှုကို ရပ်ပါမည်"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"၎င်းက သင့်ဖုန်းခေါ်ဆိုမှုကို ရပ်ပါမည်"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"သင့်အင်တာနက်ကို ပြင်ဆင်သတ်မှတ်နေသည်…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"ပုံသေ ချိတ်ဆက်နိုင်မှု"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"လေယာဉ်ပျံမုဒ် ကွန်ရက်များ ရရှိနိုင်သည်"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ကွန်ရက်ပြောင်းရန် အီသာနက်ကို ချိတ်ဆက်မှုဖြုတ်ပါ"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ချိတ်ဆက်ထားစဉ် ကွန်ရက် မပြောင်းနိုင်ပါ"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"လေယာဉ်ပျံမုဒ် ကွန်ရက်များ"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"ချိတ်ဆက်ထားသည်"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"အင်တာနက်က အလိုအလျောက် ချိတ်ဆက်မည်မဟုတ်ပါ"</string>
@@ -5148,10 +5195,14 @@
     <string name="bluetooth_phonebook_access_dialog_content" msgid="4766700015848574532">"မယုံကြည်ရသော ဘလူးတုသ်သုံးစက် <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> က သင်၏ အဆက်အသွယ်များနှင့် ခေါ်ဆိုမှုမှတ်တမ်းသို့ ဝင်ရောက်လိုသည်။ ၎င်းတွင် အဝင်နှင့် အထွက်ခေါ်ဆိုမှုများဆိုင်ရာ ဒေတာ ပါဝင်သည်။\n\nသင်သည် <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ကို ယခင်က မချိတ်ဆက်ဖူးပါ။"</string>
     <string name="category_name_brightness" msgid="8520372392029305084">"တောက်ပမှု"</string>
     <string name="category_name_lock_display" msgid="7478785189102882266">"လော့ခ်ချထားချိန် ဖန်သားပြင်"</string>
-    <string name="category_name_visibility" msgid="4485030512199246405">"မြင်နိုင်စွမ်း"</string>
+    <string name="category_name_visibility" msgid="4485030512199246405">"မြင်နိုင်မှု"</string>
     <string name="category_name_color" msgid="937514550918977151">"အရောင်"</string>
     <string name="category_name_others" msgid="2366006298768550310">"အခြား"</string>
     <string name="category_name_general" msgid="7737273712848115886">"အထွေထွေ"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"အက်ပ်အားလုံးကို ပြခြင်း"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"စမတ် ထပ်ဆင့်ပို့ခြင်း"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"စမတ် ထပ်ဆင့်ပို့ခြင်း ဖွင့်ထားသည်"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ဖုန်းနံပါတ် ထည့်ပါ"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ဖုန်းနံပါတ် မထည့်ရသေးပါ။"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G ခွင့်ပြုခြင်း"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G ဆယ်လူလာ ချိတ်ဆက်မှုများကို သုံးပါ။ အရေးပေါ်ဖုန်းခေါ်ခြင်းအတွက် 2G ကို အမြဲဖွင့်ထားသည်။"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a040c28..123df1a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Gjør teksten på skjermen større eller mindre."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Gjør mindre"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Gjør større"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Bruk automatisk rotasjon"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Eksempeltekst"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Trollmannen fra Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingeravtrykk er registrert</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Lås opp med fingeravtrykk"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Konfigurer fingeravtrykket"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Bruk fingeravtrykket ditt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Du trenger bare å trykke på fingeravtrykkssensoren for å låse opp telefonen, autorisere kjøp eller logge på apper. Tenk godt over hvilke fingeravtrykk du legger til. Alle som får tilgang, kan utføre disse handlingene."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Fingeravtrykket ditt kan være mindre sikkert enn sterke mønstre eller PIN-koder."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Du har kontrollen"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Vær obs på dette"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Dataene som registreres av Fingeravtrykk, lagres på en sikker måte og sendes aldri fra telefonen din. Du kan når som helst slette dataene dine i innstillingene."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Fingeravtrykket ditt kan være mindre sikkert enn sterke mønstre eller PIN-koder."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Telefonen bruker av og til nylige bilder fra fingeravtrykk til å lage bedre fingeravtrykkmodeller."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Bruk fingeravtrykk til å låse opp telefonen eller godta kjøp.\n\nMerk: Du kan ikke bruke fingeravtrykk til å låse opp denne enheten. Ta kontakt med administratoren for organisasjonen din for mer informasjon."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Bruk fingeravtrykk til å låse opp telefonen eller godta kjøp.\n\nMerk: Fingeravtrykket ditt kan være mindre sikkert enn sterke mønstre eller PIN-koder."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Avbryt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nei takk"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Hopp over"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Fortsett"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Godta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Hopp over"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Neste"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Hoppe over fingeravtrykk?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Hopp over"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Avbryt"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Berør sensoren"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Trykk og hold på fingeravtrykkikonet"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Den er på baksiden av telefonen. Bruk pekefingeren."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Det er på skjermen. Se etter fingeravtrykket med en lysende sirkel."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Fingeravtrykkssensoren er på skjermen. Beveg fingeren over skjermen for å finne den."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustrasjon med enheten og plasseringen av fingeravtrykksensoren"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Navn"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Slett"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Berør sensoren"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Plassér fingeren på sensoren, og løft den når du kjenner en vibrasjon"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Løft fingeren og berør igjen"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Løft fingeren gjentatte ganger for å legge til de forskjellige delene av fingeravtrykket ditt"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingeravtrykket er lagt til"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Når du ser dette ikonet, kan du bruke fingeravtrykket ditt til å identifisere deg eller godkjenne kjøp"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Gjør det senere"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Søk"</string>
     <string name="display_settings" msgid="7197750639709493852">"Skjerm"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Rotér skjermen automatisk"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Av"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"På"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"På – ansiktsbasert"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Slå på ansiktsgjenkjenning"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Farger"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturlig"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Forsterket"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"På / skjermen slås ikke av hvis du ser på den"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Av"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Kameratilgang er nødvendig"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Trykk for å administrere tillatelser for Personlig tilpasning på enheten"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Forhindrer at skjermen slås av hvis du ser på den"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Skjermoppmerksomhet bruker frontkameraet til å se om noen ser på skjermen. Funksjonen fungerer på enheten, og bilder blir aldri lagret eller sendt til Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Slå på skjermoppmerksomhet"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Når skjermen er mørk, slås den på for nye varsler"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Vis alltid tidspunkt og info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Økt batteribruk"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Fet tekst"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Fet tekst"</string>
     <string name="title_font_size" msgid="570613010306330622">"Skriftstørrelse"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Gjør teksten større eller mindre"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Innstillinger for SIM-kort-lås"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Andre brukere"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Lagring på enheten"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Bærbar lagring"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmer og påminnelser"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Gi tillatelse til å angi alarmer og påminnelser"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmer og påminnelser"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Dette gjør at appen kan planlegge alarmer eller andre tidsbaserte hendelser. Dette gjør at appen kan starte og kjøre, selv når du ikke bruker enheten. Hvis du opphever denne tillatelsen, kan det føre til feil med appen, spesifikt at alarmer som appen har planlagt, ikke fungerer lenger."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"tidsplan, alarm, påminnelse, hendelse"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> brukt av <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"brukt av <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Posisjonstjenester"</string>
     <string name="location_title" msgid="5819154746934945021">"Min posisjon"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Sted for arbeidsprofil"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Posisjonstilgang"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Posisjon er slått av"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> av <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apper har tilgang til posisjon</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> av <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> apper har tilgang til posisjon</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Nylig posisjonstilgang"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Se detaljer"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Ingen apper har bedt om posisjonen din i det siste"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ingen apper har nylig brukt posisjon"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Høy batteribruk"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Lav batteribruk"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Søking etter Wi‑Fi og Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi-skanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"La apper og tjenester søke etter Wi-Fi-nettverk når som helst, selv når Wi-Fi er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-søking"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"La apper og tjenester søke etter enheter i nærheten når som helst, selv når Bluetooth er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Posisjonstjenester"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Posisjonstjenester for jobb"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Gjenkjenning av tidssone basert på posisjon"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Gjenkjenning av tidssone basert på posisjon"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Tillater at enhetsposisjonen brukes til å fastslå nåværende tidssone. Andre posisjonsinnstillinger, for eksempel Wi-Fi-skanning, kan påvirke nøyaktigheten til gjenkjenning av tidssone."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"På"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Av"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatisk gjenkjenning av tidssone er deaktivert"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatisk tidssone er av"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Gjenkjenning av tidssone basert på posisjon er slått av"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Gjenkjenning av tidssone basert på posisjon støttes ikke"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Du har ikke tillatelse til å endre gjenkjenning av tidssone"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Slå på"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Tøm lagring"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Avinstaller oppdateringer"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Du har valgt å starte denne appen som standard for enkelte handlinger."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Noen aktiviteter du har valgt, åpnes som standard i denne appen."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Du har valgt å tillate at denne appen oppretter moduler og leser moduldataene."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Ingen standardvalg er angitt."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Fjern standardvalg"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Fjern standardinnstillingene"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Denne appen er kanskje ikke utformet for skjermen din. Du kan kontrollere hvordan den justerer seg til skjermen her."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Spør ved oppstart"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Skalér app"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Du kan tilpasse denne enheten etter egne behov. Tilgjengelighetsfunksjonene kan du endre senere i Innstillinger."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Endre skriftstørrelse"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Skjermlesere"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Lyd og tekst på skjermen"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Teksting"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Lyd"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Generelt"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Skjerm"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst og skjerm"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Gjør skjermen mørkere"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rød-grønn"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rød-grønn"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blå-gul"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduser lysstyrken"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Reduser lysstyrken"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Gjør skjermen mørkere enn standard laveste lysstyrke på telefonen"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Gjør skjermen mørkere enn standard laveste lysstyrke på nettbrettet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Gjør skjermen mørkere, slik at det er mer komfortabelt å lese.&lt;br/&gt;&lt;br/&gt; Dette kan være nyttig når &lt;ol&gt; &lt;li&gt; standard laveste lysstyrke på telefonen fremdeles er for lys&lt;/li&gt; &lt;li&gt; du bruker telefonen i mørke omgivelser, for eksempel om natten eller i et mørkt rom før leggetid&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"ansikt"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"fingeravtrykk, legg til fingeravtrykk"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"dim skjermen, berøringsskjerm, batteri, smart lysstyrke, dynamisk lysstyrke, automatisk lysstyrke"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"ton ned skjermen, hvilemodus, batteri, tidsavbrudd, oppmerksomhet, visning, skjerm, inaktivitet"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"rotér, vend, rotasjon, stående, liggende, retning, vertikal, horisontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"oppgrader, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"ikke forstyrr, oversikt, varsler, blokkér, demp, vibrer, hvilemodus, jobb, fokuser, lyd, kutt lyden, dag, ukedag, helg, hverdagskveld, aktivitet"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"skjerm, låsetid, tidsavbrudd, låseskjerm"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringelyder"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Andre lyder og vibrasjoner"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Varsler"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Samtale"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nylig sendt"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Se alt fra de siste sju dagene"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avansert"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Generelt"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Jobbvarsler"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Varsler som kan tilpasses"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Tilpasset varselprioritet"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Vis i nedtrekkspanelet, statusfeltet og på låseskjermen"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Skjul lydløse varsler i statusfeltet"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blinkende lys"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Varsler på låseskjermen"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Personvern"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Hopp over låseskjermen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Gå direkte til den forrige skjermen etter ansiktsopplåsing"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Låseskjerm, låseskjerm, hopp over, omgå"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> varsel per uke</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Aldri"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Varseltilgang"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Enhets- og appvarsler"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Kontrollér hvilke varsler som vises på appene og enhetene dine"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Tilgang til varsler fra jobbprofilen er blokkert"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Apper kan ikke lese varsler"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Slå av"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Avbryt"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Tillatte varseltyper"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Viktige pågående varsler"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Samtalevarsler"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Varsler med varsling"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Lydløse varsler"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Sanntid"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Kommunikasjon i sanntid fra apper i bruk, navigering, telefonanrop med mer"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Samtaler"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS og annen kommunikasjon"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Standard"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Varsler som kan ringe eller vibrere basert på innstillingene"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Lydløs"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Varsler som aldri lager lyd eller vibrerer"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Se alle appene"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Endre varslingsinnstillinger for hver app som kan sende varsler"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Apper som vises på enheten"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Hjelpetjenester for VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ingen av de installerte appene har bedt om å bli kjørt som hjelpetjeneste for VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vil du tillate tjenestetilgang for VR for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Åpne som standard"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Åpning av linker"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Åpne støttede linker"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Linker som støttes, åpnes i denne appen"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Linker som skal åpnes i denne appen"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Åpne uten å spørre"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Støttede linker"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Andre standarder"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Andre standardinnstillinger"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Legg til en link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"En app kan bekrefte linker som skal åpnes automatisk i appen. "<annotation id="url">"Finn ut mer"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> bekreftede linker</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> bekreftet link</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Disse linkene er bekreftet og åpnes automatisk i denne appen.</item>
+      <item quantity="one">Denne linken er bekreftet og åpnes automatisk i denne appen.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Ser etter andre linker som støttes …"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Avbryt"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> støttede linker</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> støttet link</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Legg til"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Åpnes i <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> brukt av <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"intern lagring"</string>
     <string name="storage_type_external" msgid="125078274000280821">"ekstern lagring"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Kameraet er ikke tillatt"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Skjermdump er ikke tillatt"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Kan ikke åpne denne appen"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Hvis du lurer på noe, kan du kontakte IT-administratoren din"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Mer informasjon"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Administratoren kan overvåke og administrere apper og data som er tilknyttet jobbprofilen din, inkludert innstillinger, tillatelser, bedriftstilgang, nettverksaktivitet og enhetens posisjonsinformasjon."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Administratoren kan overvåke og administrere apper og data som er tilknyttet denne brukeren, inkludert innstillinger, tillatelser, bedriftstilgang, nettverksaktivitet og enhetens posisjonsinformasjon."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 begrensning</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operatørens måling av databruk samsvarer ikke nødvendigvis med enhetens måling."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ekskluderer data som brukes av operatørnettverk"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Ekskluderer data som brukes av operatørnettverk"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> er brukt"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Angi varsel om databruk"</string>
     <string name="data_warning" msgid="2925054658166062884">"Varsel om databruk"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(avinstallert for brukeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(slått av for brukeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Autofylltjeneste"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"auto, fyll, autofyll"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Passord"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"auto, fyll, autofyll, passord"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Sørg for at appen er pålitelig&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google autofyll&gt;%1$s&lt;/xliff:g&gt; bruker det som er på skjermen til å fastslå hva som kan fylles ut automatisk."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Autofyll"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Loggføringsnivå"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Bytt nettverksmodus"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Foretrukket nettverkstype"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operatør"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Innstillingsversjon"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versjon av operatørinnstillinger"</string>
     <string name="call_category" msgid="641461844504128789">"Anrop"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videoanrop via mobiloperatør"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Systemvalg"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Fjern SIM-kortet og sett det inn igjen. Start enheten på nytt hvis problemet vedvarer."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prøv å slå på SIM-kortet igjen. Start enheten på nytt hvis problemet vedvarer."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivering av nettverk"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operatørbytte"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> er aktiv"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Trykk for å oppdatere SIM-kortinnstillingene"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Byttet til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Av"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internett"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kort"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Vis nettverk for flymodus"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Finn og koble til nettverk i flymodus."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Finn og koble til Wi-Fi-nettverk"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"fly, trygg på fly"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Anrop og SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-anrop"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"utilgjengelig"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Midlertidig utilgjengelig"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Uten SIM-kort"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Innstillinger"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Nettverksinnstillinger"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Koble til offentlige nettverk"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"nettverkstilkobling, internett, trådløs, data, wifi, wi-fi, wi fi, mobilnett, mobil, mobiloperatør, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Se nettverk for flymodus"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Viser nettverk for flymodus"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Slå på nettverk"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Slå av nettverk"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Vil du tilbakestille internett?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Dette avslutter anropet"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Dette avslutter anropet"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Tilbakestiller internett …"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Fiks tilkobling"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Nettverk for flymodus er tilgjengelig"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"For å bytte nettverk, koble fra Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Du kan ikke bytte nettverk når du er tilkoblet"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Nettverk for flymodus"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Tilkoblet"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internett kobles ikke til automatisk"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Farge"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Andre"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Generelt"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Se alle appene"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart viderekobling"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart viderekobling er slått på"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Skriv inn telefonnummeret"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefonnummeret mangler."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Tillat 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Bruk 2G-mobiltilkoblinger. For nødanrop er 2G alltid slått på."</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index d9e019d..fdd8319 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"स्क्रिनमा भएको पाठलाई अझै सानो वा ठुलो बनाउनुहोस्।"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"अझ सानो बनाउनुहोस्"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"अझ ठुलो बनाउनुहोस्"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"स्वतः रोटेट हुने सुविधा प्रयोग गर्नुहोस्"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"नमूना पाठ"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"दि वन्डरफुल विजार्ड अफ ओज"</string>
@@ -245,8 +244,8 @@
     <string name="cellular_data_summary" msgid="6551434804367912367">"मोबाइल नेटवर्कमार्फत डेटा प्रयोग गर्न अनुमति दिनुहोस्"</string>
     <string name="allow_data_usage_title" msgid="2645963379925196671">"रोमिङ हुँदा डेटा उपयोग अनुमति"</string>
     <string name="roaming" msgid="3055365654530847985">"रोमिङ"</string>
-    <string name="roaming_enable" msgid="7845716016861535340">"रोमिङ हुँदा डेटा सेवासँग जोड्नुहोस्"</string>
-    <string name="roaming_disable" msgid="729512894708689604">"रोमिङ हुँदा डेटा सेवासँग जोड्नुहोस्"</string>
+    <string name="roaming_enable" msgid="7845716016861535340">"रोमिङमा हुँदा मोबाइल डेटा प्रयोग गर्नुहोस्"</string>
+    <string name="roaming_disable" msgid="729512894708689604">"रोमिङमा हुँदा मोबाइल डेटा प्रयोग गर्नुहोस्"</string>
     <string name="roaming_reenable_message" msgid="5150423860521673540">"तपाईंले डेटा जडान गुमाउनुभयो किनभने तपाईंले गृह नेटवर्क डेटा रोमिङ बन्द गरेर छोड्नुभयो।"</string>
     <string name="roaming_turn_it_on_button" msgid="6999283810847157816">"सक्रिय पार्नुहोस्"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"रोमिङ शुल्क लाग्न सक्छ।"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g>फिंगरप्रिन्ट सेटअप</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"फिंगरप्रिन्टमार्फत अनलक"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"आफ्नो फिंगरप्रिन्ट दर्ता गर्नु…"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"आफ्नो फिंगरप्रिन्टको प्रयोग गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"आफ्नो फोन अनलक गर्न, खरिदहरूका लागि अनुमति दिन वा एपहरूमा साइन इन गर्न फिंगरप्रिन्ट सेन्सरमा छोए पुग्छ। तपाईं कसको फिंगरप्रिन्ट हाल्दै हुनुहुन्छ भन्ने कुरामा सावधानी अपनाउनुहोस्। तपाईंले हाल्नुभएको एउटै फिंगरप्रिन्ट प्रयोग गरेर यीमध्ये कुनै पनि कार्य गर्न मिल्छ।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"तपाईंको फिंगरप्रिन्ट कुनै भरपर्दो प्याटर्न वा PIN भन्दा कम सुरक्षित हुन सक्छ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"यो सुविधामाथि तपाईंको नियन्त्रण हुन्छ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"ख्याल गर्नुहोस्"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"फिंगरप्रिन्ट सेन्सरले रेकर्ड गरेको डेटा सुरक्षित रूपमा भण्डारण गरिन्छ र यो डेटा कहिल्यै पनि तपाईंको फोनबाट अन्यत्र पठाइँदैन। तपाईं सेटिङमा गई जुनसुकै बेला आफ्नो डेटा मेटाउन सक्नुहुन्छ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"तपाईंको फिंगरप्रिन्ट कुनै भरपर्दो ढाँचा वा PIN भन्दा कम सुरक्षित हुन सक्छ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"फिंगरप्रिन्टका सुधारिएका मोडेलहरू सिर्जना गर्न तपाईंको फोनले कहिलेकाहीँ तपाईंले फिंगरप्रिन्ट प्रयोग गरी अनलक गर्दा कैद भएका हालसालैका फोटोहरू प्रयोग गर्ने छ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"तपाईंको फोन अनलक वा खरिदहरूको अनुमोदन गर्न आफ्ना फिंगरप्रिन्टहरूको प्रयोग गर्नुहोस्।\n\nटिपोट: तपाईं यो यन्त्र अनलक गर्न आफ्नो फिंगरप्रिन्टको प्रयोग गर्न सक्नुहुन्न। थप जानकारीका लागि आफ्नो संगठनको प्रशासकलाई सम्पर्क गर्नुहोस्।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"तपाईंको फोन अनलक वा खरिदहरूको अनुमोदन गर्न आफ्नो फिंगरप्रिन्ट प्रयोग गर्नुहोस्।\n\nटिपोट: तपाईंको फिंगरप्रिन्ट भरपर्दो ढाँचा वा PIN भन्दा कम सुरक्षित हुनसक्छ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"रद्द गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"पर्दैन, धन्यवाद"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"स्किप गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"जारी राख्नुहोस्"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"सहमत छु"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"छोड्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"अर्को"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"फिंगरप्रिन्ट सेटअप छाड्ने हो?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"छाड्नुहोस्"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"रद्द गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"सेन्सरमा छुनुहोस्"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"फिंगरप्रिन्ट जनाउने आइकनमा टच एण्ड होल्ड गर्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"यो तपाईंको फोनको पछाडिको भागमा छ। आफ्नो चोर औंला प्रयोग गर्नुहोस्‌।"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"सेन्सर स्क्रिनमा छ। स्क्रिनमा चम्किलो वृत्तभित्र रहेको फिंगरप्रिन्ट फेला पार्नुहोस्।"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"फिंगरप्रिन्ट सेन्सर तपाईंको स्क्रिनमा छ। फिंगरप्रिन्ट सेन्सर भेट्टाउन आफ्नो औँला स्क्रिनमा यताउता डुलाउनुहोस्।"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"यन्त्र साथ चित्रण र फिंगरप्रिन्ट सेन्सर स्थान"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"नाम"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ठिक छ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"मेटाउनुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"सेन्सरमा छुनुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"सेन्सरमा आफ्नो औंला राख्नुहोस्  र तपाईंले भाइब्रेसन महसुस गरेपछि उठाउनुहोस्"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"औंला उठाई फेरि छुनुहोस्"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"तपाईंको फिंगरप्रिन्टका फरक-फरक भागहरू थप्न आफ्नो औंलालाई उठाउँदै राख्दै गर्नुहोस्"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"फिंगरप्रिन्ट थपियो"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"यो आइकन देख्दा आफ्नो पहिचान दिन वा खरिदहरूको अनुमोदन गर्न आफ्नो फिंगरप्रिन्ट प्रयोग गर्नुहोस्‌"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"यसलाई पछि गर्नुहोस्‌"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"खोज्नुहोस्"</string>
     <string name="display_settings" msgid="7197750639709493852">"प्रदर्शन"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"स्वतःघुम्ने स्क्रिन"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"अफ छ"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"अन छ"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"अन छ - अनुहारमा आधारित"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"अनुहार पत्ता लगाउने सुविधा अन गर्नुहोस्"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"रङहरू"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"प्राकृतिक"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"बुस्ट गरिएको"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"सक्रिय / तपाईं स्क्रिनमा हेर्दै हुनुहुन्छ भने यो बन्द हुने छैन"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"निष्क्रिय"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"क्यामेरामाथिको पहुँच चाहिन्छ"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"यन्त्रको वैयक्तीकरणसम्बन्धी सेवाहरूको अनुमतिको व्यवस्थापन गर्न ट्याप गर्नुहोस्"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"तपाईं स्क्रिनमा हेर्दै हुनुहुन्छ भने त्यसलाई बन्द हुन दिँदैन"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"कुनै व्यक्तिले स्क्रिनमा हेरिरहेको छ या छैन भन्ने कुरा पत्ता लगाउन स्क्रिनमा हेरिरहेको पहिचान गर्ने सुविधाले अगाडिको क्यामेरा प्रयोग गर्दछ। यसले यन्त्रमा काम गर्छ र छविहरू कहिल्यै पनि भण्डारण गरिँदैनन् वा Google मा पठाइँदैनन्।"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"स्क्रिनमा हेरिरहँदा स्क्रिन सक्रिय राख्ने सुविधा सक्रिय गर्नुहोस्"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"स्क्रिन अफ भएका बेला नयाँ सूचना प्राप्त हुँदा स्क्रिन अन हुन्छ"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"समय र जानकारी सधैँ देखाइयोस्"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ब्याट्री बढी खपत हुने"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"बोल्ड टेक्स्ट"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"बोल्ड टेक्स्ट"</string>
     <string name="title_font_size" msgid="570613010306330622">"फन्ट आकार"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"पाठ सन्देश अझ ठुलो वा सानो पार्नुहोस्"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM कार्ड लक सेटिङहरू"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"अन्य प्रयोगकर्ताहरू"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"यन्त्र भण्डारण"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"पोर्टेबल भण्डारण"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"अलार्म र रिमाइन्डरहरू"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"अलार्म वा रिमाइन्डर सेट गर्ने अनुमति दिनुहोस्"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"अलार्म र रिमाइन्डरहरू"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"यो एपलाई अलार्म वा समयमा आधारित अन्य कार्यक्रमहरूको समय तोक्ने अनुमति दिनुहोस्। यसका सहायताले तपाईंले यो यन्त्र प्रयोग नगरेका बेला पनि यो एपले अन भई काम गर्न सक्छ। स्मरण रहोस्, तपाईंले यो एपलाई दिनुभएको अनुमति रद्द गर्नुभयो भने यसले राम्रोसँग काम नगर्न सक्छ। खास गरी, यो एपले तोकेको कुनै पनि अलार्म बज्ने छैन।"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"कार्यतालिका, अलार्म, रिमाइन्डर, कार्यक्रम"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> को <xliff:g id="USED">%1$s</xliff:g> प्रयोग भएको"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> को प्रयोग भएको"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"स्थान सेवाहरू"</string>
     <string name="location_title" msgid="5819154746934945021">"मेरो स्थान"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"काम प्रोफाइलका लागि स्थान"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"अनुप्रयोगले स्थान प्रयोग गर्न पाउने वा नपाउने सेटिङ"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"स्थान निष्क्रिय छ"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> अनुप्रयोगहरूमध्ये <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> सँग स्थानमाथिको पहुँच छ</item>
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> अनुप्रयोगहरूमध्ये <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> सँग स्थानमाथिको पहुँच छ</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"हालसालै राखिएको स्थानमाथिको पहुँच"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"विवरणहरू हेर्नुहोस्"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"अहिले कुनै पनि एपहरूले स्थानको जानकारी मागेका छैनन्"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"कुनै पनि अनुप्रयोगले हाल स्थानमाथि पहुँच गरेको छैन"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"उच्च ब्याट्री प्रयोग"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"कम ब्याट्री प्रयोग"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi तथा ब्लुटुथ स्क्यान गर्दै"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi स्क्यान गर्दै"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"एप र सेवाहरूलाई जुनसुकै बेला (Wi‑Fi निष्क्रिय भएको बेलामा पनि) वरपरका Wi-Fi नेटवर्कहरू स्क्यान गर्न अनुमति दिनुहोस्। यसलाई स्थानमा आधारित सुविधा तथा सेवाहरू सुधार गर्ने जस्ता कार्यहरू गर्नाका लागि प्रयोग गर्न सकिन्छ।"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ब्लुटुथ स्क्यान हुँदै"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"एप तथा सेवाहरूलाई जुनसुकै बेला (ब्लुटुथ निष्क्रिय भएको बेलामा पनि) वरपरका यन्त्रहरू स्क्यान गर्न अनुमति दिनुहोस्‌। यसलाई स्थानमा आधारित सुविधा तथा सेवाहरू सुधार गर्ने जस्ता कार्यहरू गर्नाका लागि प्रयोग गर्न सकिन्छ।"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"स्थानसम्बन्धी सेवाहरू"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"कार्यस्थलका स्थानसम्बन्धी सेवाहरू"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधा"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधा"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"हालको समय क्षेत्र पत्ता लगाउनका निम्ति यन्त्रको स्थानसम्बन्धी जानकारी प्रयोग गर्न दिन्छ। Wi-Fi स्क्यान गर्ने सुविधा जस्ता स्थानसम्बन्धी अन्य सेटिङका कारण सटीक समय क्षेत्र पत्ता लगाउन गाह्रो हुन सक्छ।"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"अन छ"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"अफ छ"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"समय क्षेत्र स्वतः पत्ता लगाउने सुविधा असक्षम पारिएको छ"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"प्रामाणिक समय स्वतः पत्ता लगाउने सुविधा अफ छ"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधा असक्षम पारिएको छ"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधा प्रयोग गर्न मिल्दैन"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधासम्बन्धी सेटिङ परिवर्तन गर्न पाइँदैन"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"सक्रिय गर्नुहोस्"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"भण्डारण खाली गर्नुहोस्"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"अद्यावधिकहरू अस्थापना गर्नुहोस्"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"केही कारवाहीका लागि पूर्वनिर्धारतिबाट यो एप सुरु गर्न तपाईँले छान्नु भयो।"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"तपाईंले चयन गर्नुभएका केही क्रियाकलापहरू यो एपमा पूर्वनिर्धारित रूपमा खुल्छन्।"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"तपाईंले यो एपलाई विजेटहरू सिर्जना गर्न र तिनीहरूको डेटा पहुँच गर्न अनुमतिको लागि छान्नुभयो।"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"कुनै पूर्वनिर्धारित सेट गरिएको छैन।"</string>
-    <string name="clear_activities" msgid="341345438786077236">"पूर्वनिर्धारितहरू मेटाउनुहोस्"</string>
+    <string name="clear_activities" msgid="488089228657585700">"पूर्वनिर्धारित प्राथमिकताहरू हटाउनुहोस्"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"तपाईंको स्क्रिनका लागि यस एप डिजाइन नहुन सक्छ। तपाईंको स्क्रिनमा कसरी मिल्छ तपाईं यहाँ नियन्त्रण गर्न सक्नु हुन्छ।"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"सुरु भइसकेपछि सोध्नुहोस्"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"स्केल एप"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"तपाईंले आफ्नो आवश्यकताहरूसँग मेल खाने बनाउन यस यन्त्रलाई आफू अनुकूल गर्न सक्नुहुन्छ। यी पहुँच सुविधाहरू सेटिङमा पछि परिवर्तन गर्न सकिने छ।"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"फन्ट साइज बदल्नुहोस्"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"स्क्रिन रिडरहरू"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"अडियो तथा स्क्रिनमा देखिने पाठ सन्देश"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"क्याप्सनहरू"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"अडियो"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"सामान्य"</string>
     <string name="display_category_title" msgid="6638191682294461408">"प्रदर्शन"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"पाठ तथा डिस्प्ले"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"स्क्रिन अझ अँध्यारो बनाउनुहोस्"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"रातो-हरियो"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"रातो-हरियो"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"निलो-पहेँलो"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"स्क्रिनको चमक घटाउनुहोस्"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"चमक घटाइयोस्"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"आफ्नो फोनको स्क्रिनको चमक घटाएर न्यूनतम चमकभन्दा पनि कम गर्नुहोस्"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"आफ्नो ट्याब्लेटको स्क्रिनको चमक घटाएर न्यूनतम चमकभन्दा पनि कम गर्नुहोस्"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"स्क्रिनमा भएको पाठ पढ्न अझ सजिलो होस् भन्नाका खातिर आफ्नो स्क्रिन अझ अँध्यारो बनाउनुहोस्।&lt;br/&gt;&lt;br/&gt; निम्न अवस्थाहरूमा यसो गर्नु उपयोगी हुन सक्छ: &lt;ol&gt; &lt;li&gt; तपाईंको फोनको स्क्रिनको न्यूनतम पूर्वनिर्धारित चमक अझै पनि धेरै उज्यालो छ&lt;/li&gt; &lt;li&gt; तपाईं आफ्नो फोन राति वा सुत्नुअघि अँध्यारो कोठा जस्ता अँध्यारो ठाउँमा प्रयोग गर्दै हुनुहुन्छ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3103,7 +3124,7 @@
     <string name="user_guest" msgid="4545590092001460388">"अतिथि"</string>
     <string name="user_exit_guest_title" msgid="2653103120908427236">"अतिथि हटाउनुहोस्"</string>
     <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"अतिथि हटाउने हो?"</string>
-    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"यस सत्रमा सबै एपहरू र डेटा मेटाइनेछ।"</string>
+    <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"यो सत्रमा भएका सबै एपहरू र डेटा मेटाइने छ।"</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"हटाउनुहोस्"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"फोन गर्ने सेवा सक्रिय गर्नुहोस्"</string>
     <string name="user_enable_calling_sms" msgid="8546430559552381324">"फोन कल तथा SMS सक्षम पार्नुहोस्"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"अनुहार"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"फिंगरप्रिन्ट, फिंगरप्रिन्ट थप्नुहोस्"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"मधुरो स्क्रिन, टचस्क्रिन, ब्याट्री, स्मार्ट चमक, गतिशील चमक, स्वतः चमक"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"मधुरो स्क्रिन, शयन अवस्था, ब्याट्री, टाइमआउट, स्क्रिनमा हेरिरहेको पहिचान गर्ने सुविधा, डिस्प्ले, स्क्रिन, निष्क्रियता"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"घुमाउनुहोस्, पल्टाउनुहोस्, परिक्रमा, पोर्ट्रेट, ल्यान्डस्केप, अभिमुखीकरण, ठाडो, तेर्सो"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"स्तरवृद्धि गर्नुहोस्, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, समयतालिका, सूचनाहरू, रोक लगाउनुहोस्, माैन, कम्पन, शयन अवस्थामा लानुहोस्, कार्य, फोकस, आवाज, म्युट गर्नुहोस्, दिन, काम गर्ने दिन, सप्ताहान्त, काम गर्ने रात, कार्यक्रम"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"स्क्रिन, लक समय, टाइमआउट, लकस्क्रिन"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"रिङटोनहरू"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"ध्वनि र कम्पन सम्बन्धी अन्य कुराहरू"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"सूचनाहरू"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"वार्तालाप"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"हालै पठाइएका एपहरू"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"विगत ७ दिनयताका सबै हेर्नुहोस्"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"उन्‍नत"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"सामान्य"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"कार्यका सूचनाहरू"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"अनुकूल पार्न मिल्ने सूचनाहरू"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"अनुकूल पार्न मिल्ने सूचनाको प्राथमिकता"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"पुल डाउन सेड, स्टाटस बार र लक स्क्रिनमा देखाउनुहोस्"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"मौन सूचनाहरूलाई स्टाटस बारमा लुकाउनुहोस्"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"झिम झिम गर्ने बत्ती"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"लक स्क्रिनमा देखिने सूचनाहरू"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"गोपनीयता"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"लक स्क्रिन छाड्नुहोस्"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"फेस अनलक प्रयोग गरी अनलक गरेपछि सीधै पछिल्लो पटक प्रयोग गरिएको स्क्रिनमा जानुहोस्"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"लक स्क्रिन, लकस्क्रिन, छाड्नुहोस्, बाइपास गर्नुहोस्"</string>
@@ -3638,7 +3662,7 @@
     <string name="allow_interruption" msgid="5237201780159482716">"अवरोधहरूहरूलाई अनुमति दिनुहोस्"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"एपलाई बज्न, कम्पन गर्न र/वा स्क्रिनमा सूचनाहरू पप गर्न दिनुहोस्"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"प्राथमिकता"</string>
-    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"वार्तालाप खण्डको सिरानमा देखा पर्छ, तैरने बबलका रूपमा देखा पर्छ, लक स्क्रिनमा प्रोफाइल फोटो देखाइन्छ"</string>
+    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"वार्तालाप खण्डको सिरानमा देखा पर्छ, तैरने बबलका रूपमा देखा पर्छ, लक स्क्रिनमा प्रोफाइल फोटो देखिन्छ"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"<xliff:g id="APP_NAME">%1$s</xliff:g> मा वार्तालापसम्बन्धी धेरैजसो सुविधाहरू प्रयोग गर्न मिल्दैन। तपाईं वार्तालापलाई महत्त्वपूर्ण वार्तालापका रूपमा सेट गर्न सक्नुहुन्न र वार्तालापहरू तैरने बबलका रूपमा देखा पर्दैनन्।"</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"पुल डाउन सेडमा सूचनाहरूलाई एउटा पङ्क्तिमा सङ्क्षिप्त पार्नुहोस्"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"न घन्टी बज्छ न त कम्पन नै हुन्छ"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">प्रति हप्ता लगभग <xliff:g id="NUMBER_0">%d</xliff:g> सूचना</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"कहिल्यै होइन"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"सूचनासम्बन्धी पहुँच"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"यन्त्र तथा एपसम्बन्धी सूचनाहरू"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"तपाईंका एप तथा यन्त्रहरूमा कुन कुन सूचनाहरू देखिन्छन् भन्ने कुरा नियन्त्रण गर्नुहोस्"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"कार्य प्रोफाइलमाथिका पहुँच सम्बन्धी सूचनाहरूलाई बन्द गरिएको छ"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"एपहरूले सूचनाहरू पढ्न सक्दैन"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3667,7 +3692,7 @@
     <string name="notification_assistant_title" msgid="6983941403582134437">"अनुकूल पार्न मिल्ने सूचनाहरू"</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"कुनै पनि होइन"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"कुनै स्थापित एपहरूले सूचना पहुँच अनुरोध गरेका छैनन्।"</string>
-    <string name="notification_access_detail_switch" msgid="46386786409608330">"सूचनामाथि पहुँच राख्न दिनुहोस्"</string>
+    <string name="notification_access_detail_switch" msgid="46386786409608330">"सूचना हेर्नु अनुमति दिनुहोस्"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"<xliff:g id="SERVICE">%1$s</xliff:g> लाई सूचनामाथि पहुँच राख्ने अनुमति दिने हो?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> ले सम्पर्क ठेगानामा रहेको नाम र तपाईंले प्राप्त गर्नुभएका टेक्स्ट म्यासेजहरू जस्ता व्यक्तिगत जानकारीलगायत सबै सूचनाहरू पढ्न सक्ने छ। यो अनुप्रयोगले सूचनाहरू हटाउन वा सूचनामा रहेका बटनहरू प्रयोग गरी फोन उठाउने जस्ता विभिन्न कार्यहरू गर्न सक्छ। \n\nयसले यो एपलाई बाधा नपुऱ्याउनुहोस् नामक मोड सक्रिय गर्ने वा निष्क्रिय पार्ने र सम्बन्धित सेटिङ परिवर्तन गर्ने क्षमता पनि प्रदान गर्ने छ।"</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"<xliff:g id="SERVICE">%1$s</xliff:g> का लागि सूचना पहुँच अनुमति दिने हो?"</string>
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"निष्क्रिय पार्नुहोस्"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"रद्द गर्नुहोस्"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"अनुमति दिइएका सूचनाका प्रकारहरू"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"सदैव देखाइने महत्त्वपूर्ण सूचनाहरू"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"कुराकानीसम्बन्धी सूचनाहरू"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"कम्पन वा आवाजसहितका सूचनाहरू"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"साइलेन्ट सूचनाहरू"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"वास्तविक समय"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"प्रयोगमा रहेका एप, नेभिगेसन, फोन कल तथा अन्य कुराहरूबाट वास्तविक समयमा प्राप्त हुने सञ्चार"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"वार्तालापहरू"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS तथा अन्य सञ्चार"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"पूर्वनिर्धारित"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"सेटिङका आधारमा सूचना प्राप्त हुँदा यन्त्रको घन्टी बज्ने वा भाइब्रेट हुने सूचनाहरू"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"साइलेन्ट"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"प्राप्त हुँदा घन्टी नबज्ने वा भाइब्रेट नहुने सूचनाहरू"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"सबै एपहरू हेर्नुहोस्"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"सूचनाहरू पठाउने अनुमति दिइएको प्रत्येक एपको सूचनासम्बन्धी सेटिङ परिवर्तन गर्नुहोस्"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"यन्त्रमा देखाइने एपहरू"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR का सहायक सेवाहरू"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"कुनै पनि स्थापित एपहरूले VR का सहायक सेवाहरूको रूपमा चल्नका लागि अनुरोध गरेका छैनन्।"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> लाई VR को सेवामा पहुँचका लागि अनुमति दिने हो?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"पूर्वनिर्धारितद्वारा खोल्नुहोस्"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"लिंकहरू खोल्दै"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"समर्थित लिंकहरू खोल्नुहोस्"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"खोल्न सकिने सबै लिंक यो एपमा खुल्छन्"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"यो एपमा खोलिनु पर्ने लिंकहरू"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"नसोधेर नै खोल्नुहोस्"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"समर्थित लिंकहरू"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"अन्य पूर्वनिर्धारितहरू"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"अन्य पूर्वनिर्धारित प्राथमिकताहरू"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"लिंक थप्नुहोस्"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"एपले लिंकहरू स्वतः खोल्नका लागि ती लिंकहरू पुष्टि गर्न सक्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other">पुष्टि गरिएका <xliff:g id="COUNT_1">%d</xliff:g> वटा लिंक</item>
+      <item quantity="one">पुष्टि गरिएको <xliff:g id="COUNT_0">%d</xliff:g> लिंक</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">यी लिंकहरू पुष्टि गरिएका छन् र यो एपमा यी लिंकहरू स्वतः खुल्छन्।</item>
+      <item quantity="one">यो लिंक पुष्टि गरिएको छ र यो एपमा यो लिंक स्वतः खुल्छ।</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ठिक छ"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"खोल्न सकिने अन्य लिंक छन् कि भनी जाँच गरिँदै छ…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"रद्द गर्नुहोस्"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other">खोल्न सकिने <xliff:g id="COUNT_1">%d</xliff:g> वटा लिंक</item>
+      <item quantity="one">खोल्न सकिने <xliff:g id="COUNT_0">%d</xliff:g> लिंक</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"थप्नुहोस्"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> मा खुल्छ"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> <xliff:g id="STORAGE_TYPE">%2$s</xliff:g> मा प्रयोग गरियो"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"आन्तरिक भण्डारण"</string>
     <string name="storage_type_external" msgid="125078274000280821">"बाह्य भण्डारण"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"यो क्यामेरालाई अनुमति छैन"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"स्क्रिनसटलाई अनुमति छैन"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"यो एप खोल्न सकिँदैन"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"तपाईंसँग प्रश्नहरू छन् भने आफ्नो IT प्रशासकलाई सम्पर्क गर्नुहोस्"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"थप विवरणहरु"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"तपाईंको प्रशासकले तपाईंको कार्य प्रोफाइलसँग सम्बन्धित एप र डेटाका साथै सेटिङ। अनुमति, संस्थागत पहुँच, नेटवर्क सम्बन्धी गतिविधि र यस यन्त्रको स्थानसम्बन्धी जानकारीको अनुगमन र व्यवस्थापन गर्न सक्छ।"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"तपाईंको प्रशासकले यस प्रयोगकर्तासँग सम्बन्धित एप तथा डेटाका साथै सेटिङ, अनुमति, संस्थागत पहुँच, नेटवर्क सम्बन्धी गतिविधि र यस यन्त्रको स्थानसम्बन्धी जानकारीको अनुगमन र व्यवस्थापन गर्न सक्छ।"</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">१ वटा बन्देज</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"वाहकको डेटाको हिसाब-किताब राख्ने कार्य तपाईँको यन्त्रको हिसाब-किताब राख्ने कार्य भन्दा फरक हुन सक्छ"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"यस विवरणमा सेवा प्रदायकको नेटवर्कले प्रयोग गरेको डेटा समावेश गरिएको छैन"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"मोबाइल सेवा प्रदायकको नेटवर्कले प्रयोग गरेको डेटा समावेश गरिएको छैन"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> प्रयोग गरियो"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"डेटाबारे चेतावनी सेट गर्नुहोस्"</string>
     <string name="data_warning" msgid="2925054658166062884">"डेटाबारे चेतावनी"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g> को लागि स्थापना रद्द गरियो)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g> को लागि असक्षम पारियो)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"स्वतः भरण सेवा"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"स्वतः, भरण, स्वतः भरण"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"पासवर्डहरू"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"स्वतः, भर्नुहोस्, अटोफिल, पासवर्ड"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;तपाईं यो एपमाथि भरोसा गर्नुहुन्छ भन्ने कुरा पक्का गर्नुहोस्&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; यस अनुप्रयोगले स्वतः भर्नसकिने कुराहरूको निर्धारण गर्न तपाईंको स्क्रिनमा भएका वस्तुहरूको प्रयोग गर्छ।"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"स्वतः भरण"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"लगिङको स्तर"</string>
@@ -4849,7 +4897,7 @@
     <string name="carrier_settings_title" msgid="6959295328730560529">"सेवा प्रदायकसम्बन्धी सेटिङहरू"</string>
     <string name="cdma_lte_data_service" msgid="6937443423651347345">"डेटा सेवा सेटअप गर्नुहोस्"</string>
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"मोबाइल डेटा"</string>
-    <string name="mobile_data_settings_summary" msgid="7323978798199919063">"मोबाइल नेटवर्क प्रयोग गरी डेटामाथि पहुँच राख्नुहोस्"</string>
+    <string name="mobile_data_settings_summary" msgid="7323978798199919063">"मोबाइल नेटवर्कबाट इन्टरनेट चलाउनुहोस्"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"फोन दायरामा हुँदा यस सेवा प्रदायकमा स्वत: स्विच हुने छ"</string>
     <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"कुनै पनि SIM कार्ड उपलब्ध छैन"</string>
     <string name="calls_preference" msgid="2166481296066890129">"कलसम्बन्धी प्राथमिकता"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"नेटवर्क अपरेटिङ मोड परिवर्तन गर्नुहोस्"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"रुचाइएको नेटवर्कको प्रकार"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"सेवा प्रदायक"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"सेटिङहरूको संस्करण"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"सेवा प्रदायकसम्बन्धी सेटिङको संस्करण"</string>
     <string name="call_category" msgid="641461844504128789">"कल गर्दै"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"सेवा प्रदायकको भिडियो कल"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"प्रणाली चयन गर्नुहोस्"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM बाहिर झिकेर फेरि हाल्नुहोस्। अझै समस्या रहिरह्यो भने आफ्नो यन्त्र रिस्टार्ट गर्नुहोस्।"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"फेरि SIM सक्रिय गरी हेर्नुहोस्। अझै समस्या रहिरह्यो भने आफ्नो यन्त्र रिस्टार्ट गर्नुहोस्।"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"नेटवर्क सक्रिय गर्ने प्रक्रिया"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"मोबाइल सेवा प्रदायक परिवर्तन गरिँदै छ"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> सक्रिय छ"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM का सेटिङ परिवर्तन गर्न ट्याप गर्नुहोस्"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> प्रयोग गर्न थालियो"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"अफ"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"इन्टरनेट"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"हवाइजहाज मोडमा काम गर्ने नेटवर्कहरू देखाइऊन्"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"हवाइजहाज मोडमा काम गर्ने नेटवर्कहरू खोज्नुहोस् र तिनमा कनेक्ट गर्नुहोस्।"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Wi-Fi नेटवर्कहरू खोज्नुहोस् र कनेक्ट गर्नुहोस्"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"हवाइजहाज, हवाइजहाजका सुरक्षित नेटवर्क"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"कल तथा SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi कलिङ"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"उपलब्ध छैन"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"केही समयका लागि अनुपलब्ध छ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM कार्ड छैन"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"प्राथमिकताहरू"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"नेटवर्कसम्बन्धी प्राथमिकताहरू"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक Wi-Fi नेटवर्कमा कनेक्ट गरियोस्"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्सन, इन्टरनेट, वायरलेस, डेटा, wifi, wi-fi, wi fi, सेलुलर, मोबाइल, सेल सेवा प्रदायक, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"हवाइजहाज मोड अन गरिएका नेटवर्क हेर्नुहोस्"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"हवाइजहाज मोडमा काम गर्ने नेटवर्कहरू देखाइँदै छन्"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"इन्टरनेट अन गर्नुहोस्"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"इन्टरनेट अफ गर्नुहोस्"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"इन्टनेट रिसेट गर्ने हो?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"तपाईंले यसो गर्नुभयो भने तपाईंको फोन कल अन्त्य हुने छ"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"तपाईंले यसो गर्नुभयो भने तपाईंको फोन कल अन्त्य हुने छ"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"इन्टरनेट रिसेट गरिँदै छ…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"कनेक्टिभिटीसम्बन्धी समस्या समाधान गर्नुहोस्"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"हवाइजहाज मोडमा काम गर्ने नेटवर्कहरू उपलब्ध छन्"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"नेटवर्क बदल्न इथरनेट डिस्कनेक्ट गर्नुहोस्"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"इथरनेट नेटवर्कमा कनेक्ट भएका बेला नेटवर्क बदल्न सकिँदैन"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"हवाइजहाज मोडमा चल्ने नेटवर्कहरू"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"इन्टरनेटमा कनेक्ट गरिएको छ"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"इन्टरनेट स्वतः कनेक्ट हुँदैन"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"रङ"</string>
     <string name="category_name_others" msgid="2366006298768550310">"अन्य"</string>
     <string name="category_name_general" msgid="7737273712848115886">"सामान्य"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"सबै एपहरू हेर्नुहोस्"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"स्मार्ट फर्वार्डिङ"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"स्मार्ट फर्वार्डिङ अन गरियो"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"फोन नम्बर हाल्नुहोस्"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"फोन नम्बर हालिएको छैन।"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ठिक छ"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G चलाउन दिनुहोस्"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G सेलुलर इन्टरनेट प्रयोग गर्नुहोस्। आपत्‌कालीन कलका निम्ति 2G सदैव अन रहन्छ।"</string>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 54b7224..627fa59 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -273,7 +273,7 @@
     <item msgid="5099026183238335900">"monitorlocatie"</item>
     <item msgid="2297727967385895059">"locatie met hoog energieverbruik controleren"</item>
     <item msgid="8700593962030471569">"gebruiksstatistieken ophalen"</item>
-    <item msgid="4140820386622184831">"microfoon dempen/dempen opheffen"</item>
+    <item msgid="4140820386622184831">"microfoon uit-/aanzetten"</item>
     <item msgid="317746827951691657">"toast weergeven"</item>
     <item msgid="5679422988212309779">"media projecteren"</item>
     <item msgid="6454031639780101439">"VPN activeren"</item>
@@ -340,7 +340,7 @@
     <item msgid="8482874682804856549">"Locatie"</item>
     <item msgid="5186169827582545242">"Locatie"</item>
     <item msgid="6122293931012635638">"Gebruiksstatistieken ophalen"</item>
-    <item msgid="2526677383312751932">"Microfoon dempen/dempen opheffen"</item>
+    <item msgid="2526677383312751932">"Microfoon uit-/aanzetten"</item>
     <item msgid="4000577305179914546">"Toast weergeven"</item>
     <item msgid="8660207174515570558">"Media projecteren"</item>
     <item msgid="3904996949561946108">"VPN activeren"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f23f5c5..478e344 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Maak de tekst op het scherm kleiner of groter."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Verkleinen"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Vergroten"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Automatisch draaien gebruiken"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Voorbeeldtekst"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"De tovenaar van Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> vingerafdruk ingesteld</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Ontgrendelen met vingerafdruk"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Je vingerafdruk instellen"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Je vingerafdruk gebruiken"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Raak de vingerafdruksensor aan om je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps. Dit kan met alle vingerafdrukken die zijn toegevoegd aan je telefoon, dus wees voorzichtig met wie je toevoegt."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Je vingerafdruk is misschien minder veilig dan een sterk patroon of sterke pincode."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Jij hebt het voor het zeggen"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Houd rekening met het volgende"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"De gegevens die door Vingerafdruk worden opgenomen, worden beveiligd opgeslagen en nooit doorgestuurd vanaf je telefoon. Je kunt je gegevens altijd verwijderen via Instellingen."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Je vingerafdruk is misschien minder veilig dan een sterk patroon of sterke pincode."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Je telefoon gebruikt af en toe de recente afbeeldingen van je vingerafdrukken om betere vingerafdrukmodellen te maken."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Gebruik je vingerafdruk om je telefoon te ontgrendelen of aankopen goed te keuren.\n\nOpmerking: Je kunt je vingerafdruk niet gebruiken om dit apparaat te ontgrendelen. Neem contact op met de beheerder van je organisatie voor meer informatie."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Gebruik je vingerafdruk om je telefoon te ontgrendelen of aankopen goed te keuren.\n\nOpmerking: Je vingerafdruk is mogelijk minder veilig dan een sterk patroon of sterke pincode."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Annuleren"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nee"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Overslaan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Doorgaan"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Akkoord"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Overslaan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Volgende"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Vingerafdruk overslaan?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Overslaan"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Annuleren"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Raak de sensor aan"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Tik op het vingerafdrukicoon en houd dit vast"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"De sensor bevindt zich aan de achterkant van je telefoon. Gebruik je wijsvinger."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"De sensor zit in het scherm. Zoek de vingerafdruk met een oplichtende cirkel."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"De vingerafdruksensor bevindt zich op je scherm. Beweeg je vinger over het scherm om de sensor te vinden."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustratie met apparaat en locatie van vingerafdruksensor"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Naam"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Verwijderen"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Raak de sensor aan"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Plaats je vinger op de sensor en til deze op nadat je een trilling hebt gevoeld."</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Raak de sensor aan"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Raak de sensor meerdere keren aan om de verschillende delen van je vingerafdruk toe te voegen."</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Vingerafdruk toegevoegd"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Als je dit icoon ziet, kun je je vingerafdruk gebruiken voor identificatie of om een aankoop goed te keuren."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Later doen"</string>
@@ -857,7 +871,7 @@
     <string name="wifi_limit_optimizations_summary" msgid="8461087338100462302">"Accugebruik van wifi beperken"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="681353878530696197">"Overschakelen naar mobiele data als wifi geen internettoegang meer heeft."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="2844653839490977040">"Automatisch overschakelen naar mobiele data"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Mobiele data gebruiken wanneer er geen internettoegang via wifi is. Er kunnen kosten voor datagebruik in rekening worden gebracht."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="7039944853033554386">"Mobiele data gebruiken als er geen internettoegang via wifi is. Er kunnen kosten voor datagebruik in rekening worden gebracht."</string>
     <string name="wifi_add_network" msgid="4178564862173751181">"Netwerk toevoegen"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2536725796700696566">"Wifi-voorkeuren"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="7822368955551467382">"Wifi wordt automatisch opnieuw ingeschakeld"</string>
@@ -1148,10 +1162,10 @@
     <string name="volume_ring_description" msgid="5423168446359881864">"Ringtone en meldingen"</string>
     <string name="volume_notification_description" msgid="3241009629930030492">"Meldingen"</string>
     <string name="volume_alarm_description" msgid="156563371961039376">"Wekkers"</string>
-    <string name="volume_ring_mute" msgid="1445718401945149622">"Ringtone en meldingen dempen"</string>
-    <string name="volume_media_mute" msgid="1881020121757820746">"Muziek en andere media dempen"</string>
-    <string name="volume_notification_mute" msgid="2612197659377126312">"Meldingen dempen"</string>
-    <string name="volume_alarm_mute" msgid="3730895630530980760">"Wekkers dempen"</string>
+    <string name="volume_ring_mute" msgid="1445718401945149622">"Ringtone- en meldingsgeluid uitzetten"</string>
+    <string name="volume_media_mute" msgid="1881020121757820746">"Muziek- en ander mediageluid uitzetten"</string>
+    <string name="volume_notification_mute" msgid="2612197659377126312">"Meldingsgeluid uitzetten"</string>
+    <string name="volume_alarm_mute" msgid="3730895630530980760">"Wekkergeluid uitzetten"</string>
     <string name="dock_settings" msgid="4654404127402812514">"Docken"</string>
     <string name="dock_settings_title" msgid="1276956575555480214">"Instellingen voor dockstation"</string>
     <string name="dock_audio_settings_title" msgid="8294821925086965934">"Audio"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Zoeken"</string>
     <string name="display_settings" msgid="7197750639709493852">"Scherm"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Scherm autom. draaien"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Uit"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Aan"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Aan: op basis van gezicht"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Gezichtsherkenning aanzetten"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Kleuren"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natuurlijk"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Versterkt"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aan / Scherm schakelt niet uit als je ernaar kijkt"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Uit"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Toegang tot camera nodig"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Tik om de rechten voor services voor apparaatpersonalisatie te beheren"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Deze functie voorkomt dat je scherm uitschakelt als je ernaar kijkt"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Schermaandacht gebruikt de camera aan de voorzijde om te zien of er iemand naar het scherm kijkt. Deze functie werkt op het apparaat zelf: de afbeeldingen worden nooit opgeslagen of naar Google verzonden."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Schermaandacht inschakelen"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Als het scherm donker is, wordt het ingeschakeld bij nieuwe meldingen"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Altijd tijd en info weergeven"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Hoger batterijgebruik"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Vetgedrukte tekst"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Vetgedrukte tekst"</string>
     <string name="title_font_size" msgid="570613010306330622">"Lettergrootte"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Tekst groter of kleiner maken"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Instellingen simkaartvergrendeling"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Andere gebruikers"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Apparaatopslag"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Draagbare opslag"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Wekkers en herinneringen"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Instellen van wekkers en herinneringen toestaan"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Wekkers en herinneringen"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Toestaan dat deze app wekkers of andere op tijd gebaseerde afspraken plant. Hiermee kan de app worden geactiveerd en uitgevoerd, ook als je het apparaat niet gebruikt. Als je dit recht intrekt, kan de werking van de app worden verstoord (met name wekkers die de app heeft ingesteld, werken niet meer)."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"schema, wekker, herinnering, afspraak"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> gebruikt van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Gebruikt van <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Locatieservices"</string>
     <string name="location_title" msgid="5819154746934945021">"Mijn locatie"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Locatie voor werkprofiel"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Toegang van app tot locatie"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Locatie is uitgeschakeld"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> van <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps hebben toegang tot de locatie</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> van <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> apps heeft toegang tot de locatie</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Recente locatietoegang"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Details weergeven"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Er zijn geen apps die je locatie onlangs hebben opgevraagd"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Er zijn geen apps die recent toegang hebben gehad tot je locatie"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Hoog accugebruik"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Laag batterijgebruik"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Scannen via wifi en bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wifi-scannen"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Apps en services toestaan altijd te scannen naar wifi-netwerken in de buurt, zelfs als wifi is uitgeschakeld. Dit kan worden gebruikt om bijvoorbeeld locatiegebaseerde functies en services te verbeteren."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-scannen"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Apps en services toestaan altijd te scannen naar apparaten in de buurt, zelfs als bluetooth is uitgeschakeld. Dit kan worden gebruikt om bijvoorbeeld locatiegebaseerde functies en services te verbeteren."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Locatieservices"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Locatieservices voor het werk"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Tijdzonedetectie op basis van locatie"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Tijdzonedetectie op basis van locatie"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Hiermee kan de locatie van het apparaat worden gebruikt om de huidige tijdzone te bepalen. Andere locatie-instellingen, zoals wifi-scannen, kunnen van invloed zijn op de nauwkeurigheid van de tijdzonedetectie."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Aan"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Uit"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatische tijdzonedetectie is uitgeschakeld"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatische tijdzone staat uit"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Tijdzonedetectie op basis van locatie is uitgeschakeld"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Tijdzonedetectie op basis van locatie wordt niet ondersteund"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Wijzigingen in tijdzonedetectie op basis van locatie zijn niet toegestaan"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Inschakelen"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Opslag wissen"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Updates verwijderen"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Je hebt ervoor gekozen deze app standaard te starten voor bepaalde acties."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Bepaalde activiteiten die je hebt geselecteerd, worden standaard geopend in deze app."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Je hebt ervoor gekozen deze app toe te staan widgets te maken en toegang tot de widgetgegevens te geven."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Geen standaardwaarden ingesteld."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Standaardwaarden wissen"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Standaardvoorkeuren wissen"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Deze app is mogelijk niet ontworpen voor je scherm. Je kunt hier bepalen hoe de app wordt aangepast aan je scherm."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Vragen bij starten"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"App schalen"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Je kunt dit apparaat aanpassen aan je behoeften. Deze toegankelijkheidsfuncties kunnen later worden gewijzigd in Instellingen."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Lettergrootte wijzigen"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Schermlezers"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio en tekst op het scherm"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Ondertiteling"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Algemeen"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Scherm"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst en weergave"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Scherm donkerder maken"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rood-groen"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rood-groen"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blauw-geel"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Helderheid verlagen"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Helderheid verlagen"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Maak het scherm donkerder dan de minimumhelderheid van je telefoon"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Maak het scherm helderder dan de minimumhelderheid van je tablet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Maak je scherm donkerder zodat je het prettiger kunt lezen.&lt;br/&gt;&lt;br/&gt; Dit kan in de volgende situaties handig zijn: &lt;ol&gt; &lt;li&gt; De standaard minimumhelderheid van je telefoon is te helder voor je.&lt;/li&gt; &lt;li&gt; Je gebruikt je telefoon in een donkere omgeving, zoals \'s avonds laat of in een donkere kamer voordat je gaat slapen.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3177,7 +3198,7 @@
     <string name="preferred_network_type_title" msgid="812509938714590857">"Voorkeursnetwerktype"</string>
     <string name="preferred_network_type_summary" msgid="8786291927331323061">"LTE (aanbevolen)"</string>
     <string name="mms_message_title" msgid="6624505196063391964">"Mms-berichten"</string>
-    <string name="mms_message_summary" msgid="2855847140141698341">"Verzenden en ontvangen wanneer mobiele data zijn uitgeschakeld"</string>
+    <string name="mms_message_summary" msgid="2855847140141698341">"Verzenden en ontvangen als mobiele data uitgeschakeld zijn"</string>
     <string name="data_during_calls_title" msgid="3940276893360429144">"Data tijdens gesprekken"</string>
     <string name="data_during_calls_summary" msgid="2289050189544214759">"Toestaan dat deze simkaart alleen voor mobiele data wordt gebruikt tijdens gesprekken"</string>
     <string name="work_sim_title" msgid="8999872928646924429">"Simkaart voor werk"</string>
@@ -3297,7 +3318,7 @@
     <string name="keywords_network_reset" msgid="4075670452112218042">"resetten, herstellen, terugzetten naar fabrieksinstellingen"</string>
     <string name="keywords_factory_data_reset" msgid="4979623326958976773">"wissen, verwijderen, legen, herstellen, schoonmaken, fabrieksinstellingen terugzetten"</string>
     <string name="keywords_printing" msgid="3528250034669909466">"printer"</string>
-    <string name="keywords_sounds" msgid="1850691834585575875">"speakerpiep, speaker, luidspreker, volume, dempen, stil, audio, muziek"</string>
+    <string name="keywords_sounds" msgid="1850691834585575875">"speakerpiep, speaker, luidspreker, volume, dempen, geluid uitzetten, stil, audio, muziek"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="1500312884808362467">"niet storen, verstoren, onderbreking, storing"</string>
     <string name="keywords_app" msgid="7983814237980258061">"RAM"</string>
     <string name="keywords_location" msgid="8016374808099706213">"in de buurt, locatie, geschiedenis, rapportage, gps"</string>
@@ -3334,10 +3355,12 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"gezicht"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"vingerafdruk, vingerafdruk toevoegen"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"scherm dimmen, touchscreen, batterij, slimme helderheid, dynamische helderheid, automatische helderheid"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"scherm dimmen, slaap, batterij, time-out, aandacht, display, scherm, inactiviteit"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"roteren, draaien, omdraaien, rotatie, portret, landschap, oriëntatie, verticaal, horizontaal, staand, liggend"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"upgrade, android"</string>
-    <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, schema, meldingen, blokkeren, stil, trillen, slapen, werken, focus, geluid, dempen, dag, weekdag, weekend, doordeweekse avond, evenement, afspraak"</string>
+    <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, schema, meldingen, blokkeren, stil, trillen, slapen, werken, focus, geluid, dempen, dag, weekdag, weekend, doordeweekse avond, evenement, afspraak, geluid uitzetten, niet storen"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"scherm, vergrendelingstijd, time-out, vergrendelscherm"</string>
     <string name="keywords_storage_settings" msgid="6018856193950281898">"geheugen, cache, gegevens, wissen, verwijderen, vrij, vrijmaken, ruimte"</string>
     <string name="keywords_bluetooth_settings" msgid="2588159530959868188">"verbonden, apparaat, hoofdtelefoon, koptelefoon, headset, speaker, luidspreker, draadloos, koppelen, oordoppen, oordopjes, muziek, media"</string>
@@ -3407,7 +3430,7 @@
     <string name="zen_mode_automation_settings_page_title" msgid="6217433860514433311">"Planningen"</string>
     <string name="zen_mode_automatic_rule_settings_page_title" msgid="5264835276518295033">"Planning"</string>
     <string name="zen_mode_schedule_category_title" msgid="1381879916197350988">"Planning"</string>
-    <string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Telefoon dempen op bepaalde tijdstippen"</string>
+    <string name="zen_mode_automation_suggestion_title" msgid="7776129050500707960">"Telefoongeluid uitzetten op bepaalde tijdstippen"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="1946750790084170826">"Regels voor \'Niet storen\' instellen"</string>
     <string name="zen_mode_schedule_title" msgid="7064866561892906613">"Planning"</string>
     <string name="zen_mode_use_automatic_rule" msgid="733850322530002484">"Planning gebruiken"</string>
@@ -3432,7 +3455,7 @@
     <string name="zen_mode_what_to_block_title" msgid="5692710098205334164">"Aangepaste beperkingen"</string>
     <string name="zen_mode_block_effects_screen_on" msgid="8780668375194500987">"Wanneer het scherm is ingeschakeld"</string>
     <string name="zen_mode_block_effects_screen_off" msgid="2291988790355612826">"Wanneer het scherm is uitgeschakeld"</string>
-    <string name="zen_mode_block_effect_sound" msgid="7929909410442858327">"Geluid en trillen dempen"</string>
+    <string name="zen_mode_block_effect_sound" msgid="7929909410442858327">"Geluid en trillen uitzetten"</string>
     <string name="zen_mode_block_effect_intent" msgid="7621578645742903531">"Scherm niet inschakelen"</string>
     <string name="zen_mode_block_effect_light" msgid="1997222991427784993">"Lampje niet laten knipperen"</string>
     <string name="zen_mode_block_effect_peek" msgid="2525844009475266022">"Geen meldingen op het scherm"</string>
@@ -3474,14 +3497,14 @@
     <string name="zen_category_exceptions" msgid="1316097981052752811">"Wekkers en andere onderbrekingen"</string>
     <string name="zen_category_schedule" msgid="2003707171924226212">"Planningen"</string>
     <string name="zen_category_duration" msgid="7515850842082631460">"Duur voor \'Snelle instellingen\'"</string>
-    <string name="zen_sound_footer" msgid="4090291351903631977">"Wanneer \'Niet storen\' is ingeschakeld, worden geluiden en trillingen gedempt, behalve voor de items die je hierboven toestaat."</string>
+    <string name="zen_sound_footer" msgid="4090291351903631977">"Als \'Niet storen\' aanstaat, staan geluiden en trillingen uit, behalve als je ze hierboven toestaat."</string>
     <string name="zen_custom_settings_dialog_title" msgid="4613603772432720380">"Aangepaste instellingen"</string>
     <string name="zen_custom_settings_dialog_review_schedule" msgid="4674671820584759928">"Planning controleren"</string>
     <string name="zen_custom_settings_dialog_ok" msgid="8842373418878278246">"OK"</string>
     <string name="zen_custom_settings_notifications_header" msgid="7635280645171095398">"Meldingen"</string>
     <string name="zen_custom_settings_duration_header" msgid="5065987827522064943">"Duur"</string>
     <string name="zen_msg_event_reminder_title" msgid="5362025129007417554">"Meldingen, afspraken en herinneringen"</string>
-    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Wanneer \'Niet storen\' is ingeschakeld, worden berichten, herinneringen en afspraken gedempt, met uitzondering van de items die je hierboven toestaat. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken."</string>
+    <string name="zen_msg_event_reminder_footer" msgid="2700459146293750387">"Als \'Niet storen\' aanstaat, wordt het geluid van berichten, herinneringen en afspraken uitgezet, behalve als je ze hierboven toestaat. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je nog wel kunnen bereiken."</string>
     <string name="zen_onboarding_ok" msgid="8764248406533833392">"Klaar"</string>
     <string name="zen_onboarding_settings" msgid="2815839576245114342">"Instellingen"</string>
     <string name="zen_onboarding_new_setting_title" msgid="8813308612916316657">"Geen zichtbare of hoorbare meldingen"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringtones"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Andere geluiden en trillingen"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Meldingen"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Gesprek"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Recent verstuurd"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Alles weergeven van de afgelopen zeven dagen"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Geavanceerd"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Algemeen"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Werkmeldingen"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Aanpasbare meldingen"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Aanpasbare meldingsprioriteit"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Weergeven in pull-downvenster, statusbalk en op vergrendelscherm"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Stille meldingen in de statusbalk verbergen"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Knipperlicht"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Meldingen op vergrendelscherm"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacy"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Vergrendelscherm overslaan"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Na ontgrendelen via gezichtsherkenning rechtstreeks naar laatst gebruikte scherm gaan"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Scherm vergrendelen, vergrendelscherm, overslaan"</string>
@@ -3583,7 +3607,7 @@
     <string name="lock_screen_notifs_redact_work_summary" msgid="3238238380405430156">"Gevoelige werkprofielcontent weergeven op vergrendelscherm"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6540443483088311328">"Content van alle meldingen weergeven"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7837303171531166789">"Gevoelige content alleen weergeven als ontgrendeld"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="3388290397947365744">"Helemaal geen meldingen weergeven"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3388290397947365744">"Helemaal geen meldingen tonen"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="4688399629301178487">"Hoe wil je dat het vergrendelscherm wordt weergegeven?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1360388192096354315">"Vergrendelscherm"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="8373401288962523946">"Content van alle werkmeldingen weergeven"</string>
@@ -3596,7 +3620,7 @@
     <string name="notification_group_title" msgid="7525666535695631538">"Groep meldingscategorieën"</string>
     <string name="notification_importance_title" msgid="1545158655988342703">"Gedrag"</string>
     <string name="notification_importance_unspecified" msgid="1543165530748339700">"Geluid toestaan"</string>
-    <string name="notification_importance_blocked" msgid="4933285639639899394">"Nooit meldingen weergeven"</string>
+    <string name="notification_importance_blocked" msgid="4933285639639899394">"Nooit meldingen tonen"</string>
     <string name="conversations_category_title" msgid="5586541340846847798">"Gesprekken"</string>
     <string name="conversation_category_title" msgid="6777135786004214149">"Gesprek"</string>
     <string name="conversation_section_switch_title" msgid="3332885377659473775">"Gespreksgedeelte"</string>
@@ -3638,13 +3662,13 @@
     <string name="allow_interruption" msgid="5237201780159482716">"Onderbrekingen toestaan"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"De app geluid laten maken, laten trillen en/of meldingen laten weergeven op het scherm"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"Prioriteit"</string>
-    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Wordt bovenaan het gespreksgedeelte weergegeven, verschijnt als zwevende bubbel, geeft profielfoto weer op vergrendelscherm"</string>
+    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Verschijnt als zwevende bubbel bovenaan het gespreksgedeelte en toont profielfoto op vergrendelscherm"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"<xliff:g id="APP_NAME">%1$s</xliff:g> ondersteunt de meeste gespreksfuncties niet. Je kunt niet instellen dat een gesprek prioriteit heeft en gesprekken worden niet weergegeven als zwevende bubbels."</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"Meldingen in het pull-downvenster samenvouwen tot één regel"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"Geen geluid of trilling"</string>
     <string name="notification_conversation_summary_low" msgid="6352818857388412326">"Geen geluid of trilling en wordt op een lagere positie in het gedeelte met gesprekken weergegeven"</string>
     <string name="notification_channel_summary_default" msgid="3674057458265438896">"Kan overgaan of trillen op basis van de telefooninstellingen"</string>
-    <string name="notification_channel_summary_high" msgid="3411637309360617621">"Wanneer het apparaat is ontgrendeld, worden meldingen als banner bovenaan het scherm weergegeven"</string>
+    <string name="notification_channel_summary_high" msgid="3411637309360617621">"Wanneer het apparaat is ontgrendeld, worden meldingen als banner bovenaan het scherm getoond"</string>
     <string name="notification_switch_label" msgid="8029371325967501557">"Alle meldingen van \'<xliff:g id="APP_NAME">%1$s</xliff:g>\'"</string>
     <string name="notification_app_switch_label" msgid="4422902423925084193">"Alle meldingen van <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="default_notification_assistant" msgid="243718059890346442">"Aanpasbare meldingen"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> melding per week</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nooit"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Toegang tot meldingen"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Apparaat- en app-meldingen"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Beheren welke meldingen je ziet in je apps en op je apparaten"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Toegang tot werkprofielmeldingen is geblokkeerd"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Apps kunnen geen meldingen lezen"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Uitschakelen"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Annuleren"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Toegestane meldingstypen"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Belangrijke doorlopende meldingen"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Gespreksmeldingen"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Meldingen met waarschuwing"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Stille meldingen"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Realtime"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Realtime communicatie van gebruikte apps, navigatie, telefoongesprekken en meer"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Gesprekken"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"Sms en andere communicatie"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Standaard"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Meldingen die geluid mogen laten horen of mogen trillen op basis van de instellingen"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Stil"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Meldingen die nooit een geluid laten horen of trillen"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Alle apps bekijken"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"De instellingen voor meldingen wijzigen voor elke app die meldingen kan sturen"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Apps getoond op apparaat"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR-helperservices"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Er zijn geen geïnstalleerde apps die hebben gevraagd om te worden uitgevoerd als VR-helperservices."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR-servicetoegang toestaan voor <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3754,10 +3779,10 @@
     <string name="notification_toggle_off" msgid="3295373308338024844">"Uit"</string>
     <string name="app_notification_block_title" msgid="3880322745749900296">"Alles blokkeren"</string>
     <string name="app_notification_block_summary" msgid="1804611676339341551">"Deze meldingen nooit weergeven"</string>
-    <string name="notification_content_block_title" msgid="6689085826061361351">"Meldingen weergeven"</string>
-    <string name="notification_content_block_summary" msgid="329171999992248925">"Nooit meldingen weergeven in het meldingenpaneel of op randapparaten"</string>
+    <string name="notification_content_block_title" msgid="6689085826061361351">"Meldingen tonen"</string>
+    <string name="notification_content_block_summary" msgid="329171999992248925">"Nooit meldingen tonen in het meldingenpaneel of op randapparaten"</string>
     <string name="notification_badge_title" msgid="6854537463548411313">"Meldingsstipje toestaan"</string>
-    <string name="notification_channel_badge_title" msgid="6505542437385640049">"Meldingsstipje weergeven"</string>
+    <string name="notification_channel_badge_title" msgid="6505542437385640049">"Meldingsstipje tonen"</string>
     <string name="app_notification_override_dnd_title" msgid="3769539356442226691">"\'Niet storen\' negeren"</string>
     <string name="app_notification_override_dnd_summary" msgid="4894641191397562920">"Deze meldingen nog steeds ontvangen, ook wanneer \'Niet storen\' is ingeschakeld"</string>
     <string name="app_notification_visibility_override_title" msgid="7778628150022065920">"Vergrendelscherm"</string>
@@ -3918,7 +3943,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Wijzigen in \'Alleen wekkers\' tot <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="722093064250082317">"Wijzigen in \'Altijd onderbreken\'"</string>
     <string name="zen_mode_screen_on" msgid="7312758100468915319">"Wanneer het scherm is ingeschakeld"</string>
-    <string name="zen_mode_screen_on_summary" msgid="510055058460316698">"Meldingen die door \'Niet storen\' zijn gedempt, op het scherm laten weergeven en een icoon in de statusbalk weergeven"</string>
+    <string name="zen_mode_screen_on_summary" msgid="510055058460316698">"Meldingen die door \'Niet storen\' geen geluid maken, op het scherm laten weergeven en een icoon in de statusbalk weergeven"</string>
     <string name="zen_mode_screen_off" msgid="7069798697669366075">"Wanneer het scherm is uitgeschakeld"</string>
     <string name="zen_mode_screen_off_summary" msgid="4698018253505406152">"Toestaan dat meldingen die op stil zijn gezet door \'Niet storen\', het scherm inschakelen of het meldingslampje laten knipperen"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="1958271859408992636">"Meldingen die op stil zijn gezet door \'Niet storen\', het scherm laten inschakelen"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Standaard openen"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Links openen"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Ondersteunde links openen"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Ondersteunde links worden geopend in deze app"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Links om te openen in deze app"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Openen zonder te vragen"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Ondersteunde links"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Andere standaardinstellingen"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Andere standaardvoorkeuren"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Link toevoegen"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Een app kan links verifiëren om ze automatisch te openen in de app. "<annotation id="url">"Meer informatie"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> geverifieerde links</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> geverifieerde link</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Deze links zijn geverifieerd en worden automatisch geopend in deze app.</item>
+      <item quantity="one">Deze link is geverifieerd en wordt automatisch geopend in deze app.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Controleren op andere ondersteunde links…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Annuleren"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ondersteunde links</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ondersteunde link</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Toevoegen"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Wordt geopend in <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> gebruikt in <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"interne opslag"</string>
     <string name="storage_type_external" msgid="125078274000280821">"externe opslag"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Camera niet toegestaan"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Screenshot niet toegestaan"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Kan deze app niet openen"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Neem bij vragen contact op met je IT-beheerder"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Meer informatie"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Je beheerder kan apps en gegevens bijhouden en beheren die aan je werkprofiel zijn gekoppeld (waaronder instellingen, rechten, zakelijke toegang, netwerkactiviteit en locatiegegevens van het apparaat)."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Je beheerder kan apps en gegevens bijhouden en beheren die aan deze gebruiker zijn gekoppeld (waaronder instellingen, rechten, zakelijke toegang, netwerkactiviteit en locatiegegevens van het apparaat)."</string>
@@ -4284,7 +4331,7 @@
     <string name="condition_airplane_title" msgid="5847967403687381705">"Vliegmodus is ingeschakeld"</string>
     <string name="condition_airplane_summary" msgid="1964500689287879888">"Netwerken niet beschikbaar"</string>
     <string name="condition_zen_title" msgid="7674761111934567490">"\'Niet storen\' is ingeschakeld"</string>
-    <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"Telefoon gedempt"</string>
+    <string name="condition_zen_summary_phone_muted" msgid="6516753722927681820">"Telefoongeluid staat uit"</string>
     <string name="condition_zen_summary_with_exceptions" msgid="9019937492602199663">"Met uitzonderingen"</string>
     <string name="condition_battery_title" msgid="6395113995454385248">"Batterijbesparing aan"</string>
     <string name="condition_battery_summary" msgid="8436806157833107886">"Functies zijn beperkt"</string>
@@ -4295,7 +4342,7 @@
     <string name="condition_work_title" msgid="174326145616998813">"Werkprofiel is uitgeschakeld"</string>
     <string name="condition_work_summary" msgid="7113473121312772398">"Voor apps en meldingen"</string>
     <string name="condition_device_muted_action_turn_on_sound" msgid="4078406807327674934">"Geluid inschakelen"</string>
-    <string name="condition_device_muted_title" msgid="2446306263428466378">"Belsoftware gedempt"</string>
+    <string name="condition_device_muted_title" msgid="2446306263428466378">"Ringtone staat uit"</string>
     <string name="condition_device_muted_summary" msgid="3772178424510397327">"Voor gesprekken en meldingen"</string>
     <string name="condition_device_vibrate_title" msgid="9058943409545158583">"Alleen trillen"</string>
     <string name="condition_device_vibrate_summary" msgid="7537724181691903202">"Voor gesprekken en meldingen"</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 beperking</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Het door de provider berekende dataverbruik kan afwijken van de berekening van het apparaat"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Sluit data uit die worden gebruikt door providernetwerken"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Sluit data uit die worden gebruikt door providernetwerken"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> gebruikt"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Datawaarschuwing instellen"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datawaarschuwing"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(verwijderd voor gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(uitgezet voor gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Service voor automatisch invullen"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"auto, automatisch, invullen, aanvullen"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Wachtwoorden"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automatisch, invullen, automatisch invullen, wachtwoord"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Zorg dat je deze app vertrouwt&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; maakt gebruik van de content op je scherm om te bepalen wat automatisch kan worden aangevuld."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Automatisch invullen"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Logniveau"</string>
@@ -4775,10 +4823,10 @@
     <string name="gesture_prevent_ringing_title" msgid="5978577898997523581">"Druk tegelijkertijd op de aan/uit-knop en de knop \'Volume omhoog\' voor"</string>
     <string name="gesture_prevent_ringing_sound_title" msgid="4529077822282099235">"Snelkoppeling om ringtone uit te schakelen"</string>
     <string name="prevent_ringing_option_vibrate" msgid="5456962289649581737">"Trillen"</string>
-    <string name="prevent_ringing_option_mute" msgid="7446121133560945051">"Dempen"</string>
+    <string name="prevent_ringing_option_mute" msgid="7446121133560945051">"Geluid uitzetten"</string>
     <string name="prevent_ringing_option_none" msgid="7776676007180834163">"Niets doen"</string>
     <string name="prevent_ringing_option_vibrate_summary" msgid="3435299885425754304">"Trillen"</string>
-    <string name="prevent_ringing_option_mute_summary" msgid="3939350522269337013">"Dempen"</string>
+    <string name="prevent_ringing_option_mute_summary" msgid="3939350522269337013">"Geluid uit"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Netwerkgegevens"</string>
     <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Je apparaatnaam is zichtbaar voor apps op je telefoon. De apparaatnaam kan ook door andere mensen worden gezien als je verbinding maakt met bluetooth-apparaten of een wifi-netwerk, of als je een wifi-hotspot instelt."</string>
     <string name="devices_title" msgid="649715719278562515">"Apparaten"</string>
@@ -4872,7 +4920,7 @@
     <string name="mobile_network_list_add_more" msgid="4478586073355236604">"Meer toevoegen"</string>
     <string name="mobile_network_active_sim" msgid="6397581267971410039">"Actief/simkaart"</string>
     <string name="mobile_network_inactive_sim" msgid="5829757490580409899">"Inactief/simkaart"</string>
-    <string name="mobile_network_active_esim" msgid="4673190244386572318">"Actief / gedownloade simkaart"</string>
+    <string name="mobile_network_active_esim" msgid="4673190244386572318">"Actief/gedownloade simkaart"</string>
     <string name="mobile_network_inactive_esim" msgid="2901035056727849007">"Inactief/gedownloade simkaart"</string>
     <string name="mobile_network_sim_name" msgid="3187192894150386537">"Naam en kleur van simkaart"</string>
     <string name="mobile_network_sim_name_label" msgid="1452440641628369625">"Naam"</string>
@@ -4883,7 +4931,7 @@
     <string name="mobile_network_disable_sim_explanation" msgid="2851862257846773796">"Verwijder de simkaart om deze sim uit te schakelen"</string>
     <string name="mobile_network_tap_to_activate" msgid="4139979375717958102">"Tik om <xliff:g id="CARRIER">%1$s</xliff:g> te activeren"</string>
     <string name="mobile_network_esim_swap_confirm_title" msgid="2762744961192218789">"Overschakelen naar <xliff:g id="CARRIER">%1$s</xliff:g>?"</string>
-    <string name="mobile_network_esim_swap_confirm_body" msgid="8168680839542031781">"Er kan slechts één gedownloade simkaart tegelijk actief zijn.\n\nAls je overschakelt naar <xliff:g id="CARRIER1">%1$s</xliff:g>, wordt de service van <xliff:g id="CARRIER2">%2$s</xliff:g> niet geannuleerd."</string>
+    <string name="mobile_network_esim_swap_confirm_body" msgid="8168680839542031781">"Er kan maar 1 gedownloade simkaart tegelijk actief zijn.\n\nAls je overschakelt naar <xliff:g id="CARRIER1">%1$s</xliff:g>, wordt de service van <xliff:g id="CARRIER2">%2$s</xliff:g> niet geannuleerd."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="8695772737522378095">"Overschakelen naar <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="mobile_network_erase_sim" msgid="4629071168032714930">"Simkaart wissen"</string>
     <string name="mobile_network_erase_sim_error_dialog_title" msgid="6680959559589234726">"Kan simkaart niet wissen"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"De netwerkgebruiksmodus wijzigen"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Voorkeursnetwerktype"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Provider"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versie van instellingen"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versie van providerinstellingen"</string>
     <string name="call_category" msgid="641461844504128789">"Bellen"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Provider videogesprekken"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Systeem selecteren"</string>
@@ -4916,9 +4964,9 @@
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Simkaart inschakelen?"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Overschakelen naar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
     <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Overschakelen naar simkaart gebruiken?"</string>
-    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Er kan slechts 1 simkaart tegelijk actief zijn.\n\nAls je overschakelt naar <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, wordt de service van <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> niet geannuleerd."</string>
-    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Er kan slechts 1 gedownloade simkaart tegelijk actief zijn.\n\nAls je overschakelt naar <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, wordt de service van <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> niet geannuleerd."</string>
-    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Er kan slechts 1 simkaart tegelijk actief zijn.\n\nAls je overschakelt, wordt de service van <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> niet geannuleerd."</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Er kan maar 1 simkaart tegelijk actief zijn.\n\nAls je overschakelt naar <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, wordt de service van <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> niet geannuleerd."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Er kan maar 1 gedownloade simkaart tegelijk actief zijn.\n\nAls je overschakelt naar <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, wordt de service van <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> niet geannuleerd."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Er kan maar 1 simkaart tegelijk actief zijn.\n\nAls je overschakelt, wordt de service van <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> niet geannuleerd."</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Overschakelen naar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Verbinding maken met netwerk…"</string>
     <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Overschakelen naar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Verwijder de simkaart en plaats deze opnieuw. Als het probleem blijft optreden, start je het apparaat opnieuw op."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Probeer de simkaart weer in te schakelen. Als het probleem blijft optreden, start je het apparaat opnieuw op."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Netwerkactivering"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Wijziging van provider"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is actief"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tik om de instellingen voor de simkaart te updaten"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Overgeschakeld naar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5040,7 +5089,7 @@
     <string name="keywords_backup_calling" msgid="8592800915478816800">"reserveoptie voor bellen"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Inkomende mms"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Kan mms niet verzenden"</string>
-    <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Tik om mms-berichten via <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> toe te staan wanneer mobiele data zijn uitgeschakeld"</string>
+    <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Tik om mms-berichten via <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> toe te staan als mobiele data uitgeschakeld zijn"</string>
     <string name="enable_mms_notification_channel_title" msgid="1798206332620642108">"Mms"</string>
     <string name="sim_combination_warning_notification_title" msgid="1365401631492986487">"Problemen met sim-combinatie"</string>
     <string name="dual_cdma_sim_warning_notification_summary" msgid="2826474790710586487">"Als je <xliff:g id="OPERATOR_NAMES">%1$s</xliff:g> gebruikt, kan de functionaliteit worden beperkt. Tik voor meer informatie."</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Uit"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Simkaarten"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Netwerken voor vliegtuigmodus tonen"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Zoek en maak verbinding met netwerken in de vliegtuigmodus."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Wifi-netwerken vinden en er verbinding mee maken"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"vliegtuig, geschikt voor vliegtuigen"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Gesprekken en sms\'jes"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Bellen via wifi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"niet beschikbaar"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tijdelijk niet beschikbaar"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Geen simkaart"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Voorkeuren"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Netwerkvoorkeuren"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Verbinden met openbare netwerken"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"netwerkverbinding, internet, draadloos, data, wifi, wi-fi, wi fi, mobiel, mobiele provider, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Netwerken voor vliegtuigmodus bekijken"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Netwerken in vliegtuigmodus bekijken"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Netwerken aanzetten"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Netwerken uitzetten"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Wil je je internet resetten?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Hiermee wordt je telefoongesprek beëindigd"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Hiermee wordt je telefoongesprek beëindigd"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Je internet resetten…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Connectiviteitsproblemen oplossen"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Netwerken voor vliegtuigmodus beschikbaar"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Verbreek de ethernetverbinding om van netwerk te wisselen"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Kan niet van netwerk wisselen als er verbinding is"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Netwerken voor vliegtuigmodus"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Verbonden"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet maakt niet automatisch verbinding"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Kleur"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Overig"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Algemeen"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Alle apps bekijken"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Slim doorschakelen"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Slim doorschakelen staat aan"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefoonnummer opgeven"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefoonnummer ontbreekt."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G toestaan"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Mobiele 2G-verbindingen gebruiken. Voor noodoproepen staat 2G altijd aan."</string>
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index aad31cb..8961441 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"ଛୋଟ କରନ୍ତୁ"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"ବହୁତ ବଡ଼ କରନ୍ତୁ"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ଅଟୋ-ରୋଟେଟ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"କେହିଜଣେ ସ୍କ୍ରିନ୍ ଆଡ଼କୁ ଦେଖୁଛନ୍ତି କି ନାହିଁ ଏବଂ କିପରି ଦେଖୁଛନ୍ତି ତାହା ଦେଖିବା ପାଇଁ ଫେସ୍ ଆଧାରିତ ଅଟୋରୋଟେଟ୍ ସାମ୍ନା କ୍ୟାମେରା ବ୍ୟବହାର କରେ। ଏହା ଶୋଇବା ସମୟରେ ପଢ଼ିବାକୁ ଅନୁମତି ଦେଇଥାଏ ଏବଂ ଛବିଗୁଡ଼ିକ କେବେ ବି ଷ୍ଟୋର୍ କରାଯାଏ ନାହିଁ କିମ୍ବା Googleକୁ ପଠାଯାଏ ନାହିଁ।&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Learn more&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"ନମୁନା ଟେକ୍ସଟ୍‌"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"ଦ ୱାଣ୍ଡରଫୁଲ୍ ଉଇଜାର୍ଡ୍ ଅଫ୍ ଓଜ୍"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"ଭାଗ 11: ଓଜର ମରକତ ମଣିର ଅଦ୍ଭୁତ ସହର"</string>
@@ -368,7 +369,7 @@
     <string name="security_settings_face_enroll_error_dialog_title" msgid="2460820099922775936">"ପଞ୍ଜିକରଣ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇନାହିଁ"</string>
     <string name="security_settings_face_enroll_dialog_ok" msgid="1674650455786434426">"ଠିକ୍ ଅଛି"</string>
     <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="7768349698547951750">"ମୁହଁ ନାମାଙ୍କନର ସମୟ ସମାପ୍ତ ହୋଇଯାଇଛି। ପୁଣିଥରେ ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3186810411630091490">"ମୁହଁ ନାମାଙ୍କନ ହୋଇପାରିଲା ନାହିଁ।"</string>
+    <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3186810411630091490">"ଫେସ୍ ଏନରୋଲମ୍ୟାଣ୍ଟ ହୋଇପାରିଲା ନାହିଁ।"</string>
     <string name="security_settings_face_enroll_finish_title" msgid="5882322568359775393">"ସବୁ ପ୍ରସ୍ତୁତ। ଠିକ୍‍ଥିବା ପରି ଜଣାପଡୁଛି।"</string>
     <string name="security_settings_face_enroll_done" msgid="3048687969498187442">"ହୋଇଗଲା"</string>
     <string name="security_settings_face_enroll_should_re_enroll_title" msgid="9080635904939148410">"ଫେସ୍ ଅନ୍‍ଲକ୍‍ର କାର୍ଯ୍ୟଦକ୍ଷତାରେ ଉନ୍ନତି ଆଣନ୍ତୁ"</string>
@@ -403,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ଟିପଚିହ୍ନ ସେଟ୍‌ ଅପ୍‌</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"ଟିପଚିହ୍ନରେ ଅନ୍‌ଲକ୍‌ କରନ୍ତୁ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"ଆପଣଙ୍କ ଟିପଚିହ୍ନ ସେଟ ଅପ କରନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"ନିଜ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"ଆପଣଙ୍କ ଫୋନକୁ ଅନଲକ୍ କରିବାକୁ, କ୍ରୟଗୁଡ଼ିକୁ ଅଧିକାର ଦେବାକୁ କିମ୍ବା ଆପଗୁଡ଼ିକରେ ସାଇନ୍ ଇନ୍ କରିବାକୁ କେବଳ ଟିପଚିହ୍ନ ସେନ୍ସରକୁ ସ୍ପର୍ଶ କରନ୍ତୁ। ଆପଣ କାହାର ଟିପଚିହ୍ନ ଯୋଗ କରୁଛନ୍ତି ସେ ବିଷୟରେ ସତର୍କ ରୁହନ୍ତୁ। ଗୋଟିଏ ଯୋଗ କରାଯାଇଥିବା ଟିପଚିହ୍ନ ମଧ୍ୟ ଏଗୁଡ଼ିକ ମଧ୍ୟରୁ ଯେ କୌଣସି କାର୍ଯ୍ୟ କରିପାରିବ।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"ଏକ ଦୃଢ଼ ପାଟର୍ନ କିମ୍ବା PIN ଠାରୁ ଆପଣଙ୍କ ଟିପଚିହ୍ନ କମ୍ ସୁରକ୍ଷିତ ହୋଇପାରେ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"ଆପଣଙ୍କ ନିୟନ୍ତ୍ରଣରେ ଅଛି"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"ମନେ ରଖନ୍ତୁ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"ଟିପଚିହ୍ନ ମାଧ୍ୟମରେ ରେକର୍ଡ କରାଯାଇଥିବା ଡାଟା ସୁରକ୍ଷିତ ଭାବେ ଷ୍ଟୋର୍ କରାଯାଇଥାଏ ଏବଂ ଏହାକୁ କେବେ ବି ଆପଣଙ୍କ ଫୋନରୁ କାଢ଼ି ଦିଆଯାଏ ନାହିଁ। ଆପଣ ସେଟିଂସରେ ଯେ କୌଣସି ସମୟରେ ଆପଣଙ୍କ ଡାଟା ଡିଲିଟ୍ କରିପାରିବେ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"ଏକ ଦୃଢ଼ ପାଟର୍ନ କିମ୍ବା PINଠାରୁ ଆପଣଙ୍କ ଟିପଚିହ୍ନ କମ୍ ସୁରକ୍ଷିତ ହୋଇପାରେ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"ଉନ୍ନତ ଟିପଚିହ୍ନ ମଡେଲଗୁଡ଼ିକୁ ତିଆରି କରିବା ପାଇଁ ଆପଣଙ୍କର ଫୋନ୍ ବେଳେବେଳେ ଆପଣଙ୍କ ବର୍ତ୍ତମାନର ଟିପଚିହ୍ନ ଛବିଗୁଡ଼ିକୁ ବ୍ୟବହାର କରିବ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ଫୋନ୍‌କୁ ଅନ୍‌ଲକ୍‌ କରିବା କିମ୍ୱା କିଣାକିଣିକୁ ଅନୁମୋଦନ କରିବା ପାଇଁ ନିଜ ଟିପଚିହ୍ନର ବ୍ୟବହାର କରନ୍ତୁ।\n\nଧ୍ୟାନଦିଅନ୍ତୁ: ଏହି ଡିଭାଇସ୍‌ ଅନଲକ୍‌ କରିବାକୁ ଆପଣ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ। ଅଧିକ ସୂଚନା ପାଇଁ, ଆପଣଙ୍କ ସଂସ୍ଥାର ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ଫୋନ୍‌କୁ ଅନଲକ୍‌ କିମ୍ୱା କିଣାକିଣିକୁ ଅନୁମୋଦନ କରିବା ପାଇଁ ନିଜ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରନ୍ତୁ।\n\nଧ୍ୟାନଦିଅନ୍ତୁ: ଜଟିଳ ପାଟର୍ନ କିମ୍ୱା ପିନ୍‌ ତୁଳନାରେ ଆପଣଙ୍କର ଟିପଚିହ୍ନ କମ୍ ସୁରକ୍ଷିତ ହୋଇପାରେ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ବାତିଲ୍‌"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ନା, ଧନ୍ୟବାଦ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"ବାଦ୍ ଦିଅନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ଜାରି ରଖ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"ରାଜି"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ଛାଡିଦିଅନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ପରବର୍ତ୍ତୀ"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"ଟିପଚିହ୍ନ ବାଦ୍ ଦେବେ?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"ବାଦ୍ ଦିଅନ୍ତୁ"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"ବାତିଲ୍ କରନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"ସେନ୍ସର୍‌କୁ ଛୁଁଅନ୍ତୁ"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"ଟିପଚିହ୍ନ ଆଇକନକୁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"ଏହା ଆପଣଙ୍କ ଫୋନ୍‌ର ପଛରେ ଅଛି। ନିଜ ପ୍ରଥମ ଆଙ୍ଗୁଠିର ବ୍ୟବହାର କରନ୍ତୁ।"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"ଏହା ସ୍କ୍ରିନରେ ଅଛି। ଏକ ଗ୍ଲୋ କରୁଥିବା ସର୍କଲ୍ ସହ ଟିପଚିହ୍ନ ଖୋଜନ୍ତୁ।"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"ଟିପଚିହ୍ନ ସେନ୍ସର୍ ଆପଣଙ୍କ ସ୍କ୍ରିନରେ ଅଛି। ଏହାକୁ ଖୋଜିବା ପାଇଁ ସ୍କ୍ରିନ୍ ଉପରେ ଆପଣଙ୍କ ଆଙ୍ଗୁଠିକୁ ମୁଭ୍ କରନ୍ତୁ।"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"ଡିଭାଇସ୍‌ ଏବଂ ଟିପଚିହ୍ନ ସେନସର୍ ଲୋକେସନ୍‌ ଚିତ୍ରଣ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"ନାମ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ଠିକ୍‍ ଅଛି"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"ବିଲୋପ କରନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"ସେନ୍ସର୍‌କୁ ଛୁଅଁନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"ନିଜ ଆଙ୍ଗୁଠିକୁ ସେନ୍ସର୍ ଉପରେ ରଖନ୍ତୁ ଏବଂ ଏକ ଭାଇବ୍ରେସନ୍ ଅନୁଭବ କରିବା ପରେ ଉଠାଇଦିଅନ୍ତୁ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"ଉଠାନ୍ତୁ, ତା\'ପରେ ପୁଣି ଛୁଅଁନ୍ତୁ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"ନିଜ ଟିପଚିହ୍ନର ବିଭିନ୍ନ ଅଂଶ ଯୋଗ କରିବା ପାଇଁ ଆଙ୍ଗୁଠି ଉଠାଉଥାନ୍ତୁ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ଟିପଚିହ୍ନ ଯୋଗ କରାଗଲା"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"ଆପଣ ଯେତେବେଳେ ଏହି ଆଇକନ୍‌‌କୁ ଦେଖିବେ, ପରିଚୟ ପାଇଁ କିମ୍ବା କ୍ରୟଗୁଡ଼ିକର ମଞ୍ଜୁରୀ ଦେବା ପାଇଁ ଆପଣଙ୍କ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"ଏହାକୁ ପରେ କରନ୍ତୁ"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ଯଦି ଆପଣ ଏହାକୁ ଦେଖୁଥିବେ ତେବେ ଚାଲୁ / ସ୍କ୍ରିନ୍ ବନ୍ଦ ହେବ ନାହିଁ"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"ବନ୍ଦ ଅଛି"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"କ୍ୟାମେରା ଆକ୍ସେସ ଦରକାର"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"ଡିଭାଇସ୍ ବ୍ୟକ୍ତିଗତକରଣ ସେବାଗୁଡ଼ିକ ପାଇଁ ଅନୁମତିଗୁଡ଼ିକୁ ପରିଚାଳନ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"ଯଦି ଆପଣ ଏହାକୁ ଦେଖୁଥିବେ ତେବେ ଆପଣଙ୍କର ସ୍କ୍ରିନ୍ ବନ୍ଦ ହୋଇନଥାଏ"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"ସ୍କ୍ରିନ୍‌କୁ କେହି ଦେଖୁଛନ୍ତି ନା ନାହିଁ ତାହା ଦେଖିବା ପାଇଁ \'ସ୍କ୍ରିନ୍ ଆଟେନ୍‌ସନ୍\' ସାମ୍ନା କ୍ୟାମେରା ବ୍ୟବହାର କରେ। ଏହା ଡିଭାଇସ୍‌ରେ କାର୍ଯ୍ୟ କରିଥାଏ ଏବଂ ଛବିଗୁଡ଼ିକୁ କେବେ ବି ଷ୍ଟୋର୍ କରାଯାଇ ନଥାଏ କିମ୍ବା Googleକୁ ପଠାଯାଇ ନଥାଏ।"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"ସ୍କ୍ରିନ୍ ଆଟେନସନ୍ ଚାଲୁ କରନ୍ତୁ"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"ଯେତେବେଳେ ସ୍କ୍ରିନ ଗାଢ଼ ହୁଏ, ନୂଆ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ପାଇଁ ଏହା ଚାଲୁ ହୋଇଥାଏ"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"ସର୍ବଦା ସମୟ ଏବଂ ସୂଚନା ଦେଖାନ୍ତୁ"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ବ୍ୟାଟେରୀ ବ୍ୟବହାରରେ ବୃଦ୍ଧି"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"ଟେକ୍ସଟକୁ ବୋଲ୍ଡ କରନ୍ତୁ"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"ଟେକ୍ସଟକୁ ବୋଲ୍ଡ କରନ୍ତୁ"</string>
     <string name="title_font_size" msgid="570613010306330622">"ଫଣ୍ଟ ସାଇଜ୍"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ଟେକ୍ସଟ୍‌କୁ ବଡ଼ କିମ୍ୱା ଛୋଟ କରନ୍ତୁ"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM କାର୍ଡ ଲକ୍‌ ସେଟିଙ୍ଗ"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତାମାନେ"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ଡିଭାଇସ୍‌ ଷ୍ଟୋରେଜ୍‌"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"ପୋର୍ଟେବଲ୍‌ ଷ୍ଟୋରେଜ୍‌"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"ଆଲାରାମ୍ ଏବଂ ରିମାଇଣ୍ଡରଗୁଡ଼ିକ"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"ଆଲାରାମ୍ ବା ରିମାଇଣ୍ଡରଗୁଡ଼ିକ ସେଟ୍ କରିବାକୁ ଅନୁମତି ଦିଅ"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"ଆଲାରାମ୍ ଏବଂ ରିମାଇଣ୍ଡରଗୁଡ଼ିକ"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"ଆଲାରାମ୍ କିମ୍ବା ଅନ୍ୟ ସମୟ ଆଧାରିତ ଇଭେଣ୍ଟଗୁଡ଼ିକ ସିଡୁଲ୍ କରିବାକୁ ଏହି ଆପକୁ ଅନୁମତି ଦିଅନ୍ତୁ। ଆପଣ ଡିଭାଇସ୍ ବ୍ୟବହାର କରୁନଥିଲେ ମଧ୍ୟ ଏହା ଆପକୁ ସକ୍ରିୟ ହେବା ଏବଂ ଚାଲିବାକୁ ଅନୁମତି ଦେବ। ଧ୍ୟାନ ଦିଅନ୍ତୁ ଯେ ଏହି ଅନୁମତି ପ୍ରତ୍ୟାହାର କରିବା ଫଳରେ ଆପ୍ ଠିକରେ କାମ ନକରିପାରେ, ନିର୍ଦ୍ଦିଷ୍ଟ ଭାବେ ଆପ୍ ସିଡୁଲ୍ କରିଥିବା ଯେ କୌଣସି ଆଲାରାମ୍ ଆଉ କାମ କରିବ ନାହିଁ।"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"ସିଡୁଲ୍, ଆଲାରାମ, ରିମାଇଣ୍ଡର୍, ଇଭେଣ୍ଟ"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> ର <xliff:g id="USED">%1$s</xliff:g> ବ୍ୟବହୃତ"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g>ର ବ୍ୟବହୃତ"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"ଲୋକେସନ୍ ସେବା"</string>
     <string name="location_title" msgid="5819154746934945021">"ମୋ ଲୋକେସନ୍‌"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ୱାର୍କ ପ୍ରୋଫାଇଲ୍‌ ପାଇଁ ଲୋକେସନ୍‌"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"ଲୋକେସନକୁ ଆପ୍ ଆକ୍ସେସ୍"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ଲୋକେସନ୍‌ ବନ୍ଦ ଅଛି"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ମଧ୍ୟରୁ <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ଟି ଆପର ଲୋକେସନ୍‌କୁ ଆକ୍ସେସ୍ ଅଛି</item>
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> ମଧ୍ୟରୁ <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g>ଟି ଆପର ଲୋକେସନ୍‌କୁ ଆକ୍ସେସ୍ ଅଛି</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"ବର୍ତ୍ତମାନର ଲୋକେସନ୍‌ ଆକ୍ସେସ୍"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"ବିବରଣୀ ଦେଖନ୍ତୁ"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"ନିକଟରେ କୌଣସି ଆପ୍‌ ଲୋକେସନ୍‌ ଅନୁରୋଧ କରିନାହାଁନ୍ତି"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"ସମ୍ପ୍ରତ୍ତି କୌଣସି ଆପ୍ ଲୋକେସନ୍ ଆକ୍ସେସ୍ କରିନାହିଁ"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ବ୍ୟାଟେରୀର ଅଧିକ ବ୍ୟବହାର"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ନିମ୍ନ ବ୍ୟାଟେରୀ ବ୍ୟବହାର"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"ୱାଇ-ଫାଇ ଏବଂ ବ୍ଲୁଟୁଥ୍‌ ସ୍କାନିଂ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"ୱାଇ-ଫାଇ ସ୍କାନିଂ"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"ଆପ୍ ଓ ସେବାଗୁଡ଼ିକୁ ଯେ କୌଣସି ସମୟରେ ୱାଇ-ଫାଇ ନେଟ୍‌ୱାର୍କ ପାଇଁ ସ୍କାନ୍ କରିବାକୁ ଦିଅନ୍ତୁ, ଏପରିକି ୱାଇ-ଫାଇ ବନ୍ଦ‌ ଥିଲେ ମଧ୍ୟ। ଏହାକୁ ଲୋକେସନ୍‌ ଆଧାରିତ ଫିଚର୍ ଓ ସେବା ଇତ୍ୟାଦିକୁ ଉନ୍ନତ କରିବା ପାଇଁ ବ୍ୟବହାର କରାଯାଇପାରେ।"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ବ୍ଲୁଟୁଥ ସ୍କାନିଂ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ଆପ୍ ଓ ସେବାଗୁଡ଼ିକୁ ଯେକୌଣସି ସମୟରେ ଆଖପାଖରେ ଥିବା ଡିଭାଇସ୍‌ ଖୋଜିବାକୁ ଦିଅନ୍ତୁ, ଏପରିକି ବ୍ଲୁଟୂଥ୍‍‌ ଅଫ୍‌ ଥିଲେ ମଧ୍ୟ। ଏହାକୁ ଲୋକେସନ୍‌ ଆଧାରିତ ଫିଚର୍ ଓ ସେବା ଇତ୍ୟାଦିକୁ ଉନ୍ନତ କରିବା ପାଇଁ ବ୍ୟବହାର କରାଯାଇପାରେ।"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"ଲୋକେସନ୍ ସେବାଗୁଡ଼ିକ"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"କାର୍ଯ୍ୟ ପାଇଁ ଲୋକେସନ୍ ସମ୍ପର୍କିତ ସେବା"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ଲୋକେସନ୍ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣ"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ଲୋକେସନ୍ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣ"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"ବର୍ତ୍ତମାନର ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟ କରିବାକୁ ଡିଭାଇସର ଲୋକେସନ୍ ବ୍ୟବହାର କରିବା ପାଇଁ ଅନୁମତି ଦିଏ। ୱାଇ‑ଫାଇ ସ୍କାନିଂ ପରି ଅନ୍ୟ ଲୋକେସନ୍ ସେଟିଂସ୍ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣର ସଠିକତାକୁ ପ୍ରଭାବିତ କରିପାରେ।"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ଚାଲୁ ଅଛି"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ବନ୍ଦ ଅଛି"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ସ୍ୱଚାଳିତ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣ ଅକ୍ଷମ କରାଯାଇଛି"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ସ୍ୱଚାଳିତ ଟାଇମ୍ ଜୋନ୍ ବନ୍ଦ ଅଛି"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ଲୋକେସନ୍ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣ ଅକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ଲୋକେସନ୍ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣ ସମର୍ଥିତ ନୁହେଁ"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ଲୋକେସନ୍ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣ ପରିବର୍ତ୍ତନଗୁଡ଼ିକୁ ଅନୁମତି ଦିଆଯାଇନାହିଁ"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"ସକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"ଷ୍ଟୋରେଜ୍‌ ଖାଲି କରନ୍ତୁ"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"ଅପ୍‌ଡେଟ୍‌ଗୁଡ଼ିକୁ ଅନ୍ଇ‌ନଷ୍ଟଲ୍‌ କରନ୍ତୁ"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"କିଛି କାର୍ଯ୍ୟ ପାଇଁ ଏହି ଆପ୍‌କୁ ଆପଣ ପୂର୍ବ-ନିର୍ଦ୍ଧାରିତ ଅନୁସାରେ ଲଞ୍ଚ କରିବାକୁ ବାଛିଛନ୍ତି।"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"ଏହି ଆପରେ ଡିଫଲ୍ଟ ଭାବରେ ଆପଣ ଚୟନ କରିଥିବା କିଛି କାର୍ଯ୍ୟକଳାପ।"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"ୱିଜେଟ୍‌ ତିଆରି କରିବା ଏବଂ ସେଗୁଡ଼ିକର ଡାଟା ଆକ୍ସେସ୍‌ କରିବା ପାଇଁ ଏହି ଆପ୍‌କୁ ଅନୁମତି ଦେବାକୁ ଆପଣ ବାଛିଛନ୍ତି।"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"କୌଣସି ଡିଫଲ୍ଟ ସେଟ୍‍ ହୋଇନାହିଁ।"</string>
-    <string name="clear_activities" msgid="341345438786077236">"ଡିଫଲ୍ଟ ସଫା କରନ୍ତୁ"</string>
+    <string name="clear_activities" msgid="488089228657585700">"ଡିଫଲ୍ଟ ପସନ୍ଦଗୁଡ଼ିକୁ ଖାଲି କରନ୍ତୁ"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"ଏହି ଆପ୍‌ ଆପଣଙ୍କ ସ୍କ୍ରୀନ୍‌ ପାଇଁ ତିଆରି ନହୋଇଥାଇପାରେ। ତାହାକୁ ଆପଣ ଏଠାରେ ଆଡ୍‌ଜଷ୍ଟ କରିପାରିବେ।"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"ଲଞ୍ଚ ହେବା ପରେ ପଚାରନ୍ତୁ"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"ଆପ୍‌କୁ ସ୍କେଲ୍‌ କରନ୍ତୁ"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ନିଜର ଆବଶ୍ୟକତା ଅନୁସାରେ ଏହି ଡିଭାଇସ୍‌କୁ ଆପଣ କଷ୍ଟମାଇଜ୍‌ କରିପାରିବେ। ଏହି ଆକ୍ସେସିବିଲିଟୀ ଫିଚରଗୁଡ଼ିକୁ ପରେ ସେଟିଂସରେ ବଦଳା ଯାଇପାରିବ।"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ଫଣ୍ଟ ସାଇଜ୍ ବଦଳାନ୍ତୁ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"ସ୍କ୍ରିନ୍‌ ରିଡର୍"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ଅଡିଓ ଓ ଅନ୍-ସ୍କ୍ରିନ୍ ଟେକ୍ସଟ୍"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"କ୍ୟାପସନଗୁଡ଼ିକ"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ଅଡିଓ"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"ସାଧାରଣ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ଡିସ୍‌ପ୍ଲେ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ଟେକ୍ସଟ୍ ଓ ଡିସପ୍ଲେ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ସ୍କ୍ରିନକୁ ଅଧିକ ଗାଢ଼ା କରନ୍ତୁ"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ଲାଲ୍-ସବୁଜ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ଲାଲ୍-ସବୁଜ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ନୀଳ-ହଳଦିଆ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ଉଜ୍ଜ୍ୱଳତା କମାନ୍ତୁ"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"ଉଜ୍ଜ୍ୱଳତା କମ୍ କରନ୍ତୁ"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ସ୍କ୍ରିନକୁ ଆପଣଙ୍କ ଫୋନର ସର୍ବନିମ୍ନ ଉଜ୍ଜ୍ୱଳତା ଅପେକ୍ଷା ଅଧିକ ଗାଢ଼ା କରନ୍ତୁ"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ସ୍କ୍ରିନକୁ ଆପଣଙ୍କ ଟାବଲେଟର ସର୍ବନିମ୍ନ ଉଜ୍ଜ୍ୱଳତା ଅପେକ୍ଷା ଅଧିକ ଗାଢ଼ା କରନ୍ତୁ"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"ଆପଣଙ୍କ ସ୍କ୍ରିନକୁ ଅଧିକ ଗାଢ଼ା କରନ୍ତୁ ଯାହା ଫଳରେ ପଢ଼ିବା ଅଧିକ ସୁବିଧାଜନକ ହେବ।&lt;br/&gt;&lt;br/&gt; ଏହା ଉପଯୋଗୀ ହୋଇପାରେ ଯେତେବେଳେ: &lt;ol&gt; &lt;li&gt; ଆପଣଙ୍କ ଫୋନର ଡିଫଲ୍ଟ ସର୍ବନିମ୍ନ ଉଜ୍ଜ୍ୱଳତା ଏବେ ବି ଅତ୍ୟଧିକ ଉଜ୍ଜ୍ୱଳ ଅଛି&lt;/li&gt; &lt;li&gt; ରାତିରେ କିମ୍ବା ଶୋଇବା ପୂର୍ବରୁ ଏକ ଅନ୍ଧାରୁଆ ରୁମ୍ ପରି ଅନ୍ଧକାର ସ୍ଥିତିରେ ଆପଣ ଆପଣଙ୍କ ଫୋନ୍ ବ୍ୟବହାର କରୁଛନ୍ତି&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"ଫେସ୍‌"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"ଟିପଚିହ୍ନ, ଟିପଚିହ୍ନ ଯୋଗ କରନ୍ତୁ"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"ଡିମ୍ ସ୍କ୍ରିନ୍, ଟଚ୍‌ସ୍କ୍ରିନ୍, ବ୍ୟାଟେରୀ, ସ୍ମାର୍ଟ ଉଜ୍ୱଳତା, ଡାଇନାମିକ୍ ଉଜ୍ୱଳତା ସ୍ୱତଃ ଉଜ୍ୱଳତା"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"କମ୍‌ ଆଲୋକ ଥିବା ସ୍କ୍ରିନ୍‌, ସ୍ଲିପ୍‍, ବ୍ୟାଟେରୀ, ସମୟ ସମାପ୍ତି, ଆଟେନସନ୍, ଡିସ୍‌ପ୍ଲେ, ସ୍କ୍ରିନ୍‌, ନିଷ୍କ୍ରିୟତା"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"ରୋଟେଟ୍, ଫ୍ଲିପ୍, ରୋଟେଶନ୍, ପୋର୍ଟେଟ୍, ଲ୍ୟାଣ୍ଡସ୍କେପ୍, ଓରିଏଣ୍ଟେଶନ୍, ଭର୍ଟିକଲ୍, ହୋରିଜୋଣ୍ଟାଲ୍"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"ଅପଗ୍ରେଡ୍, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"DND, ନିର୍ଦ୍ଧାରଣ, ବିଜ୍ଞପ୍ତି, ଅବରୋଧ, ସାଇଲେନ୍ସ, ଭାଇବ୍ରେଟ୍, ସ୍ଲୀପ୍, ୱର୍କ, ଫୋକସ୍, ସାଉଣ୍ଡ, ମ୍ୟୁଟ୍, ଦିନ,ସାପ୍ତାହିକ ଦିନ, ସପ୍ତାହର ଶେଷ ଦିନ, ସାପ୍ତାହିକ ରାତି, ଇଭେଣ୍ଟ"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ସ୍କ୍ରିନ୍, ଲକ୍ ସମୟ, ସମୟ ସମାପ୍ତି, ଲକ୍ ସ୍କ୍ରିନ୍"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ରିଙ୍ଗଟୋନ୍‌"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"ଅନ୍ୟ ସାଉଣ୍ଡ ଓ ଭାଇବ୍ରେସନ୍"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"ବିଜ୍ଞପ୍ତି"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"ବାର୍ତ୍ତାଳାପ"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"ବର୍ତ୍ତମାନ ବିଜ୍ଞପ୍ତି ପଠାଇଥିବା ଆପ୍"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ବିଗତ 7 ଦିନର ସବୁକୁ ଦେଖନ୍ତୁ"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"ଉନ୍ନତ"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ସାଧାରଣ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"କାର୍ଯ୍ୟ ବିଜ୍ଞପ୍ତି"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"ଆଡେପ୍ଟିଭ୍ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ଆଡେପ୍ଟିଭ୍ ବିଜ୍ଞପ୍ତି ପ୍ରାଥମିକତା"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"ପୁଲ୍-ଡାଉନ୍ ସେଡ୍, ଷ୍ଟାଟସ୍ ବାର୍ ଏବଂ ଲକ୍ ସ୍କ୍ରିନ୍‌ରେ ପ୍ରଦର୍ଶନ କରନ୍ତୁ"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ଷ୍ଟାଟସ୍ ବାରରେ ନୀରବ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଲୁଚାନ୍ତୁ"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ଆଲୋକକୁ ଧପଧପ କର"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"ଲକ୍ ସ୍କ୍ରିନରେ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ଗୋପନୀୟତା"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ଲକ୍ ସ୍କ୍ରିନ୍‍କୁ ବାଦ୍ ଦିଅନ୍ତୁ"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ଫେସ୍ ଅନ୍‍ଲକ୍ କରିବା ପରେ ସିଧାସଳଖ ଗତ ଥର ବ୍ୟବହାର କରାଯାଇଥିବା ସ୍କ୍ରିନ୍‌କୁ ଯାଆନ୍ତୁ"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ଲକ୍ ସ୍କ୍ରିନ୍, ଲକ୍‌ସ୍କ୍ରିନ୍, ବାଦ୍ ଦିଅନ୍ତୁ, ବାଏପାସ୍"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="one">ପ୍ରତି ସପ୍ତାହ~<xliff:g id="NUMBER_0">%d</xliff:g>ଟି ବିଜ୍ଞପ୍ତି</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"ଆଦୌ ନୁହେଁ"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"ବିଜ୍ଞପ୍ତି ଆକ୍ସେସ୍"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"ଡିଭାଇସ୍ ଓ ଆପ୍ ବିଜ୍ଞପ୍ତି"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"ଆପଣଙ୍କ ଆପ୍ ଏବଂ ଡିଭାଇସଗୁଡ଼ିକରେ କେଉଁ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ଦେଖାଯାଏ ତାହା ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"କାର୍ଯ୍ୟ ପ୍ରୋଫାଇଲ୍‌ ବିଜ୍ଞପ୍ତିଗୁଡିକୁ ଅକସେସ୍‌ ଅବରୋଧିତ"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"ଆପ୍‌ଗୁଡ଼ିକ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ପଢ଼ିପାରୁନାହାନ୍ତି"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"ବନ୍ଦ କରନ୍ତୁ"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"ବାତିଲ୍"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"ଅନୁମତି ଦିଆଯାଇଥିବା ବିଜ୍ଞପ୍ତିର ପ୍ରକାର"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"ଗୁରୁତ୍ୱପୂର୍ଣ୍ଣ ଚାଲୁଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"ବାର୍ତ୍ତାଳାପ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"ଆଲର୍ଟ କରୁଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"ନୀରବ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"ରିଅଲ୍-ଟାଇମ୍"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"ବ୍ୟବହାରରେ ଥିବା ଆପ୍, ନାଭିଗେସନ୍, ଫୋନ୍ କଲ୍ ଏବଂ ଆହୁରି ଅନେକ କିଛିରୁ ରିଅଲ୍-ଟାଇମ୍ କମ୍ୟୁନିକେସନ୍"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS ଏବଂ ଅନ୍ୟ କମ୍ୟୁନିକେସନ୍"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"ଡିଫଲ୍ଟ"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"ସେଟିଂସ୍ ଆଧାରରେ ରିଙ୍ଗ କିମ୍ବା ଭାଇବ୍ରେଟ୍ ହେଉଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"ନୀରବ"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"ଆଦୌ ସାଉଣ୍ଡ କିମ୍ବା ଭାଇବ୍ରେସନ୍ କରୁ ନଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"ସମସ୍ତ ଆପ୍ ଦେଖନ୍ତୁ"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"ବିଜ୍ଞପ୍ତି ପଠାଇ ପାରୁଥିବା ପ୍ରତ୍ୟେକ ଆପ୍ ପାଇଁ ବିଜ୍ଞପ୍ତି ସେଟିଂସକୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"ଡିଭାଇସରେ ଦେଖାଯାଇଥିବା ଆପଗୁଡ଼ିକ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR ସାହାଯ୍ୟକାରୀ ସେବା"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"VR ସାହାଯ୍ୟକାରୀ ସେବା ଭାବରେ ଚଲାଯିବା ପାଇଁ, ଇନଷ୍ଟଲ୍‌ ହୋଇଥିବା କୌଣସି ଆପ୍‌ ଅନୁରୋଧ କରିନାହିଁ।"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> ପାଇଁ VR ସେବା ଆକ୍ସେସକୁ ଅନୁମତି ଦେବେ?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"ଡିଫଲ୍ଟ ଭାବେ ଖୋଲନ୍ତୁ"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"ଓପନିଂ ଲିଙ୍କ୍"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"ସପୋର୍ଟ କରୁଥିବା ଲିଙ୍କଗୁଡ଼ିକୁ ଖୋଲନ୍ତୁ"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"ସମର୍ଥିତ ଲିଙ୍କଗୁଡ଼ିକ ଏହି ଆପରେ ଖୋଲେ"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"ଏହି ଆପରେ ଖୋଲିବା ପାଇଁ ଲିଙ୍କଗୁଡ଼ିକ"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"ନପଚାରି ଖୋଲିଦିଅ"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"ସପୋର୍ଟ କରୁଥିବା ଲିଙ୍କଗୁଡ଼ିକ"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"ଅନ୍ୟାନ୍ୟ ଡିଫଲ୍ଟଗୁଡିକ"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"ଅନ୍ୟ ଡିଫଲ୍ଟ ପସନ୍ଦଗୁଡ଼ିକ"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"ଲିଙ୍କ ଯୋଗ କରନ୍ତୁ"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"ଆପରେ ଲିଙ୍କଗୁଡ଼ିକ ସ୍ୱଚାଳିତ ଭାବରେ ଖୋଲିବା ପାଇଁ ଆପଟି ସେଗୁଡ଼ିକୁ ଯାଞ୍ଚ କରିପାରିବ। "<annotation id="url">"ଅଧିକ ଜାଣନ୍ତୁ"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>ଟି ଯାଞ୍ଚ କରାଯାଇଥିବା ଲିଙ୍କ୍</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>ଟି ଯାଞ୍ଚ କରାଯାଇଥିବା ଲିଙ୍କ୍</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">ଏହି ଲିଙ୍କଗୁଡ଼ିକୁ ଯାଞ୍ଚ କରାଯାଇଛି ଏବଂ ଏଗୁଡ଼ିକ ସ୍ୱଚାଳିତ ଭାବେ ଏହି ଆପରେ ଖୋଲେ।</item>
+      <item quantity="one">ଏହି ଲିଙ୍କକୁ ଯାଞ୍ଚ କରାଯାଇଛି ଏବଂ ଏହା ସ୍ୱଚାଳିତ ଭାବେ ଏହି ଆପରେ ଖୋଲେ।</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ଠିକ୍ ଅଛି"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"ଅନ୍ୟ ସମର୍ଥିତ ଲିଙ୍କଗୁଡ଼ିକ ପାଇଁ ଯାଞ୍ଚ କରାଯାଉଛି…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"ବାତିଲ୍ କରନ୍ତୁ"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>ଟି ସମର୍ଥିତ ଲିଙ୍କ୍</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>ଟି ସମର୍ଥିତ ଲିଙ୍କ୍</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"ଯୋଗ କରନ୍ତୁ"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g>ରେ ଖୋଲେ"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> ରେ <xliff:g id="SIZE">%1$s</xliff:g>  ବ୍ୟବହୃତ ହୋଇଛି"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"ଇଣ୍ଟର୍ନଲ୍ ଷ୍ଟୋରେଜ୍"</string>
     <string name="storage_type_external" msgid="125078274000280821">"ଏକ୍ସଟର୍ନଲ୍ ଷ୍ଟୋରେଜ୍"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"କ୍ୟାମେରା ଅନୁମୋଦିତ ନୁହେଁ"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"ସ୍କ୍ରୀନ୍‌ଶଟ୍‌‌ ପାଇଁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"ଏହି ଆପ୍‌କୁ ଖୋଲିହେବ ନାହିଁ"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"ଯଦି ଆପଣଙ୍କର କିଛି ପ୍ରଶ୍ନ ଥାଏ, ତେବେ ନିଜ IT ଆଡମିନ୍‌ଙ୍କ ସହ ସମ୍ପର୍କ କରନ୍ତୁ"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"ଅଧିକ ବିବରଣୀ"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"ସେଟିଙ୍ଗ, ଅନୁମତି, କର୍ପୋରେଟ୍‌ ଆକ୍ସେସ୍‌, ନେଟ୍‌ୱର୍କ କାର୍ଯ୍ୟକଳାପ ଓ ଡିଭାଇସ୍‌ର ଲୋକେସନ୍‌ ସୂଚନା ସମେତ ଆପଣଙ୍କର କାର୍ଯ୍ୟ ପ୍ରୋଫାଇଲ୍‌ ସହ ଜଡ଼ିତ ଥିବା ଆପ୍‌ଗୁଡ଼ିକ ଓ ଡାଟାକୁ ଆପଣଙ୍କ ଆଡ୍‌ମିନ୍‌ ତଦାରଖ ଓ ପରିଚାଳନା କରିପାରିବ।"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"ସେଟିଙ୍ଗ୍, ଅନୁମତି, କର୍ପୋରେଟ୍ ଆକ୍ସେସ୍, ନେଟ୍‌ୱର୍କ କାର୍ଯ୍ୟକଳାପ ଏବଂ ଡିଭାଇସ୍‌ର ଲୋକେସନ୍ ସୂଚନା ସମେତ ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ସହ ଜଡ଼ିତ ଥିବା ଡାଟା ଓ ଆପ୍‌ଗୁଡ଼ିକୁ ଆପଣଙ୍କର ଆଡ୍‌ମିନ୍‌ ତଦାରଖ ଓ ପରିଚାଳନା କରିବେ।"</string>
@@ -4342,7 +4395,7 @@
       <item quantity="one">୧ଟି ପ୍ରତିବନ୍ଧକ</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ଡିଭାଇସ୍‌ର ଗଣନାଠାରୁ କେରିଅର୍‌ର ଡାଟା ଗଣନା ଭିନ୍ନ ହୋଇପାରେ।"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"କ୍ୟାରିଅର୍ ନେଟୱାର୍କଗୁଡ଼ିକ ଦ୍ୱାରା ବ୍ୟବହୃତ ଡାଟା ଅନ୍ତର୍ଭୁକ୍ତ ନୁହେଁ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"କ୍ୟାରିଅର୍ ନେଟୱାର୍କଗୁଡ଼ିକ ଦ୍ୱାରା ବ୍ୟବହୃତ ଡାଟାକୁ ବାଦ୍ ଦିଆଯାଇଛି"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ବ୍ୟବହୃତ"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ଡାଟା ଚେତାବନୀ ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ଡାଟା ଚେତାବନୀ"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g>କୁ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ଅନ୍‌ଇନ୍‌ଷ୍ଟଲ୍‌ କରାଯାଇଛି)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(ବ୍ୟବହାରକର୍ତ୍ତା <xliff:g id="USER">%s</xliff:g>ଙ୍କ ପାଇଁ ଅକ୍ଷମ କରାଯାଇଛି)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"ସ୍ୱତଃପୂରଣ ସେବା"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"ଅଟୋ, ଫିଲ, ଅଟୋଫିଲ"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"ପାସୱାର୍ଡଗୁଡ଼ିକ"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"ସ୍ୱତଃ, ପୂରଣ, ସ୍ୱତଃପୂରଣ, ପାସୱାର୍ଡ"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;ଆପଣ ଏହି ଆପ୍‌କୁ ବିଶ୍ୱାସ କରୁଥିବା ନିଶ୍ଚିତ କରନ୍ତୁ&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; କ\'ଣ ଅଟୋଫିଲ୍‌ କରାଯାଇପାରିବ ନିର୍ଦ୍ଧାରଣ କରିବା ପାଇଁ, Google Autofill ଆପଣଙ୍କ ସ୍କ୍ରୀନ୍‌ରେ ଯାହା ଥାଏ, ତାହା ବ୍ୟବହାର କରେ।"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"ଅଟୋଫିଲ୍‌"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"ଲଗିଂ ସ୍ତର"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ନେଟ୍‌ୱର୍କ ଅପରେଟିଙ୍ଗ ମୋଡ୍‌କୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ପସନ୍ଦର ନେଟୱାର୍କ ପ୍ରକାର"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ବାହକ"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ସେଟିଂସ୍ ସଂସ୍କରଣ"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"କ୍ୟାରିଅର୍ ସେଟିଂସ୍ ସଂସ୍କରଣ"</string>
     <string name="call_category" msgid="641461844504128789">"କଲିଂ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"ବାହକ ଭିଡିଓ କଲିଂ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"ସିଷ୍ଟମ୍‌ ଚୟନ କରନ୍ତୁ"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIMକୁ କାଢ଼ି ପୁଣି ଭର୍ତ୍ତି କରନ୍ତୁ। ଯଦି ସମସ୍ୟା ଜାରି ରହେ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ।"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIMକୁ ପୁଣି ଚାଲୁ କରିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ। ଯଦି ସମସ୍ୟା ଜାରି ରହେ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ।"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ନେଟୱାର୍କ ସକ୍ରିୟକରଣ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"କ୍ୟାରିଅର୍ ସ୍ୱିଚ୍ କରାଯାଉଛି"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ସକ୍ରିୟ ଅଛି"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ସେଟିଂସକୁ ଅପଡେଟ୍ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରାଯାଇଛି"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"ବନ୍ଦ ଅଛି"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"ଇଣ୍ଟରନେଟ୍"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMଗୁଡ଼ିକ"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"ଏୟାରପ୍ଲେନ୍ ମୋଡ୍ ନେଟୱାର୍କଗୁଡ଼ିକ ଦେଖାନ୍ତୁ"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"ଏୟାରପ୍ଲେନ୍ ମୋଡରେ ନେଟୱାର୍କଗୁଡ଼ିକୁ ଖୋଜି ତାହା ସହ ସଂଯୋଗ କରନ୍ତୁ।"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"ୱାଇ-ଫାଇ ନେଟୱାର୍କ ଖୋଜି ସେଥିରେ ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ଏୟାରପ୍ଲେନ୍, ଏୟାରପ୍ଲେନ୍-ସେଫ୍"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"କଲ୍ ଓ SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"ୱାଇ-ଫାଇ କଲିଂ"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ଅସ୍ଥାୟୀ ଭାବେ ଅନୁପଲବ୍ଧ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"କୌଣସି SIM ନାହିଁ"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ପସନ୍ଦଗୁଡ଼ିକ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ନେଟୱାର୍କ ପସନ୍ଦଗୁଡ଼ିକ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ସାର୍ବଜନୀନ ନେଟୱାର୍କଗୁଡ଼ିକ ସହ ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ନେଟୱାର୍କ ସଂଯୋଗ, ଇଣ୍ଟରନେଟ୍, ୱାୟାରଲେସ୍, ଡାଟା, ୱାଇଫାଇ, ୱାଇ-ଫାଇ, ୱାଇ ଫାଇ, ସେଲ୍ୟୁଲାର୍, ମୋବାଇଲ, ସେଲ୍ କ୍ୟାରିଅର୍, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ଏୟାରପ୍ଲେନ୍ ମୋଡ୍ ନେଟୱାର୍କଗୁଡ଼ିକୁ ଦେଖନ୍ତୁ"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"ଏୟାରପ୍ଲେନ୍ ମୋଡ୍ ନେଟୱାର୍କଗୁଡ଼ିକ ଦେଖିବା"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"ନେଟୱାର୍କଗୁଡ଼ିକୁ ଚାଲୁ କରନ୍ତୁ"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"ନେଟୱାର୍କଗୁଡ଼ିକୁ ବନ୍ଦ କରନ୍ତୁ"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"ଆପଣଙ୍କ ଇଣ୍ଟରନେଟକୁ ରିସେଟ୍ କରିବେ କି?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"ଏହା ଆପଣଙ୍କ ଫୋନ୍ କଲକୁ ସମାପ୍ତ କରିବ।"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ଏହା ଆପଣଙ୍କ ଫୋନ୍ କଲକୁ ସମାପ୍ତ କରିବ।"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"ଆପଣଙ୍କ ଇଣ୍ଟରନେଟ୍ ରିସେଟ୍ ହେଉଛି…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"ସଂଯୋଗ ଠିକ୍ କରନ୍ତୁ"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"ଏୟାରପ୍ଲେନ୍ ମୋଡ୍ ନେଟୱାର୍କଗୁଡ଼ିକ ଉପଲବ୍ଧ ଅଛି"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ନେଟୱାର୍କ ସୁଇଚ୍ କରିବାକୁ, ଇଥରନେଟ୍ ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ସଂଯୋଗ କରାଯାଇଥିବା ସମୟରେ ନେଟୱାର୍କ୍ ସ୍ୱିଚ୍ କରିପାରିବ ନାହିଁ"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ଏୟାରପ୍ଲେନ୍ ମୋଡ୍ ନେଟୱାର୍କଗୁଡ଼ିକ"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"ସଂଯୋଗ କରାଯାଇଛି"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"ଇଣ୍ଟରନେଟ୍ ସ୍ଵତଃ-ସଂଯୋଗ କରିବ ନାହିଁ"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"ରଙ୍ଗ"</string>
     <string name="category_name_others" msgid="2366006298768550310">"ଅନ୍ୟ"</string>
     <string name="category_name_general" msgid="7737273712848115886">"ସାଧାରଣ"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"ସମସ୍ତ ଆପ୍ ଦେଖନ୍ତୁ"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"ସ୍ମାର୍ଟ ଫରୱାର୍ଡିଂ"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"ସ୍ମାର୍ଟ ଫରୱାର୍ଡିଂ ସକ୍ଷମ କରାଯାଇଛି"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ଫୋନ୍ ନମ୍ଵର୍ ଲେଖନ୍ତୁ"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ଫୋନ୍ ନମ୍ଵର୍ ଉପଲବ୍ଧ ନାହିଁ।"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ଠିକ୍ ଅଛି"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2Gକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G ସେଲ୍ୟୁଲାର୍ ସଂଯୋଗ ବ୍ୟବହାର କରନ୍ତୁ। ଜରୁରୀକାଳୀନ କଲ୍ ପାଇଁ, 2G ସର୍ବଦା ଚାଲୁ ଥାଏ।"</string>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index bed0e46..a2f4ca2 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਖਦੀ ਲਿਖਤ ਨੂੰ ਛੋਟਾ ਜਾਂ ਵੱਡਾ ਕਰੋ।"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"ਛੋਟਾ ਕਰੋ"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"ਵੱਡਾ ਕਰੋ"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ਸਵੈ-ਘੁਮਾਓ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"ਨਮੂਨਾ ਲਿਖਤ"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"ਔਜ਼ ਦਾ ਨਿਰਾਲਾ ਵਿਜ਼ਾਰਡ"</string>
@@ -405,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਥਾਪਤ ਕੀਤੇ ਗਏ</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਅਣਲਾਕ ਕਰੋ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਬਸ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ। ਇਸ ਬਾਰੇ ਸਾਵਧਾਨ ਰਹੋ ਕਿ ਤੁਸੀਂ ਕਿੰਨ੍ਹਾਂ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਰਹੇ ਹੋ। ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ ਇੱਕ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਚੀਜ਼ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਕਿਸੇ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ ਪਿੰਨ ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"ਕੰਟਰੋਲ ਤੁਹਾਡੇ ਹੱਥ ਹੈ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"ਧਿਆਨ ਵਿੱਚ ਰੱਖੋ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਰਾਹੀਂ ਰਿਕਾਰਡ ਕੀਤਾ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਢੰਗ ਨਾਲ ਸਟੋਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਅਤੇ ਕਦੇ ਵੀ ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੋਂ ਬਾਹਰ ਨਹੀਂ ਜਾਂਦਾ। ਤੁਸੀਂ ਕਿਸੇ ਵੇਲੇ ਵੀ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਆਪਣਾ ਡਾਟਾ ਮਿਟਾ ਸਕਦੇ ਹੋ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਕਿਸੇ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ ਪਿੰਨ ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਕਦੇ-ਕਦੇ ਸੁਧਰੇ ਹੋਏ ਫਿੰਗਰਪ੍ਰਿੰਟ ਮਾਡਲ ਬਣਾਉਣ ਲਈ ਤੁਹਾਡੇ ਹਾਲੀਆ ਫਿੰਗਰਪ੍ਰਿੰਟ ਚਿੱਤਰਾਂ ਨੂੰ ਵਰਤੇਗਾ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। \n\nਨੋਟ ਕਰੋ: ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। \n\n ਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ ਪਿੰਨ ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ਰੱਦ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ਨਹੀਂ ਧੰਨਵਾਦ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"ਛੱਡੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ਜਾਰੀ ਰੱਖੋ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"ਸਹਿਮਤ ਹਾਂ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ਛੱਡੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ਅੱਗੇ"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"ਕੀ ਫਿੰਗਰਪ੍ਰਿੰਟ ਛੱਡਣਾ ਹੈ?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"ਛੱਡੋ"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"ਰੱਦ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"ਸੈਂਸਰ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਪ੍ਰਤੀਕ ਨੂੰ ਸਪਰਸ਼ ਕਰਕੇ ਰੱਖੋ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਹੈ। ਆਪਣੀ ਅੰਗੂਠੇ ਦੇ ਨਾਲ ਦੀ ਉਂਗਲ ਦੀ ਵਰਤੋਂ ਕਰੋ।"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"ਇਹ ਸਕ੍ਰੀਨ \'ਤੇ ਹੈ। ਚਮਕਦੇ ਚੱਕਰ ਵਾਲੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨੂੰ ਲੱਭੋ।"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਹੈ। ਇਸਨੂੰ ਲੱਭਣ ਲਈ ਸਕ੍ਰੀਨ \'ਤੇ ਆਪਣੀ ਉਂਗਲ ਚਲਾਓ।"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"ਡੀਵਾਈਸ ਵਾਲੀ ਤਸਵੀਰ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਟਿਕਾਣਾ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"ਨਾਮ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ਠੀਕ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"ਮਿਟਾਓ"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"ਸੈਂਸਰ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਸੈਂਸਰ ’ਤੇ ਰੱਖੋ ਅਤੇ ਇੱਕ ਥਰਥਰਾਹਟ ਮਹਿਸੂਸ ਹੋਣ ਤੋਂ ਬਾਅਦ ਚੁੱਕ ਲਵੋ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"ਚੁੱਕੋ, ਫਿਰ ਦੁਬਾਰਾ ਸਪਰਸ਼ ਕਰੋ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੇ ਵੱਖ-ਵੱਖ ਭਾਗਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਰੱਖਣਾ-ਚੁੱਕਣਾ ਜਾਰੀ ਰੱਖੋ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਹੋ ਗਿਆ"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"ਜਦ ਤੁਹਾਨੂੰ ਇਹ ਪ੍ਰਤੀਕ ਦਿਖਾਈ ਦਿੰਦਾ ਹੈ, ਤਾਂ ਪਛਾਣ ਵਾਸਤੇ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਕਰੋ"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"ਖੋਜੋ"</string>
     <string name="display_settings" msgid="7197750639709493852">"ਡਿਸਪਲੇ"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"ਸਕ੍ਰੀਨ ਸਵੈ-ਘੁਮਾਓ"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"ਬੰਦ"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"ਚਾਲੂ"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"ਚਾਲੂ - ਚਿਹਰਾ-ਆਧਾਰਿਤ"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"ਚਿਹਰਾ ਪਛਾਣ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"ਰੰਗ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ਕੁਦਰਤੀ"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"ਵਧਾਇਆ ਗਿਆ"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ਚਾਲੂ / ਸਕ੍ਰੀਨ ਬੰਦ ਨਹੀਂ ਹੋਵੇਗੀ ਜੇ ਤੁਸੀਂ ਉਸ ਵੱਲ ਦੇਖ ਰਹੇ ਹੋ"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"ਬੰਦ"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"ਕੈਮਰਾ ਪਹੁੰਚ ਦੀ ਲੋੜ ਹੈ"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"ਡੀਵਾਈਸ ਵਿਅਕਤੀਗਤਕਰਨ ਸੇਵਾਵਾਂ ਲਈ ਇਜਾਜ਼ਤਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"ਜੇ ਤੁਸੀਂ ਉਸ ਵੱਲ ਦੇਖ ਰਹੇ ਹੋ ਤਾਂ ਸਕ੍ਰੀਨ ਨੂੰ ਬੰਦ ਹੋਣ ਤੋਂ ਰੋਕਦਾ ਹੈ"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"\'ਸਕ੍ਰੀਨ ਦਾ ਚੌਕੰਨਾਪਣ\' ਵਿਸ਼ੇਸ਼ਤਾ ਅਗਲੇ ਕੈਮਰੇ ਦੀ ਵਰਤੋਂ ਨਾਲ ਪਤਾ ਲਗਾਉਂਦੀ ਹੈ ਕਿ ਕੋਈ ਸਕ੍ਰੀਨ ਵੱਲ ਦੇਖ ਰਿਹਾ ਹੈ ਜਾਂ ਨਹੀਂ। ਇਹ ਡੀਵਾਈਸ \'ਤੇ ਕੰਮ ਕਰਦੀ ਹੈ ਅਤੇ ਚਿੱਤਰ ਕਦੇ Google \'ਤੇ ਸਟੋਰ ਜਾਂ ਭੇਜੇ ਨਹੀਂ ਜਾਂਦੇ।"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"ਸਕ੍ਰੀਨ ਦਾ ਚੌਕੰਨਾਪਣ ਚਾਲੂ ਕਰੋ"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਗੂੜ੍ਹੀ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਇਹ ਨਵੀਂਆਂ ਸੂਚਨਾਵਾਂ ਲਈ ਚਾਲੂ ਹੋ ਜਾਂਦੀ ਹੈ"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"ਸਮਾਂ ਅਤੇ ਜਾਣਕਾਰੀ ਹਮੇਸ਼ਾਂ ਦਿਖਾਓ"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ਬੈਟਰੀ ਵਰਤੋਂ ਵਧ ਜਾਵੇਗੀ"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"ਗੂੜ੍ਹੀ ਲਿਖਤ"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"ਗੂੜ੍ਹੀ ਲਿਖਤ"</string>
     <string name="title_font_size" msgid="570613010306330622">"ਫੌਂਟ ਦਾ ਆਕਾਰ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ਲਿਖਤ ਨੂੰ ਵੱਡਾ ਜਾਂ ਛੋਟਾ ਕਰੋ"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"ਸਿਮ ਕਾਰਡ ਲਾਕ ਸੈਟਿੰਗਾਂ"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"ਹੋਰ ਉਪਭੋਗਤਾ"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ਡੀਵਾਈਸ ਸਟੋਰੇਜ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"ਪੋਰਟੇਬਲ ਸਟੋਰੇਜ"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"ਅਲਾਰਮ ਅਤੇ ਰਿਮਾਈਂਡਰ"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"ਅਲਾਰਮ ਅਤੇ ਰਿਮਾਈਂਡਰ ਸੈੱਟ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"ਅਲਾਰਮ ਅਤੇ ਰਿਮਾਈਂਡਰ"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"ਇਸ ਐਪ ਨੂੰ ਅਲਾਰਮਾਂ ਜਾਂ ਹੋਰ ਸਮੇਂ \'ਤੇ ਆਧਾਰਿਤ ਇਵੈਂਟਾਂ ਦਾ ਸਮਾਂ ਨਿਯਤ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ। ਭਾਵੇਂ ਤੁਸੀਂ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਨਾ ਕਰ ਰਹੇ ਹੋਵੋ ਤਾਂ ਵੀ ਇਹ ਐਪ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਅਤੇ ਚੱਲਣ ਦੀ ਇਜਾਜ਼ਤ ਦੇਵੇਗਾ। ਨੋਟ ਕਰੋ ਕਿ ਇਸ ਇਜਾਜ਼ਤ ਨੂੰ ਰੱਦ ਕਰਨ ਨਾਲ ਐਪ ਵਿੱਚ ਖਰਾਬੀ ਆ ਸਕਦੀ ਹੈ, ਖਾਸ ਤੌਰ \'ਤੇ ਐਪ ਵਿੱਚ ਨਿਯਤ ਕੀਤਾ ਕੋਈ ਵੀ ਅਲਾਰਮ ਹੁਣ ਕੰਮ ਨਹੀਂ ਕਰੇਗਾ।"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"ਸਮਾਂ-ਸੂਚੀ, ਅਲਾਰਮ, ਰਿਮਾਈਂਡਰ, ਇਵੈਂਟ"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> ਵਿੱਚੋਂ <xliff:g id="USED">%1$s</xliff:g> ਵਰਤਿਆ"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> ਵਿੱਚੋਂ ਵਰਤੀ ਗਈ"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
     <string name="location_title" msgid="5819154746934945021">"ਮੇਰਾ ਟਿਕਾਣਾ"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਟਿਕਾਣਾ"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"ਟਿਕਾਣੇ ਤੱਕ ਐਪ ਦੀ ਪਹੁੰਚ"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ਟਿਕਾਣਾ ਬੰਦ ਹੈ"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ਐਪ ਕੋਲ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਹੈ</item>
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ਐਪਾਂ ਕੋਲ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਹੈ</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"ਹਾਲੀਆ ਟਿਕਾਣਾ ਪਹੁੰਚ"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"ਵੇਰਵੇ ਦੇਖੋ"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"ਕਿਸੇ ਐਪ ਨੇ ਵੀ ਹਾਲ ਵਿੱਚ ਟਿਕਾਣੇ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਹੈ"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਵਾਲੀਆਂ ਕੋਈ ਐਪਾਂ ਨਹੀਂ"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ਉੱਚ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ਘੱਟ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"ਵਾਈ-ਫਾਈ ਅਤੇ ਬਲੂਟੁੱਥ ਸਕੈਨਿੰਗ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"ਵਾਈ‑ਫਾਈ ਸਕੈਨਿੰਗ"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"ਵਾਈ-ਫਾਈ ਬੰਦ ਹੋਣ \'ਤੇ ਵੀ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਵੇਲੇ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਲਈ ਸਕੈਨ ਕਰਨ ਦਿਓ। ਇਸਦੀ ਵਰਤੋਂ ਕਰਕੇ, ਟਿਕਾਣਾ-ਆਧਾਰਿਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਵਰਗੀਆਂ ਚੀਜ਼ਾਂ ਨੂੰ ਬਿਹਤਰ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ਬਲੂਟੁੱਥ ਸਕੈਨਿੰਗ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ਬਲੁਟੂੱਥ ਬੰਦ ਹੋਣ \'ਤੇ ਵੀ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਵੇਲੇ ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸਾਂ ਲਈ ਸਕੈਨ ਕਰਨ ਦਿਓ। ਇਸਦੀ ਵਰਤੋਂ ਕਰਕੇ ਟਿਕਾਣਾ-ਆਧਾਰਿਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਵਰਗੀਆਂ ਚੀਜ਼ਾਂ ਨੂੰ ਬਿਹਤਰ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ਟਿਕਾਣਾ ਦੇ ਸਮਾਂ ਖੇਤਰ ਦੀ ਪਛਾਣ"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ਟਿਕਾਣਾ ਦੇ ਸਮਾਂ ਖੇਤਰ ਦੀ ਪਛਾਣ"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"ਮੌਜੂਦਾ ਸਮਾਂ ਖੇਤਰ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ ਡੀਵਾਈਸ ਦੇ ਟਿਕਾਣੇ ਨੂੰ ਵਰਤਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਵਾਈ-ਫਾਈ ਸਕੈਨਿੰਗ ਵਰਗੀਆਂ ਹੋਰ ਟਿਕਾਣਾ ਸੈਟਿੰਗਾਂ ਸਮਾਂ ਖੇਤਰ ਦੀ ਪਛਾਣ ਦੀ ਸਟੀਕਤਾ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਕਰ ਸਕਦੀਆਂ ਹਨ।"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ਚਾਲੂ ਹੈ"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ਬੰਦ ਹੈ"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ਸਮਾਂ ਖੇਤਰ ਦੀ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਪਛਾਣ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਬੰਦ ਹੈ"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ਸਵੈਚਲਿਤ ਸਮਾਂ ਖੇਤਰ ਬੰਦ ਹੈ"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ਟਿਕਾਣਾ ਦੇ ਸਮਾਂ ਖੇਤਰ ਦੀ ਪਛਾਣ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਬੰਦ ਹੈ"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ਟਿਕਾਣਾ ਦੇ ਸਮਾਂ ਖੇਤਰ ਦੀ ਪਛਾਣ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ਟਿਕਾਣਾ ਦੇ ਸਮਾਂ ਖੇਤਰ ਦੀ ਪਛਾਣ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਵਿੱਚ ਤਬਦੀਲੀਆਂ ਕਰਨ ਦੀ ਆਗਿਆ ਨਹੀਂ ਹੈ"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"ਚਾਲੂ ਕਰੋ"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"ਸਟੋਰੇਜ ਕਲੀਅਰ ਕਰੋ"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"ਅੱਪਡੇਟਾਂ ਅਣਸਥਾਪਤ ਕਰੋ"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਕੁਝ ਕਾਰਵਾਈਆਂ ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਤੌਰ \'ਤੇ ਲਾਂਚ ਕਰਨ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ।"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਚੁਣੀਆਂ ਕੁਝ ਸਰਗਰਮੀਆਂ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਤੌਰ \'ਤੇ ਇਸ ਐਪ ਵਿੱਚ ਖੁੱਲ੍ਹਦੀਆਂ ਹਨ।"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਵਿਜੇਟ ਬਣਾਉਣ ਲਈ ਅਤੇ ਉਹਨਾਂ ਦੇ ਡਾਟਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ।"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"ਕੋਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸੈੱਟ ਨਹੀਂ ਕੀਤੇ"</string>
-    <string name="clear_activities" msgid="341345438786077236">"ਡਿਫੌਲਟਸ ਹਟਾਓ"</string>
+    <string name="clear_activities" msgid="488089228657585700">"ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਤਰਜੀਹਾਂ ਕਲੀਅਰ ਕਰੋ"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"ਇਹ ਐਪ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਲਈ ਡਿਜਾਈਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਤੁਸੀਂ ਇਸਤੇ ਨਿਯੰਤਰਣ ਪਾ ਸਕਦੇ ਹੋ ਕਿ ਇਹ ਇੱਥੇ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਕਿਵੇਂ ਵਿਵਸਥਿਤ ਕਰੇ।"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"ਜਦੋਂ ਲੌਂਚ ਕੀਤਾ ਹੋਵੇ ਤਾਂ ਪੁੱਛੋ"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"ਸਕੇਲ ਐਪ"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਆਪਣੀਆਂ ਲੋੜਾਂ ਦੇ ਅਨੁਸਾਰ ਵਿਉਂਤਬੱਧ ਕਰ ਸਕਦੇ ਹੋ। ਇਹਨਾਂ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਜਾ ਕੇ ਬਦਲਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ਫੌਂਟ ਦਾ ਆਕਾਰ ਬਦਲੋ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"ਸਕ੍ਰੀਨ ਰੀਡਰ"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ਆਡੀਓ ਅਤੇ ਆਨ-ਸਕ੍ਰੀਨ ਲਿਖਤ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"ਸੁਰਖੀਆਂ"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ਆਡੀਓ"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"ਸਧਾਰਨ"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ਡਿਸਪਲੇ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ਲਿਖਤ ਸੁਨੇਹਾ ਅਤੇ ਡਿਸਪਲੇ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ਸਕ੍ਰੀਨ ਦਾ ਗੂੜ੍ਹਾ ਕਰੋ"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ਲਾਲ-ਹਰਾ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ਲਾਲ-ਹਰਾ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ਨੀਲਾ-ਪੀਲਾ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ਚਮਕ ਘਟਾਓ"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"ਚਮਕ ਘਟਾਓ"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ਸਕ੍ਰੀਨ ਨੂੰ ਆਪਣੇ ਫ਼ੋਨ ਦੀ ਘੱਟੋ-ਘੱਟ ਚਮਕ ਨਾਲੋਂ ਗੂੜ੍ਹਾ ਕਰੋ"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ਸਕ੍ਰੀਨ ਨੂੰ ਆਪਣੇ ਟੈਬਲੈੱਟ ਦੀ ਘੱਟੋ-ਘੱਟ ਚਮਕ ਨਾਲੋਂ ਗੂੜ੍ਹਾ ਕਰੋ"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"ਪੱਕਾ ਕਰੋ ਕਿ ਸਕ੍ਰੀਨ ਗੂੜ੍ਹੀ ਹੈ ਤਾਂ ਜੋ ਇਹ ਪੜ੍ਹਨ ਲਈ ਹੋਰ ਸਹਿਜ ਹੋਵੇ।&lt;br/&gt;&lt;br/&gt; ਇਹ ਉਦੋਂ ਲਾਹੇਵੰਦ ਹੋ ਸਕਦਾ ਹੈ ਜਦੋਂ: &lt;ol&gt; &lt;li&gt; ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਘੱਟੋ-ਘੱਟ ਚਮਕ ਹਾਲੇ ਵੀ ਬਹੁਤ ਚਮਕਦਾਰ ਹੋਵੇ&lt;/li&gt; &lt;li&gt; ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਹਨੇਰੇ ਵਾਲੀਆਂ ਸਥਿਤੀਆਂ ਵਿੱਚ ਕਰ ਰਹੇ ਹੋਵੋ, ਜਿਵੇਂ ਕਿ ਰਾਤ ਜਾਂ ਸੋਣ ਤੋਂ ਪਹਿਲਾਂ ਹਨੇਰੇ ਕਮਰੇ ਵਿੱਚ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"ਚਿਹਰਾ"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"ਫਿੰਗਰਪ੍ਰਿੰਟ, ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"ਮੱਧਮ ਸਕ੍ਰੀਨ, ਟੱਚਸਕ੍ਰੀਨ, ਬੈਟਰੀ, ਸਮਾਰਟ ਚਮਕ, ਗਤੀਸ਼ੀਲ ਚਮਕ, ਸਵੈਚਲਿਤ ਚਮਕ"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"ਮੱਧਮ ਸਕ੍ਰੀਨ, ਸਲੀਪ, ਬੈਟਰੀ, ਬੰਦ ਹੋਣ ਦਾ ਸਮਾਂ, ਚੌਕੰਨਾਪਣ, ਡਿਸਪਲੇ, ਸਕ੍ਰੀਨ, ਅਸਰਗਰਮੀ"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"ਘੁੰਮਾਓ, ਫਲਿੱਪ, ਘੁਮਾਅ, ਪੋਰਟਰੇਟ, ਲੈਂਡਸਕੇਪ, ਦਿਸ਼ਾਮਾਨ, ਖੜ੍ਹਵਾਂ, ਲੇਟਵਾਂ"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"ਅੱਪਗ੍ਰੇਡ ਕਰੋ, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"DND, ਸਮਾਂ-ਸੂਚੀ, ਸੂਚਨਾਵਾਂ, ਬਲਾਕ ਕਰੋ, ਖਾਮੋਸ਼ੀ, ਥਰਥਰਾਹਟ, ਸਲੀਪ, ਕੰਮ, ਫੋਕਸ ਕਰੋ, ਧੁਨੀ, ਮਿਊਟ, ਦਿਨ, ਵੀਕਡੇ, ਵੀਕਇੰਡ, ਵੀਕਨਾਈਟ, ਇਵੈਂਟ"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ਸਕ੍ਰੀਨ, ਲਾਕ ਸਮਾਂ, ਬੰਦ ਹੋਣ ਦਾ ਸਮਾਂ, ਲਾਕਸਕ੍ਰੀਨ"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ਰਿੰਗਟੋਨਾਂ"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"ਹੋਰ ਧੁਨੀਆਂ ਅਤੇ ਥਰਥਰਾਹਟਾਂ"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"ਸੂਚਨਾਵਾਂ"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"ਗੱਲਬਾਤ"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"ਹਾਲ ਵਿੱਚ ਭੇਜੀਆਂ ਗਈਆਂ"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ਪਿਛਲੇ 7 ਦਿਨਾਂ ਦੀਆਂ ਸਾਰੀਆਂ ਦੇਖੋ"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"ਵਿਕਸਿਤ"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ਸਧਾਰਨ"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"ਕੰਮ ਸਬੰਧੀ ਸੂਚਨਾਵਾਂ"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"ਅਨੁਕੂਲ ਸੂਚਨਾਵਾਂ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ਅਨੁਕੂਲ ਸੂਚਨਾ ਤਰਜੀਹ"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"ਹੇਠਾਂ ਖਿੱਚੀ ਜਾਣ ਵਾਲੀ ਸੂਚੀ, ਸਥਿਤੀ ਪੱਟੀ ਅਤੇ ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਦਿਸਦੀਆਂ ਹਨ"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ਸਥਿਤੀ ਪੱਟੀ ਵਿੱਚ ਸ਼ਾਂਤ ਸੂਚਨਾਵਾਂ ਲੁਕਾਓ"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ਲਾਈਟ ਨੂੰ ਟਿਮ-ਟਿਮਾਓ"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਸੂਚਨਾਵਾਂ"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ਪਰਦੇਦਾਰੀ"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ਲਾਕ ਸਕ੍ਰੀਨ ਛੱਡੋ"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ਚਿਹਰਾ ਅਣਲਾਕ ਤੋਂ ਬਾਅਦ, ਸਿੱਧਾ ਪਿਛਲੀ ਵਾਰ ਵਰਤੀ ਸਕ੍ਰੀਨ \'ਤੇ ਜਾਓ"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"ਲਾਕ ਸਕ੍ਰੀਨ, ਲਾਕਸਕ੍ਰੀਨ, ਛੱਡੋ, ਅਣਡਿੱਠ"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="other">ਹਰ ਹਫ਼ਤੇ ~<xliff:g id="NUMBER_1">%d</xliff:g> ਸੂਚਨਾਵਾਂ</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"ਸੂਚਨਾ ਤੱਕ ਪਹੁੰਚ"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"ਡੀਵਾਈਸ ਅਤੇ ਐਪ ਸੂਚਨਾਵਾਂ"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"ਕੰਟਰੋਲ ਕਰੋ ਕਿ ਤੁਹਾਡੀਆਂ ਐਪਾਂ ਅਤੇ ਡੀਵਾਈਸਾਂ \'ਤੇ ਕਿਹੜੀਆਂ ਸੂਚਨਾਵਾਂ ਦਿਖਾਈ ਦੇਣ"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੂਚਨਾਵਾਂ \'ਤੇ ਪਹੁੰਚ ਨੂੰ ਬਲਾਕ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"ਐਪ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਪੜ੍ਹ ਸਕਦੇ"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"ਬੰਦ ਕਰੋ"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"ਰੱਦ ਕਰੋ"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"ਸੂਚਨਾ ਦੀਆਂ ਮਨਜ਼ੂਰਸ਼ੁਦਾ ਕਿਸਮਾਂ"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"ਮਹੱਤਵਪੂਰਨ ਜਾਰੀ ਸੂਚਨਾਵਾਂ"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"ਗੱਲਬਾਤ ਸੰਬੰਧੀ ਸੂਚਨਾਵਾਂ"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"ਸੁਚੇਤ ਕਰਨ ਵਾਲੀਆਂ ਸੂਚਨਾਵਾਂ"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"ਸ਼ਾਂਤ ਸੂਚਨਾਵਾਂ"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"ਅਸਲ-ਸਮਾਂ"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"ਵਰਤੀਆਂ ਜਾ ਰਹੀਆਂ ਐਪਾਂ ਦਾ ਅਸਲ-ਸਮੇਂ ਦਾ ਸੰਚਾਰ, ਨੈਵੀਗੇਸ਼ਨ, ਫ਼ੋਨ ਕਾਲਾਂ ਅਤੇ ਹੋਰ ਬਹੁਤ ਕੁਝ"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"ਗੱਲਾਂਬਾਤਾਂ"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS ਅਤੇ ਦੂਜੇ ਸੰਚਾਰ"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"ਪੂਰਵ-ਨਿਰਧਾਰਿਤ"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"ਉਹ ਸੂਚਨਾਵਾਂ ਜੋ ਸੈਟਿੰਗਾਂ ਦੇ ਆਧਾਰ \'ਤੇ ਘੰਟੀ ਵਜਾ ਸਕਦੀਆਂ ਹਨ ਜਾਂ ਥਰਥਰਾਹਟ ਕਰ ਸਕਦੀਆਂ ਹਨ"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"ਖਾਮੋਸ਼"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"ਉਹ ਸੂਚਨਾਵਾਂ ਜੋ ਕਦੇ ਅਵਾਜ਼ ਜਾਂ ਥਰਥਰਾਹਟ ਨਹੀਂ ਕਰਦੀਆਂ ਹਨ"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"ਸਭ ਐਪਾਂ ਦੇਖੋ"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"ਹਰ ਉਸ ਐਪ ਦੀਆਂ ਸੂਚਨਾ ਸੈਟਿੰਗਾਂ ਨੂੰ ਬਦਲੋ ਜੋ ਸੂਚਨਾਵਾਂ ਭੇਜ ਸਕਦੀਆਂ ਹਨ"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਈਆਂ ਗਈਆਂ ਐਪਾਂ"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR ਮਦਦਗਾਰ ਸੇਵਾਵਾਂ"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ਕੋਈ ਵੀ ਸਥਾਪਤ ਕੀਤੀਆਂ ਐਪਾਂ ਵੱਲੋਂ VR ਸਹਾਇਕ ਸੇਵਾਵਾਂ ਵਜੋਂ ਚਲਾਉਣ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਗਈ।"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਲਈ VR ਸੇਵਾ ਪਹੁੰਚ ਨੂੰ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਵਜੋਂ ਖੋਲ੍ਹੋ"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"ਖੁੱਲ੍ਹਣ ਵਾਲੇ ਲਿੰਕ"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"ਸਮਰਥਿਤ ਲਿੰਕਾਂ ਨੂੰ ਖੋਲ੍ਹੋ"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"ਸਹਾਇਤਾ ਲਈ ਲਿੰਕ ਇਸ ਐਪ ਵਿੱਚ ਖੁੱਲ੍ਹਦੇ ਹਨ"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"ਇਸ ਐਪ ਵਿੱਚ ਖੁੱਲ੍ਹਣ ਵਾਲੇ ਲਿੰਕ"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"ਪੁੱਛੇ ਬਗੈਰ ਖੋਲ੍ਹੋ"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"ਸਮਰਥਿਤ ਲਿੰਕ"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"ਹੋਰ ਡਿਫੌਲਟਸ"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"ਦੂਜੀਆਂ ਪੂਰਵ-ਨਿਰਧਾਰਿਤ ਤਰਜੀਹਾਂ"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"ਲਿੰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"ਐਪ ਲਿੰਕਾਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰ ਸਕਦੀ ਹੈ ਤਾਂ ਜੋ ਉਹਨਾਂ ਨੂੰ ਐਪ ਵਿੱਚ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਖੋਲ੍ਹਿਆ ਜਾ ਸਕੇ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਪੁਸ਼ਟੀਕਿਰਤ ਲਿੰਕ</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਪੁਸ਼ਟੀਕਿਰਤ ਲਿੰਕ</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">ਇਹ ਲਿੰਕ ਪੁਸ਼ਟੀਕਿਰਤ ਹੈ ਅਤੇ ਇਸ ਐਪ ਵਿੱਚ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਖੁੱਲ੍ਹਦਾ ਹੈ।</item>
+      <item quantity="other">ਇਹ ਲਿੰਕ ਪੁਸ਼ਟੀਕਿਰਤ ਹਨ ਅਤੇ ਇਸ ਐਪ ਵਿੱਚ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਖੁੱਲ੍ਹਦੇ ਹਨ।</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ਠੀਕ ਹੈ"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"ਸਹਾਇਤਾ ਲਈ ਦੂਜੇ ਲਿੰਕਾਂ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"ਰੱਦ ਕਰੋ"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਸਹਾਇਤਾ ਲਈ ਲਿੰਕ</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਸਹਾਇਤਾ ਲਈ ਲਿੰਕ</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> ਵਿੱਚ ਖੁੱਲ੍ਹਦਾ ਹੈ"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> <xliff:g id="STORAGE_TYPE">%2$s</xliff:g> ਵਿੱਚ ਵਰਤਿਆ"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string>
     <string name="storage_type_external" msgid="125078274000280821">"ਬਾਹਰੀ ਸਟੋਰੇਜ"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"ਕੈਮਰੇ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"ਇਹ ਐਪ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"ਜੇਕਰ ਤੁਹਾਡੇ ਕੋਈ ਸਵਾਲ ਹਨ, ਤਾਂ ਆਪਣੇ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"ਹੋਰ ਵੇਰਵੇ"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"ਤੁਹਾਡਾ ਪ੍ਰਸ਼ਾਸਕ ਸੈਟਿੰਗਾਂ, ਇਜਾਜ਼ਤਾਂ, ਕਾਰਪੋਰੇਟ ਪਹੁੰਚ, ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ, ਅਤੇ ਡੀਵਾਈਸ ਦੀ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਸਮੇਤ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨਾਲ ਸਬੰਧਿਤ ਐਪਾਂ ਅਤੇ ਡਾਟੇ ਦੀ ਨਿਗਰਾਨੀ ਅਤੇ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕਦਾ ਹੈ।"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"ਤੁਹਾਡਾ ਪ੍ਰਸ਼ਾਸਕ ਸੈਟਿੰਗਾਂ, ਇਜਾਜ਼ਤਾਂ, ਕਾਰਪੋਰੇਟ ਪਹੁੰਚ, ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ, ਅਤੇ ਡੀਵਾਈਸ ਦੀ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਸਮੇਤ ਇਸ ਵਰਤੋਂਕਾਰ ਨਾਲ ਸਬੰਧਿਤ ਐਪਾਂ ਅਤੇ ਡਾਟੇ ਦੀ ਨਿਗਰਾਨੀ ਅਤੇ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕਦਾ ਹੈ।"</string>
@@ -4348,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ਪ੍ਰਤਿਬੰਧ</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ਕੈਰੀਅਰ ਵੱਲੋਂ ਡਾਟੇ ਦਾ ਹਿਸਾਬ ਡੀਵਾਈਸ ਦੇ ਹਿਸਾਬ ਨਾਲੋਂ ਵੱਖਰਾ ਹੋ ਸਕਦਾ ਹੈ"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"ਕੈਰੀਅਰ ਨੈੱਟਵਰਕਾਂ ਵੱਲੋਂ ਵਰਤਿਆ ਜਾਣ ਵਾਲਾ ਡਾਟਾ ਸ਼ਾਮਲ ਨਹੀਂ ਹੈ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"ਕੈਰੀਅਰ ਨੈੱਟਵਰਕਾਂ ਵੱਲੋਂ ਵਰਤਿਆ ਜਾਣ ਵਾਲਾ ਡਾਟਾ ਸ਼ਾਮਲ ਨਹੀਂ ਹੈ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ਵਰਤਿਆ"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ਡਾਟਾ ਚਿਤਾਵਨੀ ਸੈੱਟ ਕਰੋ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ਡਾਟਾ ਚਿਤਾਵਨੀ"</string>
@@ -4365,7 +4412,7 @@
     <string name="data_usage_title" msgid="4039024073687469094">"ਮੁੱਖ ਡਾਟਾ"</string>
     <string name="data_usage_wifi_title" msgid="1060495519280456926">"ਵਾਈ-ਫਾਈ ਡਾਟਾ"</string>
     <string name="data_used" msgid="7770571947591789895">"<xliff:g id="ID_1">^1</xliff:g> ਵਰਤੀ ਗਈ"</string>
-    <string name="data_used_formatted" msgid="7913920278059077938">"<xliff:g id="ID_1">^1</xliff:g> <xliff:g id="ID_2">^2</xliff:g> ਡਾਟਾ ਵਰਤਿਆ ਗਿਆ"</string>
+    <string name="data_used_formatted" msgid="7913920278059077938">"<xliff:g id="ID_1">^1</xliff:g> <xliff:g id="ID_2">^2</xliff:g> ਵਰਤੀ ਗਈ"</string>
     <string name="data_overusage" msgid="3680477320458707259">"<xliff:g id="ID_1">^1</xliff:g> ਤੋਂ ਵੱਧ"</string>
     <string name="data_remaining" msgid="6316251496381922837">"<xliff:g id="ID_1">^1</xliff:g> ਬਾਕੀ"</string>
     <string name="data_usage_chart_brief_content_description" msgid="5548074070258881530">"ਗ੍ਰਾਫ਼ ਵਿੱਚ <xliff:g id="START_DATE">%1$s</xliff:g> ਅਤੇ <xliff:g id="END_DATE">%2$s</xliff:g> ਵਿਚਲੀ ਡਾਟਾ ਵਰਤੋਂ ਦਿਖਾਈ ਜਾ ਰਹੀ ਹੈ।"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(ਵਰਤੋਂਕਾਰ <xliff:g id="USER">%s</xliff:g> ਲਈ ਅਣਸਥਾਪਤ ਕੀਤੀ)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(ਵਰਤੋਂਕਾਰ <xliff:g id="USER">%s</xliff:g> ਲਈ ਅਯੋਗ ਬਣਾਈ)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"ਆਟੋਫਿਲ ਸੇਵਾ"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"ਆਟੋ, ਫਿਲ, ਆਟੋਫਿਲ"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"ਪਾਸਵਰਡ"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"ਆਟੋ, ਫਿਲ, ਆਟੋਫਿਲ, ਪਾਸਵਰਡ"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਇਸ ਐਪ \'ਤੇ ਭਰੋਸਾ ਕਰਦੇ ਹੋ&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ਆਪਣੇ-ਆਪ ਭਰੀਆਂ ਜਾ ਸਕਣ ਵਾਲੀਆਂ ਚੀਜ਼ਾਂ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਮੌਜੂਦ ਚੀਜ਼ਾਂ ਦੀ ਵਰਤੋਂ ਕਰਦਾ ਹੈ।"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"ਆਟੋਫਿਲ"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"ਲੌਗ ਕੀਤੀ ਜਾਣਕਾਰੀ ਦਾ ਪੱਧਰ"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ਨੈੱਟਵਰਕ ਓਪਰੇਟਿੰਗ ਮੋਡ ਬਦਲੋ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਦੀ ਕਿਸਮ"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ਕੈਰੀਅਰ"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ਸੈਟਿੰਗਾਂ ਦਾ ਵਰਜਨ"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"ਕੈਰੀਅਰ ਸੈਟਿੰਗਾਂ ਦਾ ਵਰਜਨ"</string>
     <string name="call_category" msgid="641461844504128789">"ਕਾਲਿੰਗ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"ਕੈਰੀਅਰ ਵੀਡੀਓ ਕਾਲਿੰਗ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"ਸਿਸਟਮ ਵੱਲੋਂ ਚੁਣਿਆ"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ਸਿਮ ਹਟਾ ਕੇ ਦੁਬਾਰਾ ਪਾਓ। ਜੇ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ।"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ਸਿਮ ਨੂੰ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ।"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ਨੈੱਟਵਰਕ ਕਿਰਿਆਸ਼ੀਲਤਾ"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"ਕੈਰੀਅਰ ਨੂੰ ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਹੈ"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ਸੈਟਿੰਗਾਂ ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ਵਰਤਿਆ ਗਿਆ"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"ਬੰਦ"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"ਇੰਟਰਨੈੱਟ"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"ਸਿਮ"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਨੈੱਟਵਰਕ ਦਿਖਾਓ"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਵਿੱਚ ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਲੱਭੋ ਅਤੇ ਉਹਨਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ।"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਲੱਭ ਕੇ ਉਹਨਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ, ਹਵਾਈ-ਜਹਾਜ਼ ਸੁਰੱਖਿਅਤ ਮੋਡ"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"ਕਾਲਾਂ ਅਤੇ SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ਉਪਲਬਧ ਨਹੀਂ"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ਕੁਝ ਸਮੇਂ ਲਈ ਅਣਉਪਲਬਧ"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"ਕੋਈ ਸਿਮ ਨਹੀਂ"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ਤਰਜੀਹਾਂ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ਨੈੱਟਵਰਕ ਤਰਜੀਹਾਂ"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ਜਨਤਕ ਨੈੱਟਵਰਕਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ, ਇੰਟਰਨੈੱਟ, ਵਾਇਰਲੈੱਸ, ਡਾਟਾ, ਵਾਈ-ਫਾਈ, ਸੈਲਿਊਲਰ, ਮੋਬਾਈਲ, ਸੈੱਲ ਕੈਰੀਅਰ, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਨੈੱਟਵਰਕ ਦੇਖੋ"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਵਿੱਚ ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਦੇਖਣਾ"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਬੰਦ ਕਰੋ"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"ਕੀ ਆਪਣਾ ਇੰਟਰਨੈੱਟ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"ਇਸ ਨਾਲ ਤੁਹਾਡੀ ਫ਼ੋਨ ਕਾਲ ਸਮਾਪਤ ਹੋ ਜਾਵੇਗੀ"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ਇਸ ਨਾਲ ਤੁਹਾਡੀ ਫ਼ੋਨ ਕਾਲ ਸਮਾਪਤ ਹੋ ਜਾਵੇਗੀ"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"ਤੁਹਾਡੇ ਇੰਟਰਨੈੱਟ ਨੂੰ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"ਕਨੈਕਟੀਵਿਟੀ ਠੀਕ ਕਰੋ"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਨੈੱਟਵਰਕ ਉਪਲਬਧ ਹਨ"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ਨੈੱਟਵਰਕ ਬਦਲਣ ਲਈ, ਈਥਰਨੈੱਟ ਨੂੰ ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"ਕਨੈਕਟ ਕੀਤੇ ਹੋਣ ਵੇਲੇ ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਨਹੀਂ ਬਦਲ ਸਕਦੇ"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਨੈੱਟਵਰਕ"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"ਕਨੈਕਟ ਹੈ"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"ਇੰਟਰਨੈੱਟ ਸਵੈ-ਕਨੈਕਟ ਨਹੀਂ ਜਾਵੇਗਾ"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"ਰੰਗ"</string>
     <string name="category_name_others" msgid="2366006298768550310">"ਹੋਰ"</string>
     <string name="category_name_general" msgid="7737273712848115886">"ਸਧਾਰਨ"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"ਸਭ ਐਪਾਂ ਦੇਖੋ"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"ਸਮਾਰਟ ਫਾਰਵਰਡਿੰਗ"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"ਸਮਾਰਟ ਫਾਰਵਰਡਿੰਗ ਦੀ ਸੁਵਿਧਾ ਚਾਲੂ ਹੈ"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ਫ਼ੋਨ ਨੰਬਰ ਦਾਖਲ ਕਰੋ"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ਫ਼ੋਨ ਨੰਬਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ਠੀਕ ਹੈ"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G ਸੈਲਿਊਲਰ ਕਨੈਕਸ਼ਨਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ। ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਲਈ, 2G ਹਮੇਸ਼ਾਂ ਚਾਲੂ ਹੁੰਦਾ ਹੈ।"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1ec4bf8..81775b7 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -54,9 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Powiększ lub pomniejsz tekst na ekranie."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Pomniejsz"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Powiększ"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Użyj autoobracania"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Przykładowy tekst"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Czarnoksiężnik z Krainy Oz"</string>
@@ -413,15 +412,21 @@
       <item quantity="one">Ustawiono <xliff:g id="COUNT_0">%1$d</xliff:g> odcisk palca</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Odblokuj odciskiem palca"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Skonfiguruj odcisk palca"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Korzystanie z odcisku palca"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Wystarczy dotknąć czytnika linii papilarnych, by odblokować telefon, autoryzować zakupy czy zalogować się w aplikacjach. Z rozwagą dodawaj odciski palców innych osób. Każda dodana osoba będzie mogła wykonać wszystkie te czynności."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Odcisk palca może być mniej bezpieczny niż skomplikowany wzór lub złożony kod PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Masz wszystko pod kontrolą"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Pamiętaj"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Dane zarejestrowane przez funkcję do zarządzania odciskami palców są przechowywane w bezpieczny sposób i nigdy nie opuszczają Twojego telefonu. W dowolnym momencie możesz je usunąć w Ustawieniach."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Odcisk palca może być mniej bezpieczny niż skomplikowany wzór lub złożony kod PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Telefon będzie co jakiś czas używał ostatnich obrazów Twoich odcisków palców do poprawiania ich modeli."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Odblokowuj telefon i zatwierdzaj zakupy odciskiem palca.\n\nUwaga: nie możesz odblokowywać tego urządzenia odciskiem palca. Więcej informacji uzyskasz od administratora swojej organizacji."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Odblokowuj telefon i zatwierdzaj zakupy odciskiem palca.\n\nUwaga: odcisk palca może być mniej bezpieczny niż skomplikowany wzór lub złożony kod PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Anuluj"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nie, dziękuję"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Pomiń"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Dalej"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Zgadzam się"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Pomiń"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Dalej"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Pominąć odcisk palca?"</string>
@@ -438,16 +443,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Pomiń"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Anuluj"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Dotknij czytnika"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Naciśnij i przytrzymaj ikonę odcisku palca"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Znajduje się z tyłu telefonu. Użyj palca wskazującego."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Jest na ekranie. Poszukaj odcisku palca ze świecącym okręgiem."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Czytnik linii papilarnych znajduje się na ekranie. Przesuń palcem po ekranie, aby go odszukać."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustracja pokazująca urządzenie i umiejscowienie czytnika linii papilarnych"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nazwa"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Usuń"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Dotknij czytnika"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Przyłóż palec do czytnika. Podnieś go, gdy poczujesz wibracje."</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Podnieś palec i przyłóż go ponownie"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Unoś palec, by odcisk był dokładniejszy"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Odcisk palca dodany"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Gdy zobaczysz tę ikonę, możesz użyć odcisku palca, aby się zidentyfikować lub zatwierdzić zakup"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Później"</string>
@@ -1216,14 +1230,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Wyszukiwanie"</string>
     <string name="display_settings" msgid="7197750639709493852">"Wyświetlacz"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Autoobracanie ekranu"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Wyłączono"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Włączono"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Włączono – na podstawie twarzy"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Włącz wykrywanie twarzy"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Kolory"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturalne"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Wzmocnione"</string>
@@ -1268,7 +1278,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Włączone / Ekran nie wyłączy się, jeśli na niego patrzysz"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Wyłączono"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Wymagany jest dostęp do aparatu"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Kliknij, by zarządzać uprawnieniami usług personalizacji urządzenia"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Zapobiega wyłączeniu ekranu, jeśli na niego patrzysz"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Aktywność ekranu sprawdza za pomocą przedniego aparatu, czy ktoś patrzy na ekran. Działa na urządzeniu, a obrazy nie są zapisywane ani wysyłane do Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Włącz aktywność ekranu"</string>
@@ -1349,7 +1362,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Gdy ekran jest ciemny, włącza się po otrzymaniu nowego powiadomienia"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Zawsze pokazuj czas i dane"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Zwiększone wykorzystanie baterii"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Włącz pogrubienie tekstu"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Włącz pogrubienie tekstu"</string>
     <string name="title_font_size" msgid="570613010306330622">"Rozmiar czcionki"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Powiększ lub pomniejsz tekst"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Ustawienia blokady karty SIM"</string>
@@ -1520,6 +1533,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Inni użytkownicy"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Pamięć urządzenia"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Pamięć przenośna"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmy i przypomnienia"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Zezwól na ustawianie alarmów i przypomnień"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmy i przypomnienia"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Zezwól aplikacji na planowanie alarmów lub innych wydarzeń z harmonogramem. Dzięki temu aplikacja będzie się wybudzać i działać nawet na nieużywanym urządzeniu. Pamiętaj, że anulowanie tego upoważnienia może spowodować nieprawidłowości w działaniu aplikacji. Przede wszystkim przestaną działać wszystkie zaplanowane przez nią alarmy."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"harmonogram, alarm, przypomnienie, wydarzenie"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Wykorzystane <xliff:g id="USED">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"wykorzystane z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1769,7 +1787,8 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Usługi lokalizacyjne"</string>
     <string name="location_title" msgid="5819154746934945021">"Moja lokalizacja"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokalizacja dla profilu służbowego"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Dostęp aplikacji"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Lokalizacja jest wyłączona"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="few"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> z <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplikacji mają dostęp do lokalizacji</item>
@@ -1777,24 +1796,24 @@
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> z <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplikacji ma dostęp do lokalizacji</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> z <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> aplikacji ma dostęp do lokalizacji</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Dostęp do ostatniej lokalizacji"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Wyświetl szczegóły"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Żadne aplikacje nie prosiły ostatnio o lokalizację"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Żadne aplikacje ostatnio nie korzystały z lokalizacji"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Wysokie użycie baterii"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Niskie użycie baterii"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Skanowanie Wi‑Fi i Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Skanowanie Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Zezwól na wyszukiwanie sieci Wi-Fi przez aplikacje i usługi w dowolnym momencie, nawet gdy Wi-Fi jest wyłączone. Może to np. pomóc usprawnić działanie funkcji i usług opartych na lokalizacji."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Skanowanie Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Zezwól na wyszukiwanie urządzeń w pobliżu przez aplikacje i usługi w dowolnym momencie, nawet gdy Bluetooth jest wyłączony. Może to np. pomóc usprawnić działanie funkcji i usług opartych na lokalizacji."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Usługi lokalizacyjne"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usługi lokalizacyjne do pracy"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Wykrywanie strefy czasowej lokalizacji"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Wykrywanie strefy czasowej lokalizacji"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Zezwala na używanie lokalizacji urządzenia do wykrywania bieżącej strefy czasowej. Inne ustawienia lokalizacji, takie jak skanowanie Wi‑Fi, mogą wpływać na dokładność wykrywania strefy czasowej."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Włączono"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Wyłączono"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatyczne wykrywanie strefy czasowej jest wyłączone"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatyczna strefa czasowa jest wyłączona"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Wykrywanie strefy czasowej lokalizacji jest wyłączone"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Wykrywanie strefy czasowej lokalizacji nie jest obsługiwane"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Wprowadzanie zmian dotyczących wykrywania strefy czasowej lokalizacji nie jest dozwolone"</string>
@@ -1977,10 +1996,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Włącz"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Wyczyść pamięć wewnętrzną"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Odinstaluj aktualizacje"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Aplikacja jest domyślnie uruchamiana w przypadku niektórych działań."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Niektóre wybrane działania są realizowane domyślnie w tej aplikacji."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Zdecydowałeś, że ta aplikacja może tworzyć widgety i mieć dostęp do ich danych."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Brak ustawień domyślnych."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Wyczyść domyślne"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Wyczyść ustawienia domyślne"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Aplikacja może nie być przystosowana do ekranu Twojego urządzenia. Tutaj możesz ją skonfigurować do obsługi ekranu."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Zapytaj po uruchomieniu"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Skaluj aplikację"</string>
@@ -2192,7 +2211,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Możesz dostosować urządzenie do swoich potrzeb. Ułatwienia dostępu możesz zawsze zmienić w Ustawieniach."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Zmień rozmiar czcionki"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Czytniki ekranu"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Dźwięk i tekst na ekranie"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Napisy"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Dźwięk"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Ogólne"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Wyświetlacz"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Tekst i wyświetlanie"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Przyciemnij ekran"</string>
@@ -2347,7 +2368,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Czerwony-zielony"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Czerwony-zielony"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Niebieski-żółty"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Zmniejsz jasność"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Zmniejsz jasność"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Przyciemnij ekran bardziej niż przy minimalnej jasności telefonu"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Przyciemnij ekran bardziej niż przy minimalnej jasności tabletu"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Przyciemnij ekran, aby wygodniej czytać.&lt;br/&gt;&lt;br/&gt; Może to być pomocne, gdy: &lt;ol&gt; &lt;li&gt; minimalna jasność telefonu jest zbyt jasna;&lt;/li&gt; &lt;li&gt; używasz telefonu w ciemności, np. w nocy lub w ciemnym pokoju przed zaśnięciem.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3422,8 +3443,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"twarz"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"odcisk palca, dodawanie odcisków palców"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"przyciemnianie ekranu, ekran dotykowy, bateria, inteligentna jasność, dynamiczna jasność, automatyczna jasność"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"przyciemniony ekran, uśpienie, bateria, wygaszanie, aktywność, wyświetlacz, ekran, brak aktywności"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"obrót, odwrócenie, rotacja, pionowo, poziomo, orientacja, pionowa, pozioma"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"aktualizacja, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"nie przeszkadzać, harmonogram, powiadomienia, blokować, wyciszanie, wibrowanie, uśpienie, praca, koncentracja, dźwięk, wyciszenie, dzień, dzień tygodnia, weekend, noc poza weekendem, wydarzenie"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ekran, czas blokady, czas wygaszania, blokada ekranu"</string>
@@ -3592,9 +3615,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Dzwonki"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Inne dźwięki i wibracje"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Powiadomienia"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Rozmowa"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Ostatnio wysłane"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Zobacz wszystkie z ostatnich 7 dni"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Zaawansowane"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Ogólne"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Powiadomienia związane z pracą"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Powiadomienia adaptacyjne"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Priorytet powiadomień adaptacyjnych"</string>
@@ -3656,7 +3680,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Wyświetlaj w obszarze powiadomień, na pasku stanu i ekranie blokady"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ukryj ciche powiadomienia na pasku stanu"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Migająca dioda"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Powiadomienia na ekranie blokady"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Prywatność"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Pomijanie ekranu blokady"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Po rozpoznaniu twarzy przejdź od razu do ostatnio używanego ekranu"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ekran blokady, Pomiń, Pomijaj"</string>
@@ -3751,7 +3775,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> powiadomienie tygodniowo</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nigdy"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Dostęp do powiadomień"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Powiadomienia na urządzeniu i w aplikacjach"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Zarządzaj powiadomieniami wyświetlanymi w aplikacjach i na urządzeniach"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Dostęp do powiadomień profilu służbowego jest zablokowany"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Aplikacje nie mogą odczytywać powiadomień"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3772,17 +3797,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Wyłącz"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Anuluj"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Dozwolone typy powiadomień"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Ważne bieżące powiadomienia"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Powiadomienia w rozmowach"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Alerty"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Ciche powiadomienia"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Czas rzeczywisty"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Komunikaty używanych aplikacji w czasie rzeczywistym, nawigacja, rozmowy telefoniczne i inne ustawienia"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Rozmowy"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS-y i inne komunikaty"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Domyślne"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Powiadomienia, które według ustawień mogą włączać dzwonek lub wibracje"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Ciche"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Powiadomienia, które nigdy nie włączają dźwięku ani wibracji"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Zobacz wszystkie aplikacje"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Zmień ustawienia powiadomień z poszczególnych aplikacji, które moga wysyłać powiadomienia"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Aplikacje pokazywane na urządzeniu"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Usługi pomocnicze rzeczywistości wirtualnej"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Żadne zainstalowane aplikacje nie prosiły o uruchomienie w trybie usług pomocniczych rzeczywistości wirtualnej."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Zezwalasz usłudze <xliff:g id="SERVICE">%1$s</xliff:g> na dostęp do usługi rzeczywistości wirtualnej?"</string>
@@ -4082,9 +4107,36 @@
     <string name="launch_by_default" msgid="892824422067985734">"Otwórz domyślnie"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Otwieranie linków"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Otwórz obsługiwane linki"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Obsługiwane linki otwierają się w tej aplikacji"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Linki otwierane w tej aplikacji"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Otwórz bez pytania"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Obsługiwane linki"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Inne ustawienia domyślne"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Inne ustawienia domyślne"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Dodaj link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Aplikacja może weryfikować linki, aby otwierać je automatycznie. "<annotation id="url">"Więcej informacji"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> zweryfikowane linki</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> zweryfikowanych linków</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> zweryfikowanego linku</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> zweryfikowany link</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="few">Te linki są zweryfikowane i otwierają się automatycznie w tej aplikacji.</item>
+      <item quantity="many">Te linki są zweryfikowane i otwierają się automatycznie w tej aplikacji.</item>
+      <item quantity="other">Te linki są zweryfikowane i otwierają się automatycznie w tej aplikacji.</item>
+      <item quantity="one">Ten link jest zweryfikowany i otwiera się automatycznie w tej aplikacji.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Sprawdzam, czy są inne obsługiwane linki…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Anuluj"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> obsługiwane linki</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> obsługiwanych linków</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> obsługiwanego linku</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> obsługiwany link</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Dodaj"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Otwiera się w aplikacji <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> wykorzystane w: <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"pamięć wewnętrzna"</string>
     <string name="storage_type_external" msgid="125078274000280821">"pamięć zewnętrzna"</string>
@@ -4399,7 +4451,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Brak uprawnień do aparatu"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Brak uprawnień do tworzenia zrzutów ekranu"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Nie można otworzyć tej aplikacji"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Jeśli masz pytania, skontaktuj się z administratorem IT"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Więcej szczegółów"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Administrator może monitorować aplikacje i dane powiązane z Twoim profilem służbowym (w tym ustawienia, uprawnienia, firmowe uprawnienia dostępu, aktywność w sieci i informacje o lokalizacji urządzenia) oraz nimi zarządzać."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Administrator może monitorować aplikacje i dane powiązane z tym użytkownikiem (w tym ustawienia, uprawnienia, firmowe uprawnienia dostępu, aktywność w sieci i informacje o lokalizacji urządzenia) oraz nimi zarządzać."</string>
@@ -4482,7 +4535,7 @@
       <item quantity="one">1 ograniczenie</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operator komórkowy może obliczać ilość przesłanych danych inaczej niż urządzenie"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Użycie danych w sieciach operatorów nie jest uwzględniane"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Użycie danych w sieciach operatorów nie jest uwzględniane"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Wykorzystano <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Ustaw ostrzeżenie dotyczące danych"</string>
     <string name="data_warning" msgid="2925054658166062884">"Ostrzeżenie dotyczące danych"</string>
@@ -4845,7 +4898,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g> – odinstalowano)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g> – wyłączono)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Usługa autouzupełniania"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automatyczne, uzupełnianie, autouzupełnianie"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Hasła"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automatycznie, uzupełnianie, autouzupełnianie, hasło"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Sprawdź, czy ta aplikacja jest zaufana&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Autouzupełnianie Google&gt;%1$s&lt;/xliff:g&gt; na podstawie zawartości ekranu określa, co można uzupełnić automatycznie."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Autouzupełnianie"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Poziom rejestrowania"</string>
@@ -5054,7 +5108,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Zmień tryb działania sieci"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferowany typ sieci"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Wersja ustawień"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Wersja ustawień operatora"</string>
     <string name="call_category" msgid="641461844504128789">"Połączenia"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Rozmowy wideo w sieci operatora"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Wybór systemu"</string>
@@ -5103,6 +5157,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Wyjmij kartę SIM i włóż ją ponownie. Jeśli problem nie ustąpi, uruchom urządzenie ponownie."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Spróbuj ponownie włączyć kartę SIM. Jeśli problem nie ustąpi, uruchom urządzenie ponownie."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktywacja sieci"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Przełączanie operatora"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Sieć <xliff:g id="CARRIER_NAME">%1$s</xliff:g> jest aktywna"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Kliknij, by zaktualizować ustawienia karty SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Przełączono na sieć <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5267,8 +5322,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Wyłączony"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Karty SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Pokaż sieci dostępne w trybie samolotowym"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Znajdź sieci dostępne w trybie samolotowym i połącz się z nimi."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Znajduj sieci Wi‑Fi i łącz się z nimi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"samolot, bezpieczny w trybie samolotowym"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Połączenia i SMS-y"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Połączenia przez Wi‑Fi"</string>
@@ -5282,22 +5336,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"niedostępne"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Chwilowo niedostępna"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Brak karty SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Ustawienia"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Ustawienia sieci"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Łącz się z sieciami publicznymi"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"połączenie sieciowe, internet, bezprzewodowy, dane, Wi-Fi, wi-fi, wi fi, komórka, telefon, operator komórkowy, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Wyświetl sieci dostępne w trybie samolotowym"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Wyświetlam sieci działające w trybie samolotowym"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Włącz sieci"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Wyłącz sieci"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Zresetować połączenie z internetem?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Połączenie telefoniczne zostanie zakończone"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Połączenie telefoniczne zostanie zakończone"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Resetuję połączenie z internetem…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Rozwiąż problemy z połączeniami"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Dostępne sieci działające w trybie samolotowym"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Aby przełączać sieci, odłącz Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Nie można przełączyć sieci po połączeniu"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Sieci działające w trybie samolotowym"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Połączono"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Nie połączy z internetem automatycznie"</string>
@@ -5318,6 +5371,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Kolor"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Inne"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Ogólne"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Wyświetl wszystkie aplikacje"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Inteligentne przekierowywanie"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Włączono inteligentne przekierowywanie"</string>
@@ -5331,4 +5388,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Wpisz numer telefonu"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Brak numeru telefonu."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Zezwól na 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Używaj połączeń komórkowych 2G. W przypadku połączeń alarmowych sieć 2G jest zawsze włączona."</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index d220ed2..e37c00c 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Aumentar ou diminuir o texto na tela"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Tornar menor"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Tornar maior"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Usar o giro automático"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Texto de amostra"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"O Mágico de Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Desbloqueio com digital"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Configurar impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Usar a impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Basta tocar no sensor de impressão digital para desbloquear seu smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões que adicionar. Até mesmo uma única digital adicionada pode realizar todas essas ações."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Sua impressão digital pode ser menos segura que um padrão ou PIN forte."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Você no controle"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Lembre-se"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Os dados gravados pelo Fingerprint são armazenados em segurança e nunca saem do smartphone. Você pode excluí-los a qualquer momento nas configurações."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Sua impressão digital pode ser menos segura que um padrão ou PIN forte."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Às vezes, o smartphone usará as imagens recentes da sua impressão digital para criar modelos melhores dela."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Use sua impressão digital para desbloquear o smartphone ou aprovar compras.\n\nNota: não é possível usar sua impressão digital para desbloquear este dispositivo. Para mais informações, entre em contato com o administrador da organização."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Use sua impressão digital para desbloquear o smartphone ou aprovar compras.\n\nObservação: usar um padrão ou um PIN forte pode ser mais seguro que sua impressão digital."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Agora não"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Pular"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Concordo"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Pular"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Próxima"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Pular impressão digital?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Pular"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Toque no sensor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Toque no ícone de impressão digital e mantenha-o pressionado"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Ele fica na parte traseira do seu smartphone. Use o dedo indicador."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Está na tela. Procure a impressão digital com um círculo brilhante."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"O sensor de impressão digital está na sua tela. Mova o dedo pela tela para encontrá-lo."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustração mostrando a localização do sensor de impressão digital no dispositivo"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Ok"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Excluir"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Toque no sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Encoste o dedo no sensor e, após sentir uma vibração, tire o dedo"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Tire o dedo e toque novamente"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Repita o processo de tocar e levantar o dedo para registrar todas as partes da sua impressão digital"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Impressão digital adicionada"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Sempre que este ícone for exibido, use sua impressão digital para se identificar ou aprovar compras"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Mais tarde"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Pesquisar"</string>
     <string name="display_settings" msgid="7197750639709493852">"Tela"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Giro automático da tela"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desativado"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Ativado"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Ativ. - Reconhecimento facial"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Ativar a detecção facial"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Cores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturais"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Realçadas"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ativado / A tela não será desativada se você estiver olhando para ela"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Desativada"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Acesso à câmera necessário"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Toque para gerenciar as permissões dos serviços de personalização do dispositivo"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Evita que a tela seja desativada se você estiver olhando para ela"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Usando a câmera frontal, o \"Reconhecimento de tela em uso\" detecta se alguém está olhando para a tela. Ele funciona no dispositivo, e as imagens nunca são armazenadas nem enviadas ao Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Ativar o \"reconhecimento de tela em uso\""</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Quando a tela está escura, ela é ativada quando chegam notificações"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Sempre mostrar hora e informações"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Maior uso da bateria"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Negrito"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Negrito"</string>
     <string name="title_font_size" msgid="570613010306330622">"Tamanho da fonte"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Tornar o texto maior ou menor"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Bloqueio do chip"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Outros usuários"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Armazenamento do dispositivo"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Armazenamento portátil"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmes e lembretes"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Permitir a definição de alarmes e lembretes"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmes e lembretes"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Permitir que este app programe alarmes ou outros eventos de tempo. Com isso, ele poderá funcionar mesmo quando você não estiver usando o dispositivo. Se essa permissão for revogada, o app poderá apresentar falhas, especificamente nos alarmes programados por ele, que deixarão de funcionar."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"programação, alarme, lembrete, evento"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> usados de um total de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Usado(s) de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Serviços de localização"</string>
     <string name="location_title" msgid="5819154746934945021">"Meu Local"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Local do perfil de trabalho"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Acesso do app ao local"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Localização desativada"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps tem acesso à localização</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps têm acesso à localização</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Acesso recente ao local"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Ver detalhes"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Nenhum app solicitou a localização recentemente"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nenhum app acessou o local recentemente"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Uso da bateria elevado"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Uso da bateria reduzido"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Busca por Wi‑Fi e Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Busca por Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permite que apps e serviços procurem redes Wi‑Fi a qualquer momento, mesmo quando o Wi‑Fi está desativado. Essa configuração pode ser usada, por exemplo, para melhorar recursos e serviços baseados na localização."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Busca por Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que apps e serviços procurem dispositivos próximos a qualquer momento, mesmo quando o Bluetooth está desativado. Essa configuração pode ser usada, por exemplo, para melhorar recursos e serviços baseados na localização."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Serviços de localização"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serviços de localização para o trabalho"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detecção do fuso horário do local"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detecção do fuso horário do local"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permite que o local do dispositivo seja usado para detectar o fuso horário atual. Outras configurações de localização, como busca por Wi-Fi, podem afetar a precisão da detecção de fuso horário."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Ativada"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desativada"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"A detecção automática de fuso horário está desativada"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"O fuso horário automático está desativado"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"A detecção de fuso horário do local está desativada"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"A detecção de fuso horário do local está indisponível"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Não são permitidas mudanças na detecção de fuso horário do local"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Ativar"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Limpar armazenamento"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Desinstalar atualizações"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Você decidiu lançar este app por padrão para algumas ações."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Algumas atividades selecionadas por você são abertas neste app por padrão."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Você optou por permitir que este app crie widgets e acesse os dados."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Nenhum padrão definido."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Limpar padrão"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Limpar preferências padrão"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Talvez este app não seja desenvolvido para sua tela. É possível controlar o ajuste da tela aqui."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Perguntar ao iniciar"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Dimensionar app"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Configurar\"."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Alterar tamanho da fonte"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Leitores de tela"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Áudio e texto na tela"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Legendas"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Áudio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Geral"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Tela"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texto e exibição"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Escurecer a tela"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermelho-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermelho-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduzir brilho"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Reduzir brilho"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Use o smartphone com o brilho da tela abaixo do mínimo"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Use o tablet com o brilho da tela abaixo do mínimo"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Diminua o brilho da tela para deixar a leitura mais confortável.&lt;br/&gt;&lt;br/&gt; Esse recurso pode ser útil quando: &lt;ol&gt; &lt;li&gt; o brilho mínimo padrão do smartphone ainda é claro demais;&lt;/li&gt; &lt;li&gt; você está usando o smartphone em ambientes com pouca iluminação, como à noite ou em um quarto escuro antes de dormir.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"rosto"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"impressão digital, adicionar impressão digital"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"escurecer tela, touchscreen, bateria, brilho inteligente, brilho dinâmico, brilho automático"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"escurecer tela, suspensão, bateria, tempo limite, atenção, display, tela, inatividade"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"girar, virar, rotação, retrato, paisagem, orientação, vertical, horizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"não perturbe, programação, notificações, bloquear, silenciar, vibrar, suspender, trabalho, focar, som, desativar som, dia, dia da semana, final de semana, durante a semana à noite, evento"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"tela, tempo até o bloqueio, tempo limite, tela de bloqueio"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Toques"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Outros sons e vibrações"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificações"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversa"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Enviadas recentemente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ver todas enviadas nos últimos 7 dias"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avançado"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Geral"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificações de trabalho"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificações adaptáveis"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioridade de notificação adaptável"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Exibir na aba suspensa, barra de status e tela de bloqueio"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ocultar notificações silenciosas na barra de status"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Piscar a luz"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notificações na tela de bloqueio"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacidade"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Pular tela de bloqueio"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Depois do desbloqueio facial, ir para a última tela usada"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Bloquear tela, tela de bloqueio, pular, ignorar"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="other">Cerca de <xliff:g id="NUMBER_1">%d</xliff:g> notificações por semana</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nunca"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Acesso a notificações"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Notificações do app e do dispositivo"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Controle quais notificações são exibidas nos seus apps e dispositivos"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Os apps não podem ler notificações"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Desativar"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Cancelar"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Tipos de notificação permitidos"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Notificações contínuas importantes"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Notificações de conversas"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Notificações com alerta"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Notificações silenciosas"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Em tempo real"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Comunicação em tempo real de apps em uso, navegação, chamadas telefônicas e muito mais"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Conversas"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS e outras comunicações"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Padrão"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"As notificações podem fazer o dispositivo tocar ou vibrar de acordo com as configurações"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Silenciosa"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Notificações que nunca fazem o dispositivo tocar ou vibrar"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Ver todos os apps"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Mude as configurações de notificação para cada app que pode enviar notificações"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Apps exibidos no dispositivo"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Serviços de ajuda para RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nenhum app instalado solicitou ser executado como serviços de ajuda para RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Permitir acesso ao serviço de RV para <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Abrir por padrão"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Abrir links"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Abrir links compatíveis"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Links compatíveis são abertos neste app"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Links abertos neste app"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Abrir sem perguntar"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Links compatíveis"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Outros padrões"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Outras preferências padrão"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Adicionar link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Um app pode verificar links para abri-los automaticamente. "<annotation id="url">"Saiba mais"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> link verificado</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> links verificados</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">O link foi verificado e será aberto automaticamente neste app.</item>
+      <item quantity="other">Os links foram verificados e serão abertos automaticamente neste app.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Procurando outros links compatíveis…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Cancelar"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> link compatível</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> links compatíveis</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Adicionar"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"É aberto no app <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> usados em <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"armazenamento interno"</string>
     <string name="storage_type_external" msgid="125078274000280821">"armazenamento externo"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Câmera não permitida"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Captura de tela não permitida"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Não é possível abrir este app"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Se você tiver perguntas, entre em contato com o administrador de TI"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Mais detalhes"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Seu administrador pode monitorar e gerenciar apps e dados associados ao seu perfil de trabalho, incluindo configurações, permissões, acesso corporativo, atividade de rede e informações de local do dispositivo."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Seu administrador pode monitorar e gerenciar apps e dados associados a este usuário, incluindo configurações, permissões, acesso corporativo, atividade de rede e informações de local do dispositivo."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrições</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"O cálculo de dados da operadora pode ser diferente daquele realizado pelo seu dispostivo"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excluir dados usados por redes de operadoras"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Exclui dados usados por redes de operadoras"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s)"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Definir alerta de uso de dados"</string>
     <string name="data_warning" msgid="2925054658166062884">"Alerta de uso de dados"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(desinstalado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(desativado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Preenchimento automático"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automático, preenchimento, preenchimento automático"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Senhas"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"preencher, automático, preenchimento automático, senha"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Você precisa confiar nesse app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=O Preenchimento automático do Google&gt;%1$s&lt;/xliff:g&gt; usa o que está na sua tela para determinar o que pode ser preenchido automaticamente."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Preenchimento automático"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Nível de registro"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Alterar o modo de operação de rede"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipo de rede preferencial"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operadora"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versão das configurações"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versão das configurações da operadora"</string>
     <string name="call_category" msgid="641461844504128789">"Chamadas"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videochamadas pela operadora"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Seleção de sistema"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remova o chip e insira-o novamente. Se o problema continuar, reinicie o dispositivo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Tente ativar o chip novamente. Se o problema continuar, reinicie o dispositivo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ativação de rede"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Mudança de operadora"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"A operadora <xliff:g id="CARRIER_NAME">%1$s</xliff:g> está ativa"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toque para atualizar as configurações do chip"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Mudou para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desativar"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Chips"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Mostrar redes de modo avião"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Encontrar e se conectar a redes em modo avião."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Encontrar redes Wi-Fi e se conectar a elas"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avião, segura para aviões"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Chamada no Wi-Fi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"indisponível"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporariamente indisponível"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Sem chip"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferências"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferências de rede"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectar-se a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexão de rede, internet, sem fio, dados, wifi, wi-fi, wi fi, celular, rede móvel, operadora de celular, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ver redes do modo avião"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Exibindo redes do modo avião"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Ativar redes"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Desativar redes"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Redefinir sua Internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Isso encerrará a chamada telefônica"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Isso encerrará a chamada telefônica"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Redefinindo sua Internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Corrigir conectividade"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Redes do modo avião disponíveis"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para mudar de rede, desconecte o cabo Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Não é possível mudar de rede enquanto estiver conectado"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes para o modo avião"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectado"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"A Internet não será automaticamente conectada"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Cor"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Outros"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Geral"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Ver todos os apps"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Encaminhamento inteligente"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Encaminhamento inteligente ativado"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Inserir número de telefone"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"O número de telefone não foi informado."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Permitir 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Usar conexões celulares 2G. Para chamadas de emergência, o 2G está sempre ativado."</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 7580ac3..3708aff 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Aumente ou diminua o texto no ecrã."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Diminuir"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Aumentar"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Utilize a rotação automática"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Exemplo de texto"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"O Maravilhoso Feiticeiro de Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> impressão digital configurada</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Desbloq. com impressão digital"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Configure a sua impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Utilizar a impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Basta tocar no sensor de impressões digitais para desbloquear o telemóvel, autorizar compras ou iniciar sessão em apps. Tenha cuidado com as impressões digitais que adiciona. Qualquer impressão digital adicionada ao telemóvel pode executar estas ações."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"A impressão digital pode ser menos segura do que um padrão ou um PIN fortes."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"O controlo é seu"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Tenha em atenção"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Os dados registados pela impressão digital são armazenados de forma segura e nunca saem do seu telemóvel. Pode eliminar os dados em qualquer altura nas Definições."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"A impressão digital pode ser menos segura do que um padrão ou um PIN fortes."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"O seu telemóvel irá utilizar ocasionalmente as suas imagens de impressões digitais recentes para criar modelos de impressões digitais melhorados."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utilize a sua impressão digital para desbloquear o telemóvel ou para autorizar compras.\n\nNota: não pode utilizar a sua impressão digital para desbloquear este dispositivo. Para mais informações, contacte o gestor da sua entidade."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utilize a sua impressão digital para desbloquear o telemóvel ou para autorizar compras.\n\nNota: a impressão digital pode ser menos segura do que um padrão ou um PIN fortes."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Não, obrigado"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Ignorar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Aceitar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ignorar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Seguinte"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Ignorar impressão digital?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Ignorar"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Toque no sensor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Toque sem soltar no ícone de impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Está na parte traseira do telemóvel. Utilize o dedo indicador."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Está no ecrã. Procure a impressão digital com um círculo brilhante."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"O sensor de impressões digitais encontra-se no seu ecrã. Mova o dedo pelo ecrã para o encontrar."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustração com o dispositivo e a localização do sensor de impressões digitais"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Eliminar"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Toque no sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Coloque o dedo sobre o sensor e levante-o depois de sentir uma vibração"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Levante e toque novamente"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Vá levantando o dedo para adicionar as diferentes partes da sua impressão digital"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Impressão digital adicionada"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Quando vir este ícone, pode utilizar a sua impressão digital para identificação ou para autorizar compras"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Fazer isto mais tarde"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Pesquisar"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ecrã"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Rodar ecrã automaticamente"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desativada"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Ativada"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Ativada – Com base no rosto"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Ativar deteção facial"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Cores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturais"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Amplificadas"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ativada/O ecrã não se desliga se estiver a olhar para o mesmo"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Desativado"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Acesso à câmara necessário"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Toque para gerir as autorizações dos Serviços de personalização do dispositivo"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Evitar que o ecrã se desligue se estiver a olhar para o mesmo"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"A Atenção ao ecrã utiliza a câmara frontal para ver se alguém está a olhar para o ecrã. Funciona no dispositivo e as imagens nunca são armazenadas nem enviadas para a Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Ative a atenção ao ecrã"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Quando o ecrã está escuro, acende-se se surgirem novas notificações"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Mostrar sempre hora e informações"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Maior utilização da bateria"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Texto em negrito"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Texto em negrito"</string>
     <string name="title_font_size" msgid="570613010306330622">"Tamanho do tipo de letra"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Aumentar ou diminuir o texto"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Bloqueio do cartão SIM"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Outros utilizadores"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Armazenamento do dispositivo"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Armazenamento portátil"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmes e lembretes"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Permitir definir alarmes e lembretes"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmes e lembretes"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Permita que esta app agende alarmes e outros eventos com base no tempo. Isto vai permitir que a app seja ativada e executada mesmo quando não estiver a utilizar o dispositivo. Tenha em atenção que revogar esta autorização pode provocar um mau funcionamento da app, especialmente em relação a quaisquer alarmes que a app tenha agendado, os quais deixarão de funcionar."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"agendar, alarme, lembrete, evento"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> utilizados de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Utilizado(s) de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Serviços de localização"</string>
     <string name="location_title" msgid="5819154746934945021">"A minha localização"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Local. para perfil de trabalho"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Acesso das apps à localização"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"A localização está desativada"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplicações têm acesso à localização</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> aplicações tem acesso à localização</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Acesso à localização recente"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Ver detalhes"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Nenhuma aplicação solicitou a localização recentemente"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nenhuma aplicação acedeu recentemente à localização"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Utilização de bateria elevada"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Utilização de bateria baixa"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Procura de Wi‑Fi e Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Procura de Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permita que as aplicações e os serviços procurem redes Wi‑Fi em qualquer altura, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Procurar por Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"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_services_screen_title" msgid="9204334551361202877">"Serviços de localização"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serviços de localização para o trabalho"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Deteção do fuso horário da localização"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Deteção do fuso horário da localização"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permite a utilização da localização do dispositivo para detetar o fuso horário atual. Outras definições de localização, como a procura de Wi-Fi, podem afetar a precisão da deteção do fuso horário."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Ativada."</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desativada."</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"A deteção automática do fuso horário está desativada."</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"O fuso horário automático está desativado"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"A deteção do fuso horário da localização está desativada."</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"A deteção do fuso horário da localização não é suportada."</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Não são permitidas alterações à deteção do fuso horário da localização."</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Ativar"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Limpar armazenamento"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Desinstalar actualizações"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Optou por iniciar esta aplicação por predefinição para algumas ações."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Algumas atividades que selecionou são abertas nesta app por predefinição."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Optou por permitir que esta aplicação crie widgets e aceda aos seus dados."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Nenhuma predefinição estabelecida."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Limpar predefinições"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Limpar preferências predefinidas"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Esta aplicação poderá não ser concebida para o seu ecrã. Poderá controlar aqui o modo como se adapta ao ecrã."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Perguntar quando é iniciado"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Dimensionar aplicação"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Pode personalizar este dispositivo de acordo com as suas necessidades. Pode alterar estas funcionalidades de acessibilidade mais tarde em Definições."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Alterar o tamanho do tipo de letra"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Leitores de ecrã"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Áudio e texto no ecrã"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Legendas"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Áudio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Geral"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Visualização"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texto e visualização"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Escureça o ecrã"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermelho-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermelho-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduzir o brilho"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Reduzir o brilho"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Torne o ecrã mais escuro do que o brilho mínimo do seu telemóvel."</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Torne o ecrã mais escuro do que o brilho mínimo do seu tablet."</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Escureça o ecrã para tornar a leitura mais confortável.&lt;br/&gt;&lt;br/&gt; Isto pode ser útil quando: &lt;ol&gt; &lt;li&gt; O brilho mínimo predefinido do telemóvel ainda é demasiado intenso.&lt;/li&gt; &lt;li&gt; Está a utilizar o telemóvel em ambientes escuros, como à noite ou num quarto escuro antes de dormir.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3177,7 +3198,7 @@
     <string name="preferred_network_type_title" msgid="812509938714590857">"Tipo de rede preferido"</string>
     <string name="preferred_network_type_summary" msgid="8786291927331323061">"LTE (recomendado)"</string>
     <string name="mms_message_title" msgid="6624505196063391964">"Mensagens MMS"</string>
-    <string name="mms_message_summary" msgid="2855847140141698341">"Envie e receba quando os dados móveis estão desativados"</string>
+    <string name="mms_message_summary" msgid="2855847140141698341">"Enviar e receber quando os dados móveis estão desativados"</string>
     <string name="data_during_calls_title" msgid="3940276893360429144">"Dados durante chamadas"</string>
     <string name="data_during_calls_summary" msgid="2289050189544214759">"Permitir a utilização deste SIM para dados móveis apenas durante as chamadas"</string>
     <string name="work_sim_title" msgid="8999872928646924429">"SIM de trabalho"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"rosto"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"impressão digital, adicionar impressão digital"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"escurecer ecrã, ecrã tátil, bateria, brilho inteligente, brilho dinâmico, brilho automático"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"escurecer ecrã, suspensão, bateria, limite de tempo, atenção, visualização, ecrã, inatividade"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"rodar, inverter, rotação, retrato, paisagem, orientação, vertical, horizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"atualizar, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"não incomodar, agendar, notificações, bloquear, silêncio, vibrar, suspensão, trabalho, focar, som, desativar, dia, dia de semana, fim de semana, noite de semana, evento"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ecrã, tempo de bloqueio, limite de tempo, ecrã de bloqueio"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Toques"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Outros sons e vibrações"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificações"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversa"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Enviadas recentemente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ver todas dos últimos 7 dias"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avançadas"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Geral"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificações de trabalho"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificações adaptáveis"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioridade das notificações adaptável"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Apresentar no painel pendente, na barra de estado e no ecrã de bloqueio"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ocultar as notificações silenciosas na barra de estado"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Emitir luz intermitente"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notificações no ecrã de bloqueio"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacidade"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Ignorar ecrã de bloqueio"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Após Desbloqueio facial, aceda ao último ecrã utilizado"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ecrã de bloqueio, ignorar"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notificação por semana</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nunca"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Acesso a notificações"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Notificações do dispositivo e de apps"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Controle que notificações são apresentadas nas suas apps e dispositivos"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"As aplicações não podem ler notificações"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Desativar"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Cancelar"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Tipos de notificações permitidos"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Notificações importantes em curso"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Notificações de conversas"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Notificações de alerta"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Notificações silenciosas"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Tempo real"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Comunicação em tempo real de apps em utilização, navegação, chamadas telefónicas e muito mais"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Conversas"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS e outras comunicações"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Predefinição"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Notificações que podem tocar ou vibrar consoante as definições"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Silencioso"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Notificações que nunca tocam nem vibram"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Ver todas as apps"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Altere as definições de notificação de cada app que pode enviar notificações"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Apps apresentadas no dispositivo"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Serviços de assistente de RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nenhuma app instalada pediu para ser executada como serviço de assistente de RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Permitir que o serviço de RV tenha acesso a <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Abrir por predefinição"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Links de abertura"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Abrir links compatíveis"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Links suportados abertos nesta app"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Links a serem abertos nesta app"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Abrir sem perguntar"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Links compatíveis"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Outras predefinições"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Outras preferências predefinidas"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Adicionar link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Uma app pode validar os links para serem abertos automaticamente na app. "<annotation id="url">"Saiba mais"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> links validados</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link validado</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Estes links são validados e abertos automaticamente nesta app.</item>
+      <item quantity="one">Este link é validado e aberto automaticamente nesta app.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"A verificar outros links suportados…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Cancelar"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> links suportados</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link suportado</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Adicionar"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Abre na app <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<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="979243131665635278">"armazenamento interno"</string>
     <string name="storage_type_external" msgid="125078274000280821">"armazenamento externo"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"A câmara não é permitida"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"A captura de ecrã não é permitida"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Impossível abrir esta aplicação"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Se tiver dúvidas, contacte o seu gestor de TI."</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Mais detalhes"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"O gestor pode monitorizar e gerir as aplicações e os dados associados ao seu perfil de trabalho, incluindo as definições, as autorizações, o acesso empresarial, a atividade da rede e as informações de localização do dispositivo."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"O gestor pode monitorizar e gerir as aplicações e os dados associados a este utilizador, incluindo as definições, as autorizações, o acesso empresarial, a atividade da rede e as informações de localização do dispositivo."</string>
@@ -4327,7 +4374,7 @@
     <string name="ota_disable_automatic_update_summary" msgid="7803279951533276841">"Aplique as atualizações quando o dispositivo for reiniciado."</string>
     <string name="usage" msgid="287782903846013936">"Utilização"</string>
     <string name="cellular_data_usage" msgid="5874156338825285334">"Utilização de dados móveis"</string>
-    <string name="app_cellular_data_usage" msgid="7603292978956033926">"Utilização de dados da aplicação"</string>
+    <string name="app_cellular_data_usage" msgid="7603292978956033926">"Utilização de dados da app"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Uso de dados Wi-Fi"</string>
     <string name="non_carrier_data_usage" msgid="6494603202578414755">"Utilização de dados sem operador móvel"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Utilização de dados de Ethernet"</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 restrição</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"A contagem de dados do operador pode ser diferente da contagem do dispositivo"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Exclui os dados utilizados por redes de operadores."</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Exclui dados utilizados por redes de operadores."</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> utilizado(s)"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Definir aviso de dados"</string>
     <string name="data_warning" msgid="2925054658166062884">"Aviso de dados"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(desinstalar para o utilizador <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(desativado para o utilizador <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Preenchimento automático"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automático, preenchimento, preenchimento automático"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Palavras-passe"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automático, preenchimento, preenchimento automático, palavra-passe"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Certifique-se de que confia nesta aplicação&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=O Preenchimento automático do Google&gt;%1$s&lt;/xliff:g&gt; utiliza o que está no ecrã para determinar o que pode ser preenchido automaticamente."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Preenchimento automático"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Nível de registo"</string>
@@ -4882,7 +4930,7 @@
     <string name="mobile_network_use_sim_off" msgid="6303281166199670639">"Desativado"</string>
     <string name="mobile_network_disable_sim_explanation" msgid="2851862257846773796">"Para desativar este SIM, remova o cartão SIM"</string>
     <string name="mobile_network_tap_to_activate" msgid="4139979375717958102">"Toque para ativar o operador <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
-    <string name="mobile_network_esim_swap_confirm_title" msgid="2762744961192218789">"Pretende mudar para <xliff:g id="CARRIER">%1$s</xliff:g>?"</string>
+    <string name="mobile_network_esim_swap_confirm_title" msgid="2762744961192218789">"Mudar para <xliff:g id="CARRIER">%1$s</xliff:g>?"</string>
     <string name="mobile_network_esim_swap_confirm_body" msgid="8168680839542031781">"Só pode ter um SIM transferido ativo de cada vez.\n\nMudar para o operador <xliff:g id="CARRIER1">%1$s</xliff:g> não cancela o seu serviço no operador <xliff:g id="CARRIER2">%2$s</xliff:g>."</string>
     <string name="mobile_network_esim_swap_confirm_ok" msgid="8695772737522378095">"Mudar para <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="mobile_network_erase_sim" msgid="4629071168032714930">"Apagar SIM"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Alterar o modo de funcionamento em rede"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipo de rede preferido"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operador"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versão das definições"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versão das definições do operador"</string>
     <string name="call_category" msgid="641461844504128789">"Chamadas"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videochamadas do operador"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Selecionar sistema"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remova o SIM e insira-o novamente. Se o problema continuar, reinicie o dispositivo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Experimente ativar o SIM novamente. Se o problema continuar, reinicie o dispositivo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ativação da rede"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Mudança de operador"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"O operador <xliff:g id="CARRIER_NAME">%1$s</xliff:g> está ativo"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toque para atualizar as definições do SIM."</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Alterado para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desligado"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Mostrar redes do modo de avião"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Procure e ligue-se a redes no modo de avião."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Encontre e estabeleça ligação a redes Wi-Fi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avião, seguro para aviões"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Chamadas Wi-Fi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"indisponíveis"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporariamente indisponível"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"sem cartão SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferências"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferências de rede"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Ligar a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ligação de rede, internet, sem fios, dados, wifi, wi-fi, wi fi, telemóvel, dispositivo móvel, operador de telemóvel, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ver redes do modo de avião"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"A ver as redes disponíveis no modo de avião…"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Ative as redes"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Desative as redes"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Pretende repor a Internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Esta ação termina a chamada telefónica."</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Esta ação termina a chamada telefónica."</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"A repor a Internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Corrigir a conetividade"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Redes do modo de avião disponíveis."</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para mudar de rede, desligue a Ethernet."</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Não pode mudar de rede enquanto tiver ligação estabelecida."</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes do modo de avião"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ligado"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"A Internet não estabelece ligação automaticamente"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Cor"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Outros"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Geral"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Ver todas as apps"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Encaminhamento inteligente"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Encaminhamento inteligente ativado"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Introduza o número de telefone"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"O número de telefone está em falta."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Permitir 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Utilize ligações de rede móvel 2G. Para chamadas de emergência, o 2G está sempre ativado."</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d220ed2..e37c00c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Aumentar ou diminuir o texto na tela"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Tornar menor"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Tornar maior"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Usar o giro automático"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Texto de amostra"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"O Mágico de Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Desbloqueio com digital"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Configurar impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Usar a impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Basta tocar no sensor de impressão digital para desbloquear seu smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões que adicionar. Até mesmo uma única digital adicionada pode realizar todas essas ações."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Sua impressão digital pode ser menos segura que um padrão ou PIN forte."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Você no controle"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Lembre-se"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Os dados gravados pelo Fingerprint são armazenados em segurança e nunca saem do smartphone. Você pode excluí-los a qualquer momento nas configurações."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Sua impressão digital pode ser menos segura que um padrão ou PIN forte."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Às vezes, o smartphone usará as imagens recentes da sua impressão digital para criar modelos melhores dela."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Use sua impressão digital para desbloquear o smartphone ou aprovar compras.\n\nNota: não é possível usar sua impressão digital para desbloquear este dispositivo. Para mais informações, entre em contato com o administrador da organização."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Use sua impressão digital para desbloquear o smartphone ou aprovar compras.\n\nObservação: usar um padrão ou um PIN forte pode ser mais seguro que sua impressão digital."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Agora não"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Pular"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Concordo"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Pular"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Próxima"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Pular impressão digital?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Pular"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Toque no sensor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Toque no ícone de impressão digital e mantenha-o pressionado"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Ele fica na parte traseira do seu smartphone. Use o dedo indicador."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Está na tela. Procure a impressão digital com um círculo brilhante."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"O sensor de impressão digital está na sua tela. Mova o dedo pela tela para encontrá-lo."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustração mostrando a localização do sensor de impressão digital no dispositivo"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nome"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Ok"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Excluir"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Toque no sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Encoste o dedo no sensor e, após sentir uma vibração, tire o dedo"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Tire o dedo e toque novamente"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Repita o processo de tocar e levantar o dedo para registrar todas as partes da sua impressão digital"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Impressão digital adicionada"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Sempre que este ícone for exibido, use sua impressão digital para se identificar ou aprovar compras"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Mais tarde"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Pesquisar"</string>
     <string name="display_settings" msgid="7197750639709493852">"Tela"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Giro automático da tela"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Desativado"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Ativado"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Ativ. - Reconhecimento facial"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Ativar a detecção facial"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Cores"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturais"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Realçadas"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ativado / A tela não será desativada se você estiver olhando para ela"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Desativada"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Acesso à câmera necessário"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Toque para gerenciar as permissões dos serviços de personalização do dispositivo"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Evita que a tela seja desativada se você estiver olhando para ela"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Usando a câmera frontal, o \"Reconhecimento de tela em uso\" detecta se alguém está olhando para a tela. Ele funciona no dispositivo, e as imagens nunca são armazenadas nem enviadas ao Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Ativar o \"reconhecimento de tela em uso\""</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Quando a tela está escura, ela é ativada quando chegam notificações"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Sempre mostrar hora e informações"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Maior uso da bateria"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Negrito"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Negrito"</string>
     <string name="title_font_size" msgid="570613010306330622">"Tamanho da fonte"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Tornar o texto maior ou menor"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Bloqueio do chip"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Outros usuários"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Armazenamento do dispositivo"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Armazenamento portátil"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmes e lembretes"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Permitir a definição de alarmes e lembretes"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmes e lembretes"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Permitir que este app programe alarmes ou outros eventos de tempo. Com isso, ele poderá funcionar mesmo quando você não estiver usando o dispositivo. Se essa permissão for revogada, o app poderá apresentar falhas, especificamente nos alarmes programados por ele, que deixarão de funcionar."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"programação, alarme, lembrete, evento"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> usados de um total de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Usado(s) de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Serviços de localização"</string>
     <string name="location_title" msgid="5819154746934945021">"Meu Local"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Local do perfil de trabalho"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Acesso do app ao local"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Localização desativada"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps tem acesso à localização</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> de <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps têm acesso à localização</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Acesso recente ao local"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Ver detalhes"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Nenhum app solicitou a localização recentemente"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nenhum app acessou o local recentemente"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Uso da bateria elevado"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Uso da bateria reduzido"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Busca por Wi‑Fi e Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Busca por Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permite que apps e serviços procurem redes Wi‑Fi a qualquer momento, mesmo quando o Wi‑Fi está desativado. Essa configuração pode ser usada, por exemplo, para melhorar recursos e serviços baseados na localização."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Busca por Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que apps e serviços procurem dispositivos próximos a qualquer momento, mesmo quando o Bluetooth está desativado. Essa configuração pode ser usada, por exemplo, para melhorar recursos e serviços baseados na localização."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Serviços de localização"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serviços de localização para o trabalho"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detecção do fuso horário do local"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detecção do fuso horário do local"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permite que o local do dispositivo seja usado para detectar o fuso horário atual. Outras configurações de localização, como busca por Wi-Fi, podem afetar a precisão da detecção de fuso horário."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Ativada"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desativada"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"A detecção automática de fuso horário está desativada"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"O fuso horário automático está desativado"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"A detecção de fuso horário do local está desativada"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"A detecção de fuso horário do local está indisponível"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Não são permitidas mudanças na detecção de fuso horário do local"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Ativar"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Limpar armazenamento"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Desinstalar atualizações"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Você decidiu lançar este app por padrão para algumas ações."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Algumas atividades selecionadas por você são abertas neste app por padrão."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Você optou por permitir que este app crie widgets e acesse os dados."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Nenhum padrão definido."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Limpar padrão"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Limpar preferências padrão"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Talvez este app não seja desenvolvido para sua tela. É possível controlar o ajuste da tela aqui."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Perguntar ao iniciar"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Dimensionar app"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Configurar\"."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Alterar tamanho da fonte"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Leitores de tela"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Áudio e texto na tela"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Legendas"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Áudio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Geral"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Tela"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Texto e exibição"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Escurecer a tela"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermelho-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermelho-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduzir brilho"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Reduzir brilho"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Use o smartphone com o brilho da tela abaixo do mínimo"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Use o tablet com o brilho da tela abaixo do mínimo"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Diminua o brilho da tela para deixar a leitura mais confortável.&lt;br/&gt;&lt;br/&gt; Esse recurso pode ser útil quando: &lt;ol&gt; &lt;li&gt; o brilho mínimo padrão do smartphone ainda é claro demais;&lt;/li&gt; &lt;li&gt; você está usando o smartphone em ambientes com pouca iluminação, como à noite ou em um quarto escuro antes de dormir.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"rosto"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"impressão digital, adicionar impressão digital"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"escurecer tela, touchscreen, bateria, brilho inteligente, brilho dinâmico, brilho automático"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"escurecer tela, suspensão, bateria, tempo limite, atenção, display, tela, inatividade"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"girar, virar, rotação, retrato, paisagem, orientação, vertical, horizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"não perturbe, programação, notificações, bloquear, silenciar, vibrar, suspender, trabalho, focar, som, desativar som, dia, dia da semana, final de semana, durante a semana à noite, evento"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"tela, tempo até o bloqueio, tempo limite, tela de bloqueio"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Toques"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Outros sons e vibrações"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificações"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversa"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Enviadas recentemente"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Ver todas enviadas nos últimos 7 dias"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avançado"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Geral"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificações de trabalho"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificações adaptáveis"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioridade de notificação adaptável"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Exibir na aba suspensa, barra de status e tela de bloqueio"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ocultar notificações silenciosas na barra de status"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Piscar a luz"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notificações na tela de bloqueio"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacidade"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Pular tela de bloqueio"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Depois do desbloqueio facial, ir para a última tela usada"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Bloquear tela, tela de bloqueio, pular, ignorar"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="other">Cerca de <xliff:g id="NUMBER_1">%d</xliff:g> notificações por semana</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nunca"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Acesso a notificações"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Notificações do app e do dispositivo"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Controle quais notificações são exibidas nos seus apps e dispositivos"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"O acesso às notificações do perfil de trabalho está bloqueado"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Os apps não podem ler notificações"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Desativar"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Cancelar"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Tipos de notificação permitidos"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Notificações contínuas importantes"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Notificações de conversas"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Notificações com alerta"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Notificações silenciosas"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Em tempo real"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Comunicação em tempo real de apps em uso, navegação, chamadas telefônicas e muito mais"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Conversas"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS e outras comunicações"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Padrão"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"As notificações podem fazer o dispositivo tocar ou vibrar de acordo com as configurações"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Silenciosa"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Notificações que nunca fazem o dispositivo tocar ou vibrar"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Ver todos os apps"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Mude as configurações de notificação para cada app que pode enviar notificações"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Apps exibidos no dispositivo"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Serviços de ajuda para RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nenhum app instalado solicitou ser executado como serviços de ajuda para RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Permitir acesso ao serviço de RV para <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Abrir por padrão"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Abrir links"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Abrir links compatíveis"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Links compatíveis são abertos neste app"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Links abertos neste app"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Abrir sem perguntar"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Links compatíveis"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Outros padrões"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Outras preferências padrão"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Adicionar link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Um app pode verificar links para abri-los automaticamente. "<annotation id="url">"Saiba mais"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> link verificado</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> links verificados</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">O link foi verificado e será aberto automaticamente neste app.</item>
+      <item quantity="other">Os links foram verificados e serão abertos automaticamente neste app.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Procurando outros links compatíveis…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Cancelar"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> link compatível</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> links compatíveis</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Adicionar"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"É aberto no app <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> usados em <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"armazenamento interno"</string>
     <string name="storage_type_external" msgid="125078274000280821">"armazenamento externo"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Câmera não permitida"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Captura de tela não permitida"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Não é possível abrir este app"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Se você tiver perguntas, entre em contato com o administrador de TI"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Mais detalhes"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Seu administrador pode monitorar e gerenciar apps e dados associados ao seu perfil de trabalho, incluindo configurações, permissões, acesso corporativo, atividade de rede e informações de local do dispositivo."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Seu administrador pode monitorar e gerenciar apps e dados associados a este usuário, incluindo configurações, permissões, acesso corporativo, atividade de rede e informações de local do dispositivo."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrições</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"O cálculo de dados da operadora pode ser diferente daquele realizado pelo seu dispostivo"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excluir dados usados por redes de operadoras"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Exclui dados usados por redes de operadoras"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s)"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Definir alerta de uso de dados"</string>
     <string name="data_warning" msgid="2925054658166062884">"Alerta de uso de dados"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(desinstalado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(desativado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Preenchimento automático"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automático, preenchimento, preenchimento automático"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Senhas"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"preencher, automático, preenchimento automático, senha"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Você precisa confiar nesse app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=O Preenchimento automático do Google&gt;%1$s&lt;/xliff:g&gt; usa o que está na sua tela para determinar o que pode ser preenchido automaticamente."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Preenchimento automático"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Nível de registro"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Alterar o modo de operação de rede"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipo de rede preferencial"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operadora"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versão das configurações"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versão das configurações da operadora"</string>
     <string name="call_category" msgid="641461844504128789">"Chamadas"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videochamadas pela operadora"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Seleção de sistema"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remova o chip e insira-o novamente. Se o problema continuar, reinicie o dispositivo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Tente ativar o chip novamente. Se o problema continuar, reinicie o dispositivo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ativação de rede"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Mudança de operadora"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"A operadora <xliff:g id="CARRIER_NAME">%1$s</xliff:g> está ativa"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toque para atualizar as configurações do chip"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Mudou para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desativar"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Chips"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Mostrar redes de modo avião"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Encontrar e se conectar a redes em modo avião."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Encontrar redes Wi-Fi e se conectar a elas"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avião, segura para aviões"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Chamada no Wi-Fi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"indisponível"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporariamente indisponível"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Sem chip"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferências"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferências de rede"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectar-se a redes públicas"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexão de rede, internet, sem fio, dados, wifi, wi-fi, wi fi, celular, rede móvel, operadora de celular, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Ver redes do modo avião"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Exibindo redes do modo avião"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Ativar redes"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Desativar redes"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Redefinir sua Internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Isso encerrará a chamada telefônica"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Isso encerrará a chamada telefônica"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Redefinindo sua Internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Corrigir conectividade"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Redes do modo avião disponíveis"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para mudar de rede, desconecte o cabo Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Não é possível mudar de rede enquanto estiver conectado"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Redes para o modo avião"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectado"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"A Internet não será automaticamente conectada"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Cor"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Outros"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Geral"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Ver todos os apps"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Encaminhamento inteligente"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Encaminhamento inteligente ativado"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Inserir número de telefone"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"O número de telefone não foi informado."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Permitir 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Usar conexões celulares 2G. Para chamadas de emergência, o 2G está sempre ativado."</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index d49fc34..e7420c3 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -53,9 +53,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Măriți sau micșorați textul de pe ecran."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Micșorați"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Măriți"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Folosiți Rotirea automată"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Exemplu de text"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Minunatul Vrăjitor din Oz"</string>
@@ -409,15 +408,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> amprentă configurată</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Deblocați cu amprenta"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Configurați amprenta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Folosiți amprenta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Puteți să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații atingând senzorul de amprentă. Aveți grijă ce amprente adăugați. Aceste acțiuni sunt posibile folosind chiar și o singură amprentă adăugată."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN complex."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Dvs. dețineți controlul"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Rețineți"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Datele înregistrate privind amprentele sunt stocate în siguranță și nu părăsesc niciodată telefonul dvs. Puteți să ștergeți aceste date oricând din Setări."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN complex."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Telefonul va folosi ocazional imaginile recente ale amprentelor pentru a crea modele de amprentă îmbunătățite."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Folosiți amprenta ca să deblocați telefonul sau să aprobați achizițiile.\n\nNotă: nu vă puteți folosi amprenta ca să deblocați acest dispozitiv. Pentru informații suplimentare, contactați administratorul organizației."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Folosiți amprenta ca să deblocați telefonul sau să aprobați achizițiile.\n\nNotă: este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN complex."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Anulați"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nu, mulțumesc"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Omiteți"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuați"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Accept"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Omiteți"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Înainte"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Omiteți amprenta?"</string>
@@ -434,16 +439,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Omiteți"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Anulați"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Atingeți senzorul"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Atingeți lung pictograma amprentă"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Se află pe partea din spate a telefonului. Folosiți degetul arătător."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Acesta se află pe ecran. Căutați amprenta cu cerc care iluminează."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Senzorul de amprentă este integrat în ecran. Mișcați degetul pe ecran pentru a-l găsi."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Imagine cu dispozitivul și poziția senzorului de amprentă"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Denumiți"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Ștergeți"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Atingeți senzorul"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Puneți degetul pe senzor și ridicați-l după ce simțiți o vibrație"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Ridicați, apoi atingeți din nou"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Ridicați degetul și atingeți din nou pentru a adăuga toate părțile amprentei"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Amprentă adăugată"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Când vedeți această pictogramă, folosiți amprenta pentru identificare sau pentru a aproba achiziții"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Mai târziu"</string>
@@ -1196,14 +1210,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Căutați"</string>
     <string name="display_settings" msgid="7197750639709493852">"Afișaj"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Rotire automată a ecranului"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Dezactivată"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Activată"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Activată – În funcție de chip"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Activați Detectarea facială"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Culori"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Natural"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Intensificat"</string>
@@ -1248,7 +1258,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activat/Ecranul nu se va închide dacă vă uitați la el"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Dezactivat"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Este necesar accesul la camera foto"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Atingeți pentru a gestiona permisiunile pentru Serviciile de personalizare a dispozitivului"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Nu lasă ecranul să se închidă dacă vă uitați la el"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"„Atenție la ecran” folosește camera frontală pentru a vedea dacă se uită cineva la ecran. Funcționează pe dispozitiv, iar imaginile nu sunt niciodată stocate sau trimise la Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Activați „Atenție la ecran”"</string>
@@ -1329,7 +1342,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Când ecranul este întunecat, el se activează pentru notificări noi"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Afișează mereu ora și informațiile"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Utilizare ridicată a bateriei"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Text cu caractere aldine"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Text cu caractere aldine"</string>
     <string name="title_font_size" msgid="570613010306330622">"Dimensiunea fontului"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Măriți sau micșorați textul"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Setări de blocare a cardului SIM"</string>
@@ -1499,6 +1512,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Alți utilizatori"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Stocare dispozitiv"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Spațiu de stocare portabil"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarme și mementouri"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Permiteți setarea de alarme și mementouri"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarme și mementouri"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Permiteți acestei aplicații să programeze alarme sau alte evenimente legate de timp. Astfel, aplicația va putea să se activeze și să ruleze chiar dacă nu folosiți dispozitivul. Rețineți că revocarea acestei permisiuni poate cauza funcționarea incorectă a aplicației, mai ales dezactivarea alarmelor programate de aplicație."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"programare, alarmă, memento, eveniment"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Folosit: <xliff:g id="USED">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Folosiți din <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1748,31 +1766,32 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Servicii de localizare"</string>
     <string name="location_title" msgid="5819154746934945021">"Locația mea"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Locație pt. profil de serviciu"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Accesul aplicației la locație"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Locația este dezactivată"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="few"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> din <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplicații au acces la locație</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> din <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> de aplicații au acces la locație</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> din <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> aplicații are acces la locație</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Acces la locație recent"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Vedeți detaliile"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Nicio aplicație nu a solicitat locația recent"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nicio aplicație nu a accesat recent locația"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Utilizare intensă a bateriei"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Utilizare redusă a bateriei"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Căutare Wi‑Fi și Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Căutare de rețele Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Permiteți aplicațiilor și serviciilor să caute permanent rețele Wi-Fi, chiar și atunci când setarea Wi-Fi este dezactivată. Această permisiune poate fi folosită, de exemplu, pentru a îmbunătăți funcțiile și serviciile bazate pe locație."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Căutare Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permiteți aplicațiilor și serviciilor să caute permanent dispozitive din apropiere, chiar și atunci când setarea Bluetooth este dezactivată. Această permisiune poate fi folosită, de exemplu, pentru a îmbunătăți funcțiile și serviciile bazate pe locație."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Servicii de localizare"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servicii de localizare pentru serviciu"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detectarea fusului orar al locației"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detectarea fusului orar al locației"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permite folosirea locației dispozitivului pentru a detecta fusul orar actual. Alte setări privind locația, cum ar fi căutarea de rețele Wi-Fi, pot afecta precizia detectării fusului orar."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Activată"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Dezactivată"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Detectarea automată a fusului orar este dezactivată"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Fusul orar automat este dezactivat"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Detectarea fusului orar al locației este dezactivată"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Detectarea fusului orar al locației nu este acceptată"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Modificările detectării fusului orar al locației nu sunt permise"</string>
@@ -1953,10 +1972,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Activați"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Ștergeți datele stocate"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Dezinstalați actualizările"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Ați ales să lansați această aplicație în mod prestabilit pentru anumite acțiuni."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Unele activități pe care le-ați selectat se deschid în această aplicație în mod prestabilit."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Ați ales să permiteți acestei aplicații să creeze widgeturi și să acceseze datele acestora."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Nu este setată nicio valoare standard."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Ștergeți valorile standard"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Ștergeți preferințele prestabilite"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Este posibil ca această aplicație să nu fie proiectată pentru ecranul dvs. Aici puteți stabili modul în care aceasta se adaptează ecranului dvs."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Se stabilește la lansare"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Scalați aplicația"</string>
@@ -2168,7 +2187,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Puteți personaliza acest dispozitiv conform dorințelor dvs. Aceste funcții de accesibilitate pot fi modificate ulterior în Setări."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Modificați dimensiunea fontului"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Cititoare de ecran"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio și text pe ecran"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Subtitrări"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"General"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Afișaj"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text și afișaj"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Reduceți luminozitatea ecranului"</string>
@@ -2322,7 +2343,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Roșu-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Roșu-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Albastru-galben"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Reduceți luminozitatea"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Reduceți luminozitatea"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Întunecați ecranul sub setarea minimă pentru luminozitate a telefonului"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Întunecați ecranul sub setarea minimă pentru luminozitate a tabletei"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Întunecați ecranul pentru a citi mai confortabil.&lt;br/&gt;&lt;br/&gt; Această opțiune poate fi utilă atunci când: &lt;ol&gt; &lt;li&gt; luminozitatea minimă prestabilită a telefonului este prea mare;&lt;/li&gt; &lt;li&gt; folosiți telefonul în condiții de luminozitate scăzută, de exemplu, noaptea sau într-o cameră întunecată înainte de culcare.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3378,8 +3399,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"chip"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"amprentă, adăugați amprenta"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"reduceți luminozitatea ecranului, ecran tactil, baterie, luminozitate inteligentă, luminozitate dinamică, luminozitate automată"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"reduceți luminozitatea ecranului, inactivitate, baterie, dezactivarea ecranului, atenție, afișaj, ecran, lipsă de activitate"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"rotiți, comutați, rotire, portret, peisaj, orientare, vertical, orizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"Nu deranja, program, notificări, blocați, dezactivați sonorul, vibrații, inactivitate, serviciu, concentrare, sunet, sunet dezactivat, zi, zi din săptămână, weekend, seară din săptămână, eveniment"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ecran, durată până la dezactivarea ecranului, timp limită, ecran de blocare"</string>
@@ -3548,9 +3571,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Tonuri de sonerie"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Alte sunete și vibrații"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Notificări"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Conversație"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Trimise recent"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Afișați-le pe toate din ultimele 7 zile"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avansate"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"General"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificări profil de serviciu"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificări adaptive"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioritatea notificării adaptabile"</string>
@@ -3612,7 +3636,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Afișați în fereastra trasă în jos, bara de stare și ecranul de blocare"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ascundeți notificările silențioase din bara de stare"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Lumină intermitentă"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notificări pe ecranul de blocare"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Confidențialitate"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Omiterea ecranului de blocare"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"După deblocarea facială, accesați direct ultimul ecran folosit"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ecran de blocare, Ecran de blocare, Omitere, Evitare"</string>
@@ -3704,7 +3728,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> notificare pe săptămână</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Niciodată"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Acces la notificări"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Notificări pe dispozitive și în aplicații"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Alegeți notificările care apar în aplicațiile și pe dispozitivele dvs."</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Accesul la notificările privind profilul de serviciu este blocat"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Aplicațiile nu pot citi notificările"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3724,17 +3749,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Dezactivați"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Anulați"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Tipuri de notificări permise"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Notificări importante permanente"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Notificări pentru conversații"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Notificări de alertare"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Notificări silențioase"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"În timp real"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Comunicări în timp real din aplicațiile folosite, aplicații de navigare, apeluri telefonice și altele"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Conversații"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS-uri și alte comunicări"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Standard"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Notificări care pot să sune sau să vibreze, în funcție de setări"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Silențioase"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Notificări care nu sună și nu vibrează"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Vedeți toate aplicațiile"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Modificați setările pentru notificări ale fiecărei aplicații care poate trimite notificări"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Aplicații care apar pe dispozitiv"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Servicii de ajutor pentru RV"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nicio aplicație instalată nu a solicitat să fie rulată ca un serviciu de ajutor pentru RV."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Permiteți accesul la serviciul RV pentru <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4028,9 +4053,33 @@
     <string name="launch_by_default" msgid="892824422067985734">"Deschide în mod prestabilit"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Deschiderea linkurilor"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Deschide linkurile acceptate"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Linkurile acceptate se deschid în această aplicație"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Linkuri de deschis în această aplicație"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Deschide fără a cere permisiunea"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Linkuri acceptate"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Alte valori prestabilite"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Alte preferințe prestabilite"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Adăugați un link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"O aplicație poate verifica linkurile pentru a putea fi deschise automat în aplicația respectivă. "<annotation id="url">"Aflați mai multe"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> linkuri verificate</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> de linkuri verificate</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link verificat</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="few">Linkurile sunt verificate și se deschid automat în această aplicație.</item>
+      <item quantity="other">Linkurile sunt verificate și se deschid automat în această aplicație.</item>
+      <item quantity="one">Linkul este verificat și se deschide automat în această aplicație.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Se caută alte linkuri acceptate…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Anulați"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> linkuri acceptate</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> de linkuri acceptate</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> link acceptat</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Adăugați"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Se deschide în <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> utilizați din <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"memorie internă"</string>
     <string name="storage_type_external" msgid="125078274000280821">"stocare externă"</string>
@@ -4335,7 +4384,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Camera foto nu are permisiune"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Captura de ecran nu are permisiune"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Nu se poate deschide aplicația"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Dacă aveți întrebări, contactați administratorul IT"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Mai multe detalii"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Administratorul poate să monitorizeze și să gestioneze aplicațiile și datele asociate profilului de serviciu, inclusiv setările, permisiunile, accesul la nivelul companiei, activitatea în rețea și informațiile despre locația dispozitivului."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Administratorul poate să monitorizeze și să gestioneze aplicațiile și datele asociate acestui utilizator, inclusiv setările, permisiunile, accesul la nivelul companiei, activitatea în rețea și informațiile despre locația dispozitivului."</string>
@@ -4415,7 +4465,7 @@
       <item quantity="one">1 restricție</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Cuantificarea datelor de către operator poate fi diferită de cea de pe dispozitiv"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Sunt excluse datele folosite în rețele de operator"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Sunt excluse datele folosite în rețele de operator"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Date utilizate: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Setați avertisment pentru date"</string>
     <string name="data_warning" msgid="2925054658166062884">"Avertisment pentru date"</string>
@@ -4765,7 +4815,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(dezinstalat pentru <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(dezactivat pentru <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Serviciu de completare automată"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automată, completare, completare automată"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Parole"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automată, completare, completare automată, parolă"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Asigurați-vă că aveți încredere în această aplicație&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Completarea automată Google&gt;%1$s&lt;/xliff:g&gt; folosește conținutul de pe ecran pentru a stabili ce se poate completa automat."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Completare automată"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Nivel de înregistrare"</string>
@@ -4953,8 +5004,8 @@
     <string name="mobile_network_list_add_more" msgid="4478586073355236604">"Adăugați mai multe"</string>
     <string name="mobile_network_active_sim" msgid="6397581267971410039">"Activ/SIM"</string>
     <string name="mobile_network_inactive_sim" msgid="5829757490580409899">"Inactiv/SIM"</string>
-    <string name="mobile_network_active_esim" msgid="4673190244386572318">"Activ/SIM-ul descărcat"</string>
-    <string name="mobile_network_inactive_esim" msgid="2901035056727849007">"Inactiv/SIM descărcat"</string>
+    <string name="mobile_network_active_esim" msgid="4673190244386572318">"Activ / SIM descărcat"</string>
+    <string name="mobile_network_inactive_esim" msgid="2901035056727849007">"Inactiv / SIM descărcat"</string>
     <string name="mobile_network_sim_name" msgid="3187192894150386537">"Numele și culoarea cardului SIM"</string>
     <string name="mobile_network_sim_name_label" msgid="1452440641628369625">"Nume"</string>
     <string name="mobile_network_sim_color_label" msgid="5293944087609632340">"Culoare (folosită de aplicațiile compatibile)"</string>
@@ -4973,7 +5024,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Schimbați modul de operare a rețelei"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tipul de rețea preferat"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operator"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versiunea setărilor"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versiunea setărilor pentru operator"</string>
     <string name="call_category" msgid="641461844504128789">"Se apelează"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Apelare video prin operator"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Selectați sistemul"</string>
@@ -5022,6 +5073,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Scoateți SIM-ul și introduceți-l din nou. Dacă problema persistă, reporniți dispozitivul."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Încercați din nou să activați SIM-ul. Dacă problema persistă, reporniți dispozitivul."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activarea rețelei"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Schimbarea operatorului"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> este activ"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Atingeți pentru a actualiza setările SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Ați trecut la <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5184,8 +5236,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Dezactivat"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Carduri SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Afișați rețelele sigure pentru avioane"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Găsiți rețelele sigure pentru avioane și conectați-vă la ele."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Găsiți rețele Wi-Fi și conectați-vă"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, sigure pentru avion"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Apeluri și SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Apelare prin Wi‑Fi"</string>
@@ -5199,22 +5250,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"indisponibile"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Temporar indisponibil"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Niciun card SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferințe"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferințe privind rețeaua"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectați-vă la rețele publice"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"conexiune la rețea, internet, wireless, date, wifi, wi-fi, wi fi, celular, mobil, operator servicii mobile, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Vedeți rețelele sigure pentru avioane"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Se afișează rețelele sigure pentru avioane"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Activați rețelele"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Dezactivați rețelele"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Resetați conexiunea la internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Astfel, apelul telefonic se va încheia"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Astfel, apelul telefonic se va încheia"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Se resetează conexiunea la internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Remediați problemele legate de conectivitate"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Sunt disponibile rețele în modul Avion"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Pentru a schimba rețeaua, deconectați ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Nu puteți schimba rețeaua cât timp dispozitivul e conectat"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Rețele acceptate în modul Avion"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Conectat"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Nu se conectează automat la internet"</string>
@@ -5235,6 +5285,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Culoare"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Altele"</string>
     <string name="category_name_general" msgid="7737273712848115886">"General"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Vedeți toate aplicațiile"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Redirecționare intuitivă"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Redirecționarea intuitivă este activată"</string>
@@ -5248,4 +5302,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Introduceți numărul de telefon"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Lipsește numărul de telefon."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Activați conexiunea 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Folosiți conexiuni celulare 2G. Pentru apeluri de urgență, 2G este mereu activat."</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b7d2603..973980e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -54,9 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Сделайте текст на экране мельче или крупнее."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Уменьшить"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Увеличить"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Автоповорот"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Пример текста"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Удивительный волшебник из страны Оз"</string>
@@ -413,15 +412,21 @@
       <item quantity="other">Настроено <xliff:g id="COUNT_1">%1$d</xliff:g> отпечатка</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Сканер отпечатков пальцев"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Добавьте отпечаток пальца"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Сканер отпечатков пальцев"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Когда нужно разблокировать телефон, подтвердить покупку или войти в приложение, просто коснитесь сканера отпечатков пальцев. Обратите внимание, что эти возможности будут доступны всем пользователям, чьи отпечатки вы сохраните на устройстве."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Защита с помощью отпечатка пальца может быть менее надежна, чем графический ключ или PIN-код."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Вы сами управляете данными"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Важно!"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Данные, записанные сканером отпечатков пальцев, защищены и хранятся только на вашем телефоне. Удалить их всегда можно в настройках."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Защита с помощью отпечатка пальца может быть менее надежна, чем графический ключ или PIN-код."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Ваши новые отпечатки пальца будут время от времени использоваться для создания улучшенных моделей."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Разблокируйте телефон и подтверждайте покупки, используя отпечатки пальцев.\n\nВнимание! Для разблокировки этого устройства сканер отпечатков использовать нельзя. За подробной информацией обратитесь к администратору."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Разблокируйте телефон и подтверждайте покупки, используя отпечатки пальцев.\n\nПомните, что защита с помощью отпечатков менее надежна, чем графический ключ или PIN-код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Отмена"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Нет"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Пропустить"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Продолжить"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Принять"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Пропустить"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Далее"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Не настраивать отпечатки?"</string>
@@ -438,16 +443,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Не устанавливать"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Отмена"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Коснитесь сканера отпечатков"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Нажмите на значок отпечатка пальца и удерживайте"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Сканер находится на задней панели устройства. Используйте указательный палец."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Сканер находится на экране. Он выглядит как отпечаток пальца со светящимся кругом."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Сканер отпечатков пальцев расположен на экране. Чтобы его найти, проведите пальцем."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"На этом рисунке показано, где находится сканер"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Название"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ОК"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Удалить"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Коснитесь сканера отпечатков"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Прикладывайте палец к сканеру и удерживайте, пока не почувствуете вибрацию."</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Коснитесь несколько раз"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Немного перемещайте палец, чтобы отсканировать его полностью."</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Отпечаток добавлен"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Этот значок указывает, что вы можете подтверждать покупки и свою личность с помощью отпечатка пальца."</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Не сейчас"</string>
@@ -1216,14 +1230,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Поиск"</string>
     <string name="display_settings" msgid="7197750639709493852">"Экран"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Автоповорот экрана"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Отключить"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Включить"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Включить (на основе распознавания лиц)"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Включить распознавание лиц"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Цвета"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Натуральные"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Яркие"</string>
@@ -1268,7 +1278,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Включено (экран не будет отключаться, если вы смотрите на него)"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Отключено"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Требуется доступ к камере"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Нажмите, чтобы настроить разрешения для сервисов персонализации устройств"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Не отключать экран, пока вы смотрите на него"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Когда адаптивный спящий режим включен, устройство определяет через фронтальную камеру, смотрит ли кто-то на экран. Эта функция работает только на вашем устройстве. Изображения не сохраняются и не отправляются в Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Включить адаптивный спящий режим"</string>
@@ -1349,7 +1362,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Экран включается при появлении новых уведомлений"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Всегда показывать время и информацию"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Батарея разряжается быстрее"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Текст с полужирным шрифтом"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Полужирный шрифт"</string>
     <string name="title_font_size" msgid="570613010306330622">"Размер шрифта"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Увеличение или уменьшение размера шрифта"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Настройки блокировки SIM-карты"</string>
@@ -1520,6 +1533,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Другие пользователи"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Хранилище устройства"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Съемный накопитель"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Будильники и напоминания"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Разрешить устанавливать будильники и напоминания"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Будильники и напоминания"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Разрешить этому приложению устанавливать будильники или другие события на определенное время. Приложение сможет выходить из спящего режима и запускаться, даже когда вы не пользуетесь устройством. Если отменить это разрешение, приложение не сможет работать, и все установленные им будильники будут отключены."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"установить, будильник, напоминание, событие"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Использовано <xliff:g id="USED">%1$s</xliff:g> из <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small></string>
     <string name="storage_volume_used" msgid="5031288167242496837">"использовано из <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1769,7 +1787,8 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Мое местоположение"</string>
     <string name="location_title" msgid="5819154746934945021">"Мое местоположение"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Геоданные для рабочего профиля"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Доступ приложений к геоданным"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Доступ к геоданным отключен"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> Приложения с доступом к данным о местоположении: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> из <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
@@ -1777,24 +1796,24 @@
       <item quantity="many"> Приложения с доступом к данным о местоположении: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> из <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
       <item quantity="other"> Приложения с доступом к данным о местоположении: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> из <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Недавний доступ к геоданным"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Подробнее"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"В последнее время приложения не запрашивали данные о местоположении."</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ни одно приложение ещё не получало доступ к местоположению."</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Высокий расход заряда батареи"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Низкий расход заряда батареи"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Поиск сетей Wi-Fi и устройств Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Поиск сетей Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Разрешить приложениям и сервисам искать сети Wi-Fi, даже когда Wi-Fi отключен. Это может улучшить работу функций и сервисов, использующих данные о местоположении."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Поиск Bluetooth-устройств"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Разрешить приложениям и сервисам искать устройства поблизости, даже когда Bluetooth отключен. Это может улучшить работу функций и сервисов, использующих данные о местоположении."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Геолокация"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Геолокация для работы"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Определение часового пояса с помощью геолокации"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Определение часового пояса с помощью геолокации"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Позволяет использовать местоположение устройства для того, чтобы определять текущий часовой пояс. На точность могут влиять другие настройки геолокации (например, поиск сетей Wi‑Fi)."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Включено"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Отключено"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Автоматическое определение часовых поясов отключено"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Автоматическое определение часового пояса отключено"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Определение часового пояса с помощью геолокации отключено."</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Определение часового пояса с помощью геолокации не поддерживается."</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Вы не можете изменить настройки определения часового пояса с помощью геолокации."</string>
@@ -1977,10 +1996,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Включить"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Очистить хранилище"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Удалить обновления"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Это приложение по умолчанию используется для некоторых действий."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Некоторые выбранные вами действия выполняются в этом приложении по умолчанию."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Это приложение может создавать виджеты и получать их данные."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Значения по умолчанию не установлены."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Удалить настройки по умолчанию"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Удалить настройки по умолчанию"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Возможно, приложение не предназначено для вашего экрана. Здесь можно настроить параметры его отображения."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Спрашивать при запуске"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Масштабировать приложения"</string>
@@ -2192,7 +2211,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Используйте специальные возможности для удобной работы с устройством. Эти параметры можно изменить в настройках."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Изменить размер шрифта"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Программы чтения с экрана"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудио и озвучивание текста"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Субтитры"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аудио"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Общие"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Экран"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Текст и отображение"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Уменьшение яркости экрана"</string>
@@ -2347,7 +2368,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Красный и зеленый"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Красный и зеленый"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Синий и желтый"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Уменьшение яркости"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Уменьшение яркости"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Сделать экран телефона темнее, чем при минимальной яркости"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Сделать экран планшета темнее, чем при минимальной яркости"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Сделайте экран темнее для удобства чтения.&lt;br/&gt;&lt;br/&gt;Это может помочь, если:&lt;ol&gt;&lt;li&gt; при минимальной яркости экран телефона все равно слишком яркий;&lt;/li&gt;&lt;li&gt; вы используете телефон в темноте, например ночью или в темной комнате перед сном.&lt;/li&gt;&lt;/ol&gt;"</string>
@@ -3187,7 +3208,7 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Удалить пользователя"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"Удалить"</string>
     <string name="user_guest" msgid="4545590092001460388">"Гость"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Удалить аккаунт гостя"</string>
+    <string name="user_exit_guest_title" msgid="2653103120908427236">"Удалить гостя"</string>
     <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Удалить аккаунт гостя?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Все приложения и данные этого профиля будут удалены."</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Удалить"</string>
@@ -3422,8 +3443,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"лицо"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"отпечаток пальца, добавить отпечаток пальца"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"снижение яркости, сенсорный экран, батарея, умная яркость, динамическая яркость, автоматическая регулировка яркости"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"яркость, спящий режим, батарея, время отключения экрана, использование устройства, дисплей, экран, время бездействия"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"повернуть, перевернуть, поворот, вертикальная, горизонтальная, ориентация, портрет, пейзаж"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"обновить, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"не беспокоить, расписание, уведомления, заблокировать, беззвучный режим, вибрировать, сон, работа, концентрация, звук, отключить звук, день, рабочий день, выходной день, вечер рабочего дня, мероприятие"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"экран, время блокировки, время отключения экрана, блокировка экрана"</string>
@@ -3592,9 +3615,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Рингтоны"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Другие звуки и вибросигналы"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Уведомления"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Разговоры"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Недавно отправленные"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Смотреть все за последние 7 дней"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Расширенные настройки"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Общие"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Рабочие уведомления"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Адаптивные уведомления"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Приоритет адаптивных уведомлений"</string>
@@ -3656,7 +3680,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Показывать на панели уведомлений, в строке состояния и на заблокированном экране"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Скрыть беззвучные уведомления в строке состояния"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Световая индикация"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Уведомления на заблок. экране"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Конфиденциальность"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Пропуск заблок. экрана"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Сразу переходить к последнему открытому экрану после фейсконтроля"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Заблокированный экран, пропустить, перейти"</string>
@@ -3727,7 +3751,7 @@
     <string name="notification_alert_title" msgid="1632401211722199217">"По умолчанию"</string>
     <string name="allow_interruption" msgid="5237201780159482716">"Разрешить оповещения"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"Включить звуковой сигнал, вибрацию, а также показывать уведомления поверх других приложений"</string>
-    <string name="notification_priority_title" msgid="5554834239080425229">"Приоритет"</string>
+    <string name="notification_priority_title" msgid="5554834239080425229">"Важный"</string>
     <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Появляется в верхней части списка разговоров и как всплывающий чат, фото профиля показывается на заблок. экране"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"Приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" не поддерживает большинство функций разговоров. Вы не можете отметить разговоры как важные, и они не будут появляться в виде всплывающих чатов."</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"Объединять уведомления в одну строку на панели уведомлений"</string>
@@ -3751,7 +3775,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> уведомления в неделю</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Никогда"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Доступ к уведомлениям"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Уведомления на устройствах и в приложениях"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Выбрать, какие уведомления будут показываться на ваших устройствах и в приложениях"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Доступ к уведомлениям в рабочем профиле заблокирован"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Приложения не могут просматривать уведомления"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3763,7 +3788,7 @@
     <string name="notification_assistant_title" msgid="6983941403582134437">"Адаптивные уведомления"</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"Нет"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"Установленные приложения не запрашивали доступ к уведомлениям"</string>
-    <string name="notification_access_detail_switch" msgid="46386786409608330">"Разрешить доступ к уведомлениям"</string>
+    <string name="notification_access_detail_switch" msgid="46386786409608330">"Доступ к уведомлениям"</string>
     <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"Предоставить приложению \"<xliff:g id="SERVICE">%1$s</xliff:g>\" доступ к уведомлениям?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"Приложение \"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g>\" сможет читать все уведомления, в том числе содержащие личную информацию (такую, как имена контактов и сообщения). Кроме того, оно получит право закрывать уведомления и нажимать кнопки в них, например отвечать на звонки. \n\nПриложение сможет включать и отключать режим \"Не беспокоить\", а также менять его настройки."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"Открыть приложению \"<xliff:g id="SERVICE">%1$s</xliff:g>\" доступ к уведомлениям?"</string>
@@ -3772,17 +3797,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Отключить"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Отмена"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Разрешенные типы уведомлений"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Важные уведомления из приложений"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Уведомления о сообщениях"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Оповещения"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Беззвучные уведомления"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"В реальном времени"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Уведомления приложений, телефонных звонков, навигатора и т. д."</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Разговоры"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS и другие сообщения"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"По умолчанию"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Уведомления со звуковым сигналом или вибрацией (в зависимости от настроек)"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Без звука"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Уведомления без звукового сигнала или вибрации"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Посмотреть все приложения"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Изменить настройки уведомлений для приложений"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Приложения, показываемые на устройстве"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Вспомогательные VR-сервисы"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Установленные приложения не запрашивали доступ для работы в качестве вспомогательного VR-сервиса"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Разрешить VR-сервису доступ к сервису \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
@@ -4082,9 +4107,36 @@
     <string name="launch_by_default" msgid="892824422067985734">"Открывать по умолчанию"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Открытие ссылок"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Открывать поддерживаемые ссылки"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Поддерживаемые ссылки открываются в этом приложении"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Ссылки, которые будут открываться в этом приложении"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Открывать автоматически"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Поддерживаемые ссылки"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Другие значения по умолчанию"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Другие настройки по умолчанию"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Добавить ссылку"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Можно проверить ссылки, чтобы они автоматически открывались в приложении. "<annotation id="url">"Подробнее…"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> подтвержденная ссылка</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> подтвержденные ссылки</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> подтвержденных ссылок</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> подтвержденной ссылки</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Ссылки проверены и автоматически откроются в этом приложении.</item>
+      <item quantity="few">Ссылки проверены и автоматически откроются в этом приложении.</item>
+      <item quantity="many">Ссылки проверены и автоматически откроются в этом приложении.</item>
+      <item quantity="other">Ссылки проверены и автоматически откроются в этом приложении.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ОК"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Поиск поддерживаемых ссылок…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Отмена"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> поддерживаемая ссылка</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> поддерживаемые ссылки</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> поддерживаемых ссылок</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> поддерживаемой ссылки</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Добавить"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Открывается в приложении \"<xliff:g id="APP_LABEL">%s</xliff:g>\"."</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"Занято <xliff:g id="SIZE">%1$s</xliff:g> (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"внутренняя память"</string>
     <string name="storage_type_external" msgid="125078274000280821">"внешний накопитель"</string>
@@ -4399,7 +4451,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Доступ к камере запрещен"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Запрещено делать скриншоты"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Невозможно открыть приложение"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Если у вас есть вопросы, обратитесь к администратору."</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Подробнее…"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Администратор может контролировать настройки, приложения, разрешения и параметры доступа к корпоративным ресурсам в этом профиле, а также связанные с ним данные, например сведения о местоположении или действиях в сети."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Администратор может контролировать настройки, приложения, разрешения и параметры доступа к корпоративным ресурсам для этого пользователя, а также связанные с ним данные, например сведения о местоположении или действиях в сети."</string>
@@ -4482,7 +4535,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ограничения</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Данные оператора связи могут отличаться от данных на устройстве."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Исключить данные, переданные через сети оператора связи"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Исключен трафик, переданный через сети оператора связи"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Расход: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Установить предупреждение"</string>
     <string name="data_warning" msgid="2925054658166062884">"Предупреждение"</string>
@@ -4845,7 +4898,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(удалено у пользователя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(отключено для пользователя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Автозаполнение"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"автоматически, заполнять, автозаполнение"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Пароли"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"автозаполнение, автоматически, заполнение, пароль"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Подтвердите, что вы доверяете этому приложению&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; анализирует содержимое экрана и находит поля, которые можно заполнить автоматически."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Автозаполнение"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Ведение журнала"</string>
@@ -5009,7 +5063,7 @@
     <string name="carrier_settings_title" msgid="6959295328730560529">"Настройки оператора"</string>
     <string name="cdma_lte_data_service" msgid="6937443423651347345">"Настройка передачи данных"</string>
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобильный Интернет"</string>
-    <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Доступ к Интернету по мобильной сети"</string>
+    <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Доступ к интернету по мобильной сети"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефон автоматически подключится к сети этого оператора, когда вы окажетесь в зоне ее действия."</string>
     <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Нет SIM-карты"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Настройки звонков"</string>
@@ -5054,7 +5108,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Изменение режима работы сети"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Предпочтительный тип сети"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Оператор"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Версия настроек"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Версия настроек оператора"</string>
     <string name="call_category" msgid="641461844504128789">"Вызовы"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Видеозвонки"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Выбор системы"</string>
@@ -5103,6 +5157,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Извлеките и снова вставьте SIM-карту. Если проблема не исчезнет, перезапустите устройство."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Попробуйте включить SIM-карту ещё раз. Если проблема не исчезнет, перезапустите устройство."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Активация сети"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Переключение между операторами связи"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Сеть \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\" активна"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Нажмите, чтобы обновить настройки SIM-карты."</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Вы переключились на сеть <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5267,8 +5322,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Отключено"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-карты"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Показать сети, доступные в режиме полета"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Поиск и подключение к сетям, доступным в режиме полета."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Найти сеть Wi-Fi и подключиться к ней"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"самолет, безопасность для самолета"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Звонки и SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Звонки по Wi-Fi"</string>
@@ -5282,22 +5336,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"Недоступно"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Временно недоступно"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Нет SIM-карты"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Настройки"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Настройки подключения"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Подключаться к общедоступным сетям"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"сетевое подключение, Интернет, беспроводная сеть, передача данных, Wi-Fi, wifi, wi fi, сотовая сеть, мобильный Интернет, сотовый оператор, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Показать сети, доступные в режиме полета"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Сети, доступные в режиме полета"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Включить сети"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Отключить сети"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Сбросить настройки подключения к Интернету?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Звонок будет завершен."</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Звонок будет завершен."</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Подождите…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Исправить проблемы с подключением"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Сети, доступные в режиме полета"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Чтобы переключиться между сетями, отключите кабель Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Невозможно переключить сеть, пока установлено подключение"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Сети, доступные в режиме полета"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Подключено"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Не удается автоматически подключиться к Интернету"</string>
@@ -5318,6 +5371,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Цвет"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Другое"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Общие"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Показать все приложения"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Умная переадресация"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Умная переадресация включена"</string>
@@ -5331,4 +5388,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Введите номер телефона"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Номер телефона не указан."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ОК"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Разрешить 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Использовать передачу данных по сети 2G. Для экстренных вызовов сеть 2G включена по умолчанию."</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index b2a4084..8bc2b49 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"වඩා කුඩා කරන්න"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"වඩා විශාල කරන්න"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ස්වයංක්‍රීය කරකැවීම භාවිත කරන්න"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"යමෙකු තිරය දෙස බලන්නේද යන්න සහ කෙසේ බලන්නේද යන්න බැලීමට මුහුණ පදනම් ස්වයංක්‍රිය කරකැවීම ඉදිරි කැමරාව භාවිත කරයි. එය නිදා සිටියදී කියවීමට ඉඩ දෙන අතර රූප කිසි විටක ගබඩා කිරීම හෝ Google වෙත යැවීම සිදු නොකෙරේ.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;තව දැන ගන්න&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"ආදර්ශ පෙළ"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"The Wonderful Wizard of Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11වන පරිච්ඡේදය: The Wonderful Emerald City of Oz"</string>
@@ -403,15 +404,21 @@
       <item quantity="other">ඇඟිලි සලකුණු පිහිටුවීම් <xliff:g id="COUNT_1">%1$d</xliff:g></item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"ඇඟිලි සලකුණින් අගුළු හරින්න"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"ඔබගේ ඇඟිලි සලකුණ පිහිටුවන්න"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"ඔබේ ඇඟිලි සලකුණ භාවිත කරන්න"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"ඔබගේ දුරකථනය අවදි කිරීමට සහ අගුලු හැරීමට, මිලදී ගැනීම් අනුමත කිරීමට, හෝ යෙදුම් වෙත පිරීමට ඇඟිලි සලකුණු සංවේදකය ස්පර්ශ කරන්න. ඔබ කාගේ ඇඟිලි සලකුණු එක් කරන්නේද යන්න ගැන ප්‍රවේශම් වන්න. එක් කළ එක් මුද්‍රණයකට පවා මේ ඕනෑම දෙයක් කළ හැකිය."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"ඔබගේ ඇඟිලි සලකුණ ප්‍රබල රටාවකට හෝ PIN අංකයකට වඩා ආරක්ෂාකාරී බව අඩු විය හැකිය."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"ඔබ සිටින්නේ පාලනයේය"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"මතක තබා ගන්න"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"ඇඟිලි සලකුණ මගින් පටිගත කරන ලද දත්ත ආරක්ෂිතව ගබඩා කරන අතර කිසි විටක ඔබගේ දුරකථනයෙන් ඉවත් නොවේ. සැකසීම් තුළ ඔබට ඕනෑම වේලාවක ඔබගේ දත්ත මැකිය හැකිය."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"ඔබගේ ඇඟිලි සලකුණ ප්‍රබල රටාවකට හෝ PIN අංකයකට වඩා ආරක්ෂාකාරී බව අඩු විය හැකිය."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"වැඩිදියුණු කළ ඇඟිලි සලකුණු ආකෘති නිර්මාණය කිරීමට ඔබගේ දුරකථනය විටින් විට ඔබගේ මෑත ඇඟිලි සලකුණු රූප භාවිත කරනු ඇත."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ඔබේ දුරකථනය අගුලු හැරීමට, හෝ මිලදී ගැනීම් අනුමත කිරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කරන්න.\n\nසටහන: ඔබට ඔබේ ඇඟිලි සලකුණ මෙම උපාංගය අගුලු හැරීමට භාවිත කළ නොහැකිය. තව තොරතුරු සඳහා, ඔබේ සංවිධානයෙහි පරිපාලක අමතන්න."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ඔබේ දුරකථනය අගුලු හැරීමට, හෝ මිලදී ගැනීම් අනුමත කිරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කරන්න.\n\nසටහන: ඔබේ ඇඟිලි සලකුණ ප්‍රබල රටාවකට හෝ PIN අංකයකට වඩා ආරක්ෂාකාරී බව අඩු විය හැකිය."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"අවලංගු කරන්න"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"එපා, ස්තුතියි"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"මඟ හරින්න"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"දිගටම කර ගෙන යන්න"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"එකඟයි"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"මඟ හරින්න"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ඊළඟ"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"ඇඟිලි සලකුණ මඟ හරින්නද?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"මඟ හරින්න"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"අවලංගු කරන්න"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"සංවේදකය ස්පර්ශ කරන්න"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"ඇඟිලි සලකුණු නිරූපකය ස්පර්ශ කර අල්ලාගෙන සිටින්න"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"එය ඔබගේ දුරකථනය පිටුපස ඇත. ඔබේ දබරැඟිල්ල භාවිත කරන්න."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"එය තිරයෙහි ඇත. දිළිසෙන කවයක් සහිත ඇඟිලි සලකුණ බලන්න."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"ඇඟිලි සලකුණු සංවේදකය ඔබගේ තිරයේ ඇත. එය සොයා ගැනීමට ඔබගේ ඇඟිල්ල තිරය හරහා ගෙන යන්න."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"උපාංගයේ ඇඟිලි සලකුණු සංවේදකයේ පිහිටීම නිරූපණය"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"නම‍"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"හරි"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"මකන්න"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"සංවේදකය ස්පර්ශ කරන්න"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"ඔබගේ ඇඟිල්ල සංවේදකය මත තබා කම්පනයක් දැනෙන විට ඔසවන්න"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"ඔසවා, පසුව නැවත ස්පර්ශ කරන්න"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"ඔබේ ඇඟිලි සලකුණෙහි විවිධ කොටස් එක් කිරීමට ඔබගේ ඇඟිල්ල ඔසවා තබා ගන්න"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"ඇඟිලි සලකුණ එක් කරන ලදී"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"ඔබ මෙම නිරූපකය දුටු විට, හඳුනා ගැනීම හෝ මිලදී ගැනීම් සඳහා අනුමැතිය දීමට ඔබගේ ඇඟිලි සලකුණ භාවිත කරන්න"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"පසුව එය කරන්න"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"සක්‍රීයයි / ඔබ එය දිහා බලා සිටින්නේ නම් තිරය අක්‍රිය නොවේ"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"අක්‍රියයි"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"කැමරා ප්‍රවේශය අවශ්‍යයි"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"උපාංග පෞද්ගලීකරණ සේවා සඳහා අවසර කළමනාකරණයට තට්ටු කරන්න"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"ඔබ එය දිහා බලා සිටින්නේ නම් ඔබ තිරය අක්‍රිය කිරීම වළක්වයි"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"යමෙක් තිරය දිහා බලන්නේ ද යන්න බැලීමට තිර අවධානය ඉදිරිපස කැමරාව භාවිතා කරයි. එය උපාංගයෙහි ක්‍රියා කරන අතර, රූප කිසි විටෙක ගබඩා කිරීම හෝ Google වෙත යැවීම සිදු නොවේ."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"තිර අවධානය ක්‍රියාත්මක කරන්න"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"තිරය අඳුරු විට, එය නව දැනුම් දීම් සඳහා ක්‍රියාත්මක වේ"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"සැමවිට වේලාව සහ තතු පෙන්වන්න"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"වැඩි බැටරි භාවිතය"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"තද අකුරු"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"තදකුරු පෙළ"</string>
     <string name="title_font_size" msgid="570613010306330622">"අකුරු ප්‍රමාණය"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"පෙළ වඩාත් විශාල හෝ කුඩා කරන්න"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM කාඩ් පතෙහි අඟුළු සැකසුම්"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"වෙනත් පරිශීලකයින්"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"උපාංග ආචයනය"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"අතේ ගෙන යා හැකි ගබඩාව"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"එලාම සහ සිහිකැඳවීම්"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"එලාම හෝ සිහිකැඳවීම් සැකසීමට ඉඩ දෙන්න"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"එලාම සහ සිහිකැඳවීම්"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"එලාම හෝ වේලාව පදනම් කර ගත් වෙනත් සිදුවීම් කාලසටහන්ගත කිරීමට මෙම යෙදුමට ඉඩ දෙන්න. ඔබ උපාංගය භාවිත නොකරන විට පවා යෙදුමට අවදි වීමට සහ ක්‍රියාත්මක වීමට මෙය ඉඩ දෙයි. මෙම අවසරය අහෝසි කිරීම යෙදුම හොඳින් ක්‍රියාත්මක නොවීමට හේතු විය හැකි බව සලකන්න, විශේෂයෙන් යෙදුම කාලසටහන්ගත කර ඇති යම් එලාම තවදුරටත් ක්‍රියා නොකරනු ඇත."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"කාල සටහන, එලාමය, සිහිකැඳවීම, සිදුවීම"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> න් <xliff:g id="USED">%1$s</xliff:g> ක් භාවිත කළ"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> න් භාවිත කළ"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"ස්ථානීය සේවා"</string>
     <string name="location_title" msgid="5819154746934945021">"මගේ ස්ථානය"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"කාර්යාල පැතිකඩ සඳහා ස්ථානය"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"ස්ථානය වෙත යෙදුම් ප්‍රවේශය"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ස්ථානය ක්‍රියාවිරහිතයි"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> යෙදුම් <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g>න් <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>කට ස්ථානයට ප්‍රවේශය ඇත</item>
       <item quantity="other"> යෙදුම් <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g>න් <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>කට ස්ථානයට ප්‍රවේශය ඇත</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"මෑත ස්ථාන ප්‍රවේශය"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"විස්තර බලන්න"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"මෑතකදී යෙදුම් කිසිවක් ස්ථානය ඉල්ලා නැත"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"යෙදුම් කිසිවක් මෑතකදී ස්ථානය වෙත ප්‍රවේශ වූයේ නැත"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ඉහළ බැටරි භාවිතය"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"අඩු බැටරි භාවිතය"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi සහ බ්ලූටූත් ස්කෑන් කිරීම"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi ස්කෑන් කිරීම"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi‑Fi ක්‍රියාවිරහිත විට පවා, ඕනෑම අවස්ථාවක Wi‑Fi ජාල සඳහා ස්කෑන් කිරීමට යෙදුම් සහ සේවාවලට ඉඩ දෙන්න. උදාහරණයක් ලෙස, ස්ථානය-පදනම් වූ විශේෂාංග සහ සේවා වැඩි දියුණු කිරීම සඳහා මෙය භාවිත කළ හැකිය."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"බ්ලූටූත් පරිලෝකනය"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"බ්ලූටූත් ක්‍රියාවිරහිත විට පවා, ඕනෑම අවස්ථාවක අවට උපාංග සඳහා ස්කෑන් කිරීමට යෙදුම් සහ සේවාවලට ඉඩ දෙන්න. උදාහරණයක් ලෙස, ස්ථානය-පදනම් වූ විශේෂාංග සහ සේවා වැඩි දියුණු කිරීම සඳහා මෙය භාවිත කළ හැකිය."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"ස්ථාන සේවා"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"වැඩ සඳහා ස්ථානීය සේවා"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ස්ථාන වේලා කලාපය අනාවරණය කර ගැනීම"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ස්ථාන වේලා කලාපය අනාවරණය කර ගැනීම"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"වත්මන් වේලා කලාපය අනාවරණය කර ගැනීමට උපාංගයේ ස්ථානය භාවිත කිරීමට ඉඩ දෙයි. Wi‑Fi ස්කෑන් කිරීම වැනි වෙනත් ස්ථාන සැකසීම් වේලා කලාපය අනාවරණය කර ගැනීමේ නිරවද්‍යතාවට බලපෑ හැකිය."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ක්‍රියාත්මකයි"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ක්‍රියාවිරහිතයි"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ස්වයංක්‍රිය වේලා කලාපය අනාවරණය කර ගැනීම අබලයි"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ස්වයංක්‍රිය වේලා කලාපය ක්‍රියාවිරහිතයි"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ස්ථාන වේලා කලාපය අනාවරණය කර ගැනීම අබලයි"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ස්ථාන වේලා කලාපය අනාවරණය කර ගැනීම සහාය නොදක්වයි"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ස්ථාන වේලා කලාපය අනාවරණය කර ගැනීමේ වෙනස් කිරීම් ඉඩ නොදේ"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"සක්‍රීය කරන්න"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"ගබඩාව හිස් කරන්න"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"යාවත්කාලීන අස්ථාපනය කරන්න"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"ඔබ මෙම යෙදුම සුපුරුද්දෙන්ම සමහර ක්‍රියා සඳහා දියත්කිරීමට තෝරාගෙන ඇත."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"ඔබ තෝරා ඇති සමහර ක්‍රියාකාරකම් පෙරනිමියෙන් මෙම යෙදුම තුළ විවෘත වේ."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"මෙම යෙදුමට විජට සෑදීමට සහ ඒවායේ දත්ත වෙත ප්‍රවේශ වීමට ඉඩ ලබා දීමට ඔබ තෝරාගෙන ඇත."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"සුපුරුදු සකසා නැත."</string>
-    <string name="clear_activities" msgid="341345438786077236">"සුපුරුදු හිස් කරන්න"</string>
+    <string name="clear_activities" msgid="488089228657585700">"පෙරනිමි මනාප හිස් කරන්න"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"මෙම යෙදුම ඔබගේ තීරය සඳහා සැලසුම් කර නොතිබෙනවා විය හැක. ඔබට එය ඔබගේ තිරයට සීරු මාරු වන්නේ කෙසේද යන්න මෙහිදී පාලනය කළ හැක."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"දියත් කරන විට අසන්න"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"පරිමාණ යෙදුම"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"ඔබට ඔබේ අවශ්‍යතාවන්ට ගැළපෙන පරිදි මෙම උපාංගය අභිරුචිකරණය කළ හැකිය. මෙම ප්‍රවේශ්‍යතා විශේෂාංග සැකසීම්වල පසුව වෙනස් කළ හැකිය."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ෆොන්ට තරම වෙනස් කරන්න"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"තිර කියවන"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ශ්‍රව්‍ය සහ තිරය මත පෙළ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"සිරස්තල"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ශ්‍රව්‍ය"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"පොදු"</string>
     <string name="display_category_title" msgid="6638191682294461408">"සංදර්ශකය"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"පෙළ සහ සංදර්ශකය"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"තිරය අඳුරු කිරීම ක්‍රියාත්මක කිරීම"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"රතු-කොළ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"රතු-කොළ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"නිල්-කහ"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"දීප්තිය අඩු කරන්න"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"දීප්තිය අඩු කරන්න"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ඔබගේ දුරකථනයේ අවම දීප්තියට වඩා තිරය අඳුරු කරන්න"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ඔබගේ ටැබ්ලටයේ අවම දීප්තියට වඩා තිරය අඳුරු කරන්න"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"කියවීමට වඩාත් පහසු වන ලෙස ඔබගේ තිරය අඳුරු කරන්න.&lt;br/&gt;&lt;br/&gt; මෙය පහත අවස්ථාවලදී ප්‍රයෝජනවත් විය හැකිය: &lt;ol&gt; &lt;li&gt; ඔබගේ දුරකථනයේ පෙරනිමි අවම දීප්තිය තවම ඉතාම දීප්තිමත්ය&lt;/li&gt; &lt;li&gt; ඔබ ඔබගේ දුරකථනය, රාත්‍රියේ හෝ නින්දට යාමට පෙර අඳුරු කාමරයක වැනි අඳුරු අවස්ථාවලදී භාවිත කරයි&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"මුහුණ"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"ඇඟිලි සලකුණ, ඇඟිලි සලකුණ එක් කරන්න"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"අඳුරු තිරය, ස්පර්ශ තිරය, බැටරිය, ස්මාර්ට් දීප්තිය, ගතික දීප්තිය, ස්වයං දීප්තිය"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"අඳුරු තිරය, නිද්‍රාව, බැටරිය, යල් පැනීම, අවධානය, සංදර්ශකය, තිරය, නිෂ්ක්‍රියාව"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"කරකවන්න, ෆ්ලිප් කරන්න, කරකැවීම, ආලේඛ්‍ය, භූ දර්ශනය, දිශානතිය, සිරස්, තිරස්"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"උත්ශ්‍රේණි කරන්න, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, කාලසටහන, දැනුම්දීම්, අවහිරය, නිශ්ශබ්දතාව, කම්පනය, නින්ද, වැඩ, අවධානය, ශබ්දය, නිහඬ, හිරු, සතියේ දින, සති අන්තය, සතියේ දින රෑ, සිදුවීම"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"තිරය, අගුලු කාලය, කාල නිමාව, අගුලු තිරය"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"නාද රිද්ම"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"වෙනත් ශබ්ද සහ කම්පන"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"දැනුම්දීම්"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"සංවාදය"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"මෑතකදී එවන ලද"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"පසුගිය දින 7 වෙතින් සියල්ල බලන්න"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"උසස්"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"පොදු"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"වැඩ දැනුම්දීම්"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"අනුවර්තී දැනුම්දීම්"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"අනුවර්තී දැනුම්දීමේ ප්‍රමුඛතාව"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"පහළ ඇදීමේ සෙවන, තත්ත්‍ව තීරුව තුළ සහ අඟුලු තිරය මත සංදර්ශන කරයි"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"තත්ත්ව තීරුවේ නිහඬ දැනුම් දීම් සඟවන්න"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"නිවී නිවී දැල්වෙන එළිය"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"අගුලු තිරයෙහි දැනුම් දීම්"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"පෞද්ගලිකත්වය"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"අගුළු තිරය මඟ හරින්න"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"මුහුණ අගුළු හැරීමෙන් පසුව, අවසානයට භාවිත තිරයට කෙළින්ම යන්න"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"අගුළු තිරය, අගුළුතිරය, මඟහරින්න, මඟහැරයාම"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="other">සතියකට දැනුම්දීම් ~<xliff:g id="NUMBER_1">%d</xliff:g> ක්</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"කිසි විටක නැත"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"දැනුම්දීම් ප්‍රවේශනය"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"උපාංගය සහ යෙදුම් දැනුම්දීම්"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"ඔබගේ යෙදුම් සහ උපාංගවල පෙන්වන්නේ කුමන දැනුම්දීම්ද යන්න පාලනය කරන්න"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"කාර්යාල පැතිකඩ දැනුම් දීම්වලට පිවිසීම අවහිර කර ඇත"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"යෙදුම්වලට දැනුම් දීම් කියවිය නොහැක"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"ක්‍රියා විරහිත කරන්න"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"අවලංගු කරන්න"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"ඉඩ දෙන දැනුම්දීම් වර්ග"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"වැදගත් ප්‍රවර්තන දැනුම්දීම්"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"සංවාද දැනුම්දීම"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"ඇඟවීමේ දැනුම්දීම්"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"නිහඬ දැනුම්දීම්"</string>
-    <string name="notif_listener_excluded_title" msgid="639103158747320529">"මෙම සවන් දෙන්නාට යා කර නැති යෙදුම්"</string>
-    <string name="notif_listener_excluded_summary_zero" msgid="5152444145866958400">"සියලු යෙදුම් යා කර ඇත"</string>
-    <plurals name="notif_listener_excluded_summary_nonzero" formatted="false" msgid="3218891004546748617">
-      <item quantity="one">යෙදුම් %dක් යා කර නැත</item>
-      <item quantity="other">යෙදුම් %dක් යා කර නැත</item>
-    </plurals>
-    <string name="notif_listener_excluded_app_title" msgid="8102477888511595023">"යා කළ යෙදුම්"</string>
+    <string name="notif_type_ongoing" msgid="135675014223627555">"තථ්‍යකාල"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"භාවිතයේ ඇති යෙදුම්, සංචලනය, දුරකථන ඇමතුම් සහ තවත් දේවලින් තථ්‍ය කාල සන්නිවේදනය"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"සංවාද"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS සහ වෙනත් සන්නිවේදන"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"පෙරනිමි"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"සැකසීම් මත පදනම්ව නාද විය හැකි හෝ කම්පනය විය හැකි දැනුම්දීම්"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"නිහඬ"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"කිසි විටෙක ශබ්ද හෝ කම්පනය නොකරන දැනුම්දීම්"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"සියලු යෙදුම් බලන්න"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"දැනුම්දීම් එවිය හැකි එක් එක් යෙදුම සඳහා දැනුම්දීම් සැකසීම් වෙනස් කරන්න"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"උපාංගයෙහි පෙන්වන යෙදුම්"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR උදවුකරු සේවා"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ස්ථාපිත යෙදුම් කිසිවක් VR උදවුකරු සේවා ලෙස ධාවනය කිරීමට ඉල්ලා නැත."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> සඳහා VR සේවා ප්‍රවේශය ඉඩ දෙන්නද?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"පෙරනිමියෙන් විවෘත කරන්න"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"සබැඳි විවෘත කිරීම"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"සහය දක්වන සබැඳි විවෘත කරන්න"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"මෙම යෙදුමේ විවෘත වන සහාය දක්වන සබැඳි"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"මෙම යෙදුම තුළ විවෘත කිරීමට සබැඳි"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"අසන්නේ නැතිව විවෘත කරන්න"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"සහය දක්වන සබැඳි"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"වෙනත් පෙරනිමි"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"වෙනත් පෙරනිමි මනාප"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"සබැඳිය එක් කරන්න"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"යෙදුම තුළ ස්වයංක්‍රියව විවෘත කිරීම සඳහා යෙදුමකට සබැඳි සත්‍යාපනය කළ හැකිය. "<annotation id="url">"තව දැන ගන්න"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one">සත්‍යාපනය කළ සබැඳි <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="other">සත්‍යාපනය කළ සබැඳි <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">මෙම සබැඳි සත්‍යාපනය කර ඇති අතර ස්වයංක්‍රියව මෙම යෙදුම තුළ විවෘත වේ.</item>
+      <item quantity="other">මෙම සබැඳි සත්‍යාපනය කර ඇති අතර ස්වයංක්‍රියව මෙම යෙදුම තුළ විවෘත වේ.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"හරි"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"සහාය දක්වන වෙනත් සබැඳි සඳහා පරීක්ෂා කරමින්…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"අවලංගු කරන්න"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one">සහාය දක්වන සබැඳි <xliff:g id="COUNT_1">%d</xliff:g></item>
+      <item quantity="other">සහාය දක්වන සබැඳි <xliff:g id="COUNT_1">%d</xliff:g></item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"එක් කරන්න"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> තුළ විවෘත වෙයි"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> හි <xliff:g id="SIZE">%1$s</xliff:g> භාවිතා කර ඇත"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"අභ්‍යන්තර ගබඩාව"</string>
     <string name="storage_type_external" msgid="125078274000280821">"බාහිර ගබඩාව"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"කැමරාවට ඉඩ නොදේ"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"තිර රුවට ඉඩ නොදේ"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"මෙම යෙදුම විවෘත කළ නොහැකිය"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"ඔබට ප්‍රශ්න තිබේ නම්, ඔබේ IT පරිපාලක අමතන්න."</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"වැඩි විස්තර"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"සැකසීම්, අවසර, සංස්ථාපිත ප්‍රවේශය, ජාල ක්‍රියාකාරකම, සහ උපාංගයේ ස්ථාන තොරතුරු ඇතුළුව, ඔබේ කාර්යාල පැතිකඩ සමඟ සම්බන්ධිත යෙදුම් සහ දත්ත නිරීක්ෂණය කිරීමට සහ කළමනාකරණය කිරීමට ඔබේ පරිපාලකට හැකිය."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"සැකසීම්, අවසර, සංස්ථාපිත ප්‍රවේශය, ජාල ක්‍රියාකාරකම, සහ උපාංගයේ ස්ථාන තොරතුරු ඇතුළුව, මෙම පරිශීලකයා සමඟ සම්බන්ධිත යෙදුම් සහ දත්ත නිරීක්ෂණය කිරීමට සහ කළමනාකරණය කිරීමට ඔබේ පරිපාලකට හැකිය."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="other">සීමා <xliff:g id="COUNT">%1$d</xliff:g>ක්</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"උපාංග ගිණුම්ගත කිරීමෙන් වාහක දත්ත ගිණුම්ගත කිරීම වෙනස් විය හැකිය"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"වාහක ජාල මගින් භාවිත කරන දත්ත බැහැර කරයි"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"වාහක ජාල මගින් භාවිත කරන දත්ත බැහැර කරයි"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> භාවිත විය"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"දත්ත අනතුරු ඇඟවීම සකසන්න"</string>
     <string name="data_warning" msgid="2925054658166062884">"දත්ත අනතුරු ඇඟවීම"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g> පරිශීලක සඳහා අස්ථාපනය කෙරිණි)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g> පරිශීලක සඳහා අබල කෙරිණි)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"ස්වයං පිරවුම් සේවාව"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"ස්වයං, පිරවුම, ස්වයං පිරවුම"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"මුරපද"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"ස්වයං, පිරවුම, ස්වයං පිරවුම, මුරපදය"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;ඔබ මෙම යෙදුම විශ්වාස කරන බව සහතික කර ගන්න&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ස්වයං පිරවිය හැකි දේවල් නිර්ණය කිරීමට ඔබේ තිරයෙහි ඇති දේවල් භාවිත කරයි."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"ස්වයං පිරවුම"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"ඇතුළු වීමේ මට්ටම"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"ජාල මෙහෙයුම් ආකාරය වෙනස් කරන්න"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ප්‍රියකරන ජාල වර්ගය"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"වාහකය"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"සැකසීම් අනුවාදය"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"වාහක සැකසීම් අනුවාදය"</string>
     <string name="call_category" msgid="641461844504128789">"අමතමින්"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"වාහක වීඩියෝ ඇමතීම"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"පද්ධතිය තේරුම"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM එක ඉවත් කර එය නැවත ඇතුළු කරන්න. ප්‍රශ්නය දිගටම පැවතුණහොත්, ඔබේ උපාංගය යළි ආරම්භ කරන්න."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"නැවත SIM එක ක්‍රියාත්මක කිරීමට උත්සාහ කරන්න. ප්‍රශ්නය දිගටම පැවතුණහොත්, ඔබේ උපාංගය යළි ආරම්භ කරන්න."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"ජාල සක්‍රිය කිරීම"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"වාහක මාරු වීම"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> සක්‍රියයි"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM සැකසීම් යාවත්කාලීන කිරීමට තට්ටු කරන්න"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> වෙත මාරු විය"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"ක්‍රියාවිරහිතයි"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"අන්තර්ජාලය"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"ගුවන් යානා ප්‍රකාර ජාල පෙන්වන්න"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"ගුවන් යානා ප්‍රකාරය තුළ ජාල සොයා ගන්න සහ ඒවාට සම්බන්ධ වන්න"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Wi-Fi ජාල සොයා ගෙන සම්බන්ධ වන්න"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ගුවන් යානා, ගුවන් යානා ආරක්ෂිත"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"ඇමතුම් &amp; SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi ඇමතීම"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ලබා ගත නොහැකිය"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"තාවකාලිකව ලබා ගත නොහැකිය"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM නැත"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"මනාප"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"ජාල මනාප"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"පොදු ජාලයකට සම්බන්ධ වන්න"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ජාල සම්බන්ධතාව, අන්තර්ජාලය, රැහැන් රහිත, දත්ත, wifi, wi-fi, wi fi, සෙලියුලර්, ජංගම, සෙල් වාහක, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ගුවන් යානා ප්‍රකාර ජාල බලන්න"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"ගුවන් යානා ප්‍රකාර ජාල බලමින්"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"ජාල ක්‍රියාත්මක කරන්න"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"ජාල ක්‍රියාවිරහිත කරන්න"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"ඔබගේ අන්තර්ජාලය යළි සකසන්නද?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"මෙය ඔබගේ දුරකථන ඇමතුම අවසන් කරනු ඇත"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"මෙය ඔබගේ දුරකථන ඇමතුම අවසන් කරනු ඇත"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"ඔබගේ අන්තර්ජාලය යළි සකසමින්…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"සබැඳුම් හැකියාව සකසන්න"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"ගුවන් යානා ප්‍රකාර ජාල ලබා ගත හැකිය"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ජාල මාරු කිරීමට, ඊතර්නෙට් විසන්ධි කරන්න"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"සම්බන්ධිත අතරතුර ජාල මාරු කළ නොහැකිය"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ගුවන් යානා ප්‍රකාර ජාල"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"සම්බන්ධයි"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"අන්තර්ජාලය ස්වයංක්‍රියව සබඳින්නේ නැත"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"වර්ණය"</string>
     <string name="category_name_others" msgid="2366006298768550310">"වෙනත්"</string>
     <string name="category_name_general" msgid="7737273712848115886">"සාමාන්‍ය"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"සියලු යෙදුම් බලන්න"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"ස්මාර්ට් යොමු කිරීම"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"ස්මාර්ට් යොමු කිරීම සබලයි"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"දුරකථන අංකය ඇතුළත් කරන්න"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"දුරකථන අංකය අස්ථානගතයි."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"හරි"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G ඉඩ දෙන්න"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G සෙලියුලර් සම්බන්ධතා භාවිත කරන්න. හදිසි අවස්ථා ඇමතුම් සඳහා, 2G සැම විට ක්‍රියාත්මක කර ඇත."</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index e526044..ccabfe3 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -54,9 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Zväčšite alebo zmenšite text na obrazovke."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Zmenšiť"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Zväčšiť"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Použitie automatického otáčania"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Ukážkový text"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Čarodejník z krajiny Oz"</string>
@@ -413,15 +412,21 @@
       <item quantity="one">Nastavený <xliff:g id="COUNT_0">%1$d</xliff:g> odtlačok prsta</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Odomknutie odtlačkom prsta"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Nastavenie odtlačku prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Používanie odtlačku prsta"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Ak chcete odomknúť telefón, autorizovať nákupy alebo sa prihlásiť do aplikácií, stačí sa dotknúť senzora odtlačkov prstov. Dávajte pozor, čie odtlačky pridáte. Tieto operácie bude môcť vykonávať každý pridaný odtlačok."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Odtlačok prsta môže byť menej bezpečný ako silný vzor alebo PIN"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Všetko máte pod kontrolou"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Upozornenie"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Údaje zaznamenané odtlačkom prsta sú bezpečne uložené a nikdy neopustia váš telefón. Môžete ich kedykoľvek odstrániť v Nastaveniach."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Odtlačok prsta môže byť menej bezpečný ako silný vzor alebo PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Telefón bude pomocou vašich nedávnych obrázkov odtlačkov prstov príležitostne vytvárať zlepšené modely odtlačkov prstov."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Odomykajte svoj telefón a schvaľujte nákupy pomocou odtlačku prsta.\n\nUpozornenie: Toto zariadenie nemôžete odomykať pomocou odtlačku prsta. Ďalšie informácie vám poskytne správca organizácie."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Odomykajte svoj telefón a schvaľujte nákupy pomocou odtlačku prsta.\n\nUpozornenie: Odtlačok prsta môže byť menej bezpečný ako silný vzor alebo kód PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Zrušiť"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nie, vďaka"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Preskočiť"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Pokračovať"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Súhlasím"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Preskočiť"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Ďalej"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Preskočiť odtlačok prsta?"</string>
@@ -438,16 +443,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Preskočiť"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Zrušiť"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Dotknite sa senzora"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Pridržte ikonu odtlačku prsta"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Nachádza sa na zadnej strane telefónu. Použite ukazovák."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Je na obrazovke. Hľadajte odtlačok prsta so žiariacim kruhom."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Senzor odtlačkov prstov je na obrazovke. Vyhľadajte ho posunutím prsta po obrazovke."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustrácia zariadenia a umiestnenia senzora odtlačku prsta"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Názov"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Odstrániť"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Dotknite sa senzora"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Priložte prst k senzoru a zdvihnite ho, keď zacítite vibráciu"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Zdvihnite a opäť priložte"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Zdvíhajte prst, aby ste pridali všetky odlišné časti odtlačku prsta"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Odtlačok prsta bol pridaný"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Keď uvidíte túto ikonu, môžete na identifikáciu alebo schválenie nákupov použiť odtlačok prsta"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Neskôr"</string>
@@ -1216,14 +1230,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Hľadať"</string>
     <string name="display_settings" msgid="7197750639709493852">"Obrazovka"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Automaticky otáčať obrazovku"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Vypnuté"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Zapnuté"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Zapnuté – podľa tváre"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Povoliť rozpoznávanie tváre"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Farby"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Prirodzené"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Zosilnené"</string>
@@ -1268,7 +1278,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Zapnuté, obrazovka sa nevypne, keď sa na ňu budete pozerať"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Vypnuté"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Vyžaduje sa prístup k fotoaparátu"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Klepnutím môžete spravovať povolenia služieb prispôsobenia zariadenia"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Zabráni vypnutiu obrazovky, keď sa na ňu budete pozerať"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Vnímavá obrazovka pomocou predného fotoaparátu zistí, či sa používateľ pozerá na obrazovku. Spúšťa sa v zariadení a snímky sa nikdy neukladajú ani neodosielajú Googlu."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Zapnúť vnímavú obrazovku"</string>
@@ -1349,7 +1362,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Keď je obrazovka tmavá, zapne sa v prípade nových upozornení"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Vždy zobrazovať čas a údaje"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Zvýšená spotreba batérie"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Tučný text"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Tučný text"</string>
     <string name="title_font_size" msgid="570613010306330622">"Veľkosť písma"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Zväčšite alebo zmenšite text"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Zámka SIM karty"</string>
@@ -1520,6 +1533,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Ďalší používatelia"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Úložisko zariadenia"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Prenosné úložisko"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Budíky a pripomenutia"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Povoliť nastavovanie budíkov a pripomenutí"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Budíky a pripomenutia"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Povoľte tejto aplikácie plánovať budíky alebo iné udalosti založené na čase. Príslušnej aplikácii tak umožníte sa prebudiť a spustiť, aj keď zariadenie nebudete používať. Upozorňujeme, že ak toto povolenie zrušíte, aplikácia nemusí fungovať správne a konkrétne môže dôjsť k zrušeniu všetkých budíkov, ktoré naplánovala."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"plán, budík, pripomenutie, udalosť"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Využité <xliff:g id="USED">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Využité z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1769,7 +1787,8 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Služby určovania polohy"</string>
     <string name="location_title" msgid="5819154746934945021">"Moja poloha"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Poloha pre pracovný profil"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Prístup aplikácie k polohe"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Poloha je vypnutá"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="few"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> z(o) <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplikácií majú prístup k polohe</item>
@@ -1777,24 +1796,24 @@
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> z(o) <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplikácií má prístup k polohe</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> z <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> aplikácií má prístup k polohe</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Nedávny prístup k polohe"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Zobraziť podrobnosti"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"V poslednom čase žiadne aplikácie o polohu nepožiadali"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Polohu nedávno nepoužili žiadne aplikácie"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Vysoká spotreba batérie"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Nízka spotreba batérie"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Vyhľadávanie Wi‑Fi a Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Vyhľadávanie sietí Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Povoľte aplikáciám a službám kedykoľvek vyhľadávať siete Wi‑Fi, a to aj vtedy, keď je sieť Wi-Fi vypnutá. Môžete to využiť napríklad na zlepšenie funkcií a služieb podmienených polohou."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Vyhľadávanie zariadení Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Povoľte aplikáciám a službám kedykoľvek vyhľadávať zariadenia v okolí, a to aj vtedy, keď je rozhranie Bluetooth vypnuté. Môžete to využiť napríklad na zlepšenie funkcií a služieb podmienených polohou."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Služby určovania polohy"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Služby určovania polohy pre prácu"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Zisťovanie časového pásma podľa polohy"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Zisťovanie časového pásma podľa polohy"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Umožňuje zisťovať aktuálne časové pásmo podľa polohy zariadenia. Presnosť zisťovania časového pásma môžu ovplyvniť iné nastavenia polohy, napríklad vyhľadávanie sietí Wi‑Fi"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Zapnuté"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Vypnuté"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatické zisťovanie časového pásma je deaktivované"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatické zisťovanie časového pásma je vypnuté"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Zisťovanie časového pásma podľa polohy je deaktivované"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Zisťovanie časového pásma podľa polohy nie je podporované"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Zmeny zisťovania časového pásma podľa polohy nie sú povolené"</string>
@@ -1977,10 +1996,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Povoliť"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Vymazať obsah úložiska"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Odinštalovať aktualizácie"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Pre niektoré akcie ste sa rozhodli spúšťať túto aplikáciu ako predvolenú."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Niektoré aktivity, ktoré ste vybrali, sa predvolene otvoria v tejto aplikácii."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Tejto aplikácii ste povolili vytváranie miniaplikácií a pristupovanie k ich údajom."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Nie je predvolená pre žiadne akcie"</string>
-    <string name="clear_activities" msgid="341345438786077236">"Vymazať predvolené nastavenia"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Vymazať predvolené predvoľby"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Táto aplikácia pravdepodobne nie je určená pre vašu obrazovku. Tu môžete nastaviť, ako sa aplikácia obrazovke prispôsobí."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Opýtať sa pri spustení"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Prispôsobiť veľkosť aplikácie"</string>
@@ -2192,7 +2211,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Zariadenie môžete prispôsobiť, aby zodpovedalo vašim potrebám. Tieto funkcie dostupnosti môžete neskôr zmeniť v Nastaveniach."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Zmeniť veľkosť písma"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Čítačky obrazovky"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvuk a text na obrazovke"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Titulky"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Zvuk"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Všeobecné"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Zobrazenie"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text a grafika"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Stmavenie obrazovky"</string>
@@ -2347,7 +2368,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Červená a zelená"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Červená a zelená"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Modrá a žltá"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Zníženie jasu"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Zníženie jasu"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Stmavte si obrazovku viac než je minimálny jas vášho telefónu"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Stmavte si obrazovku viac než je minimálny jas vášho tabletu"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Stmavte si obrazovku, aby sa vám lepšie čítala.&lt;br/&gt;&lt;br/&gt; Môže to byť užitočné: &lt;ol&gt; &lt;li&gt; keď je predvolený minimálny jas vášho telefónu stále príliš vysoký;&lt;/li&gt; &lt;li&gt; keď telefón používate v tmavých prostrediach, napríklad v noci alebo tmavej miestnosti pred spaním.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3422,8 +3443,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"tvár"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"odtlačok prsta, pridať odtlačok prsta"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"stmavenie obrazovky, dotyková obrazovka, batéria, inteligentný jas, dynamický jas, automatický jas"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"stlmiť obrazovku, spánok, batéria, časový limit, vnímavá, zobrazenie, obrazovka, nečinnosť"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"otočiť, prevrátiť, rotovať, na výšku, na šírku, orientácia, zvisle, vodorovne"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"inovovať, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"nerušiť, rozpis, upozornenia, blokovať, stíšiť, vibrovať, spánok, práca, sústredenie, zvuk, vypnúť zvuk, deň, pracovný deň, víkend, noc pracovného dňa, udalosť"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"obrazovka, čas uzamknutia, časový limit, uzamknutá obrazovka"</string>
@@ -3592,9 +3615,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Tóny zvonenia"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Ďalšie zvuky a vibrácie"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Upozornenia"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Konverzácia"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nedávno odoslané"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Zobraziť všetko za posledných 7 dní"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Rozšírené"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Všeobecné"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Pracovné upozornenia"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Prispôsobivé upozornenia"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Priorita prispôsobivých upozornení"</string>
@@ -3656,7 +3680,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Zobrazovať v rozbaľovacom paneli, stavovom riadku a na uzamknutej obrazovke"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Skryť tiché upozornenia v stavovom riadku"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blikať"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Upozornenia na uzamknutej obrazovke"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Ochrana súkromia"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Preskakovať uzamknutú obrazovku"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Po odomk. tvárou priamo prejsť na poslednú použitú obrazovku"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Uzamknutá obrazovka, preskočiť, obísť"</string>
@@ -3751,7 +3775,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> upozornenie týždenne</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nikdy"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Prístup k upozorneniam"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Upozornenia v zariadeniach a aplikáciách"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Ovládajte, ktoré upozornenia sa zobrazujú vo vašich aplikáciách a zariadeniach"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Prístup k upozorneniam pracovného profilu je zablokovaný"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Aplikácie nesmú čítať upozornenia"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3772,17 +3797,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Vypnúť"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Zrušiť"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Povolené typy upozornení"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Dôležité prebiehajúce upozornenia"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Upozornenia na konverzáciu"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Varovné upozornenia"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Tiché upozornenia"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Reálny čas"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Komunikácia v reálnom čase z používaných aplikácií, navigácie, telefónnych hovorov a ďalších položiek"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Konverzácie"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS a ďalšie komunikácie"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Predvolené"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Upozornenia, ktoré môžu v závislosti od nastavení vyzváňať alebo vibrovať"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Tiché"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Upozornenia, ktoré nikdy nevydávajú zvuk ani nevibrujú"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Zobrazenie všetkých aplikácií"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Zmeňte nastavenia upozornení každej aplikácie, ktorá môže odosielať upozornenia"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Aplikácie zobrazované v zariadení"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Pomocné služby VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Žiadne nainštalované aplikácie nežiadali, aby boli spúšťané ako pomocné služby VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Umožniť službe VR prístup do služby <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4082,9 +4107,36 @@
     <string name="launch_by_default" msgid="892824422067985734">"Predvolené otváranie"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Otváranie odkazov"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Otvoriť podporované odkazy"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Podporované odkazy sa otvoria v tejto aplikácii"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Odkazy na otvorenie v tejto aplikácii"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Otvárať bez opýtania"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Podporované odkazy"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Ďalšie predvolené"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Ďalšie predvolené predvoľby"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Pridanie odkazu"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Aplikácia môže overiť odkazy, aby sa v nej automaticky otvárali. "<annotation id="url">"Ďalšie informácie"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> overené odkazy</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> verified links</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> overených odkazov</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> overený odkaz</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="few">Tieto odkazy sú overené a automaticky sa otvárajú v tejto aplikácii.</item>
+      <item quantity="many">Tieto odkazy sú overené a automaticky sa otvárajú v tejto aplikácii.</item>
+      <item quantity="other">Tieto odkazy sú overené a automaticky sa otvárajú v tejto aplikácii.</item>
+      <item quantity="one">Tento odkaz je overený a automaticky sa otvára v tejto aplikácii.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Vyhľadávajú sa ďalšie podporované odkazy…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Zrušiť"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> podporované odkazy</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> supported links</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> podporovaných odkazov</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> podporovaný odkaz</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Pridať"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Otvára sa v aplikácii <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"Využité <xliff:g id="SIZE">%1$s</xliff:g>, <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"interné úložisko"</string>
     <string name="storage_type_external" msgid="125078274000280821">"externé úložisko"</string>
@@ -4399,7 +4451,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Použitie fotoaparátu je zakázané"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Snímky obrazovky sú zakázané"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Táto aplikácia sa nedá otvoriť"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Ak máte nejaké otázky, obráťte sa na svojho správcu IT"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Ďalšie podrobnosti"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Správca môže sledovať a spravovať aplikácie a údaje priradené k vášmu pracovnému profilu vrátane nastavení, povolení, firemného prístupu, aktivity siete a informácií o polohe zariadenia."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Správca môže sledovať a spravovať aplikácie a údaje priradené k tomuto používateľovi vrátane nastavení, povolení, firemného prístupu, aktivity siete a informácií o polohe zariadenia."</string>
@@ -4482,7 +4535,7 @@
       <item quantity="one">1 obmedzenie</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Účtovanie dát operátorom sa môže líšiť od účtovania na zariadení"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Vylučuje dáta spotrebované sieťami operátora"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Vylúči dáta využité sieťami operátora"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Spotreba <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Nastaviť dátové upozornenie"</string>
     <string name="data_warning" msgid="2925054658166062884">"Dátové upozornenie"</string>
@@ -4845,7 +4898,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(odinštalované pre používateľa <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(vypnuté pre používateľa <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Služba automatického dopĺňania"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"automatické, dopĺňanie, automatické dopĺňanie"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Heslá"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automaticky, vypĺňanie, automatické dopĺňanie, heslo"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Skontrolujte, či ide o dôveryhodnú aplikáciu&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Automatické dopĺňanie Google&gt;%1$s&lt;/xliff:g&gt; určuje na základe obsahu obrazovky, čo je možné automaticky vyplniť."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Automatické dopĺňanie"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Úroveň zaznamenávania"</string>
@@ -5054,7 +5108,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Zmeniť prevádzkový režim siete"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Preferovaný typ siete"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operátor"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Verzia nastavení"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Verzia nastavení operátora"</string>
     <string name="call_category" msgid="641461844504128789">"Volanie"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videohovory prostredníctvom operátora"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Výber systému"</string>
@@ -5077,10 +5131,10 @@
     <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Chcete zapnúť operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Chcete zapnúť SIM kartu?"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Chcete prepnúť na operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
-    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Chcete používať SIM kartu?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Chcete prepnúť na SIM kartu?"</string>
     <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"V jednej chvíli môže byť aktívna iba jedna stiahnutá SIM karta.\n\nPrepnutím na operátora <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nezrušíte službu operátora <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
     <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"V jednej chvíli môže byť aktívna iba jedna stiahnutá SIM karta.\n\nPrepnutím na operátora <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nezrušíte službu operátora <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
-    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"V jednej chvíli môže byť aktívna iba jedna stiahnutá SIM karta.\n\nPoužitím inej možnosti nezrušíte službu operátora <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"V jednej chvíli môže byť aktívna iba jedna stiahnutá SIM karta.\n\nPrepnutím na operátora nezrušíte službu operátora <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Prepnúť na operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Pripája sa k sieti…"</string>
     <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Prepína sa na operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5092,7 +5146,7 @@
     <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operátora sa nepodarilo deaktivovať"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Vyskytol sa problém a operátora sa nepodarilo deaktivovať."</string>
     <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Chcete používať dve SIM karty?"</string>
-    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"V tomto zariadení môžu byť naraz aktívne dve SIM karty. Ak chcete ďalej používať len jednu, klepnite na Nie, ďakujem."</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"V tomto zariadení môžu byť naraz aktívne dve SIM karty. Ak chcete ďalej používať len jednu, klepnite na Nie, vďaka."</string>
     <string name="sim_action_restart_title" msgid="7054617569121993825">"Chcete reštartovať zariadenie?"</string>
     <string name="sim_action_restart_text" msgid="8019300474703571013">"Začnite reštartovaním zariadenia. Potom môžete pridať ďalšiu SIM kartu."</string>
     <string name="sim_action_continue" msgid="1688813133152389943">"Pokračovať"</string>
@@ -5103,6 +5157,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Vyberte SIM kartu a znova ju vložte. Ak bude problém pretrvávať, reštartujte zariadenie."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Skúste SIM kartu znova zapnúť. Ak bude problém pretrvávať, reštartujte zariadenie."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivácia siete"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Prepnutie operátora"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Operátor <xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktívny"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Klepnutím aktualizujete nastavenia SIM karty"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Prepnuté na operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5267,8 +5322,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Vypnuté"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM karty"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Zobrazenie sietí režimu v lietadle"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Nájdite siete v režime v lietadle a pripojte sa k nim."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Vyhľadanie a pripojenie sa k sieťam Wi-Fi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lietadlo, možné používať v lietadle"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Hovory a SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Volanie cez Wi‑Fi"</string>
@@ -5282,22 +5336,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"nie je k dispozícii"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Dočasne nedostupný"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Žiadna SIM karta"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Predvoľby"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Nastavenia siete"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Pripájať k verejným sieťam"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"pripojenie k sieti, internet, bezdrôtové, dátové, wifi, wi-fi, wi fi, mobilné, mobilný operátor, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Zobraziť siete režimu v lietadle"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Zobrazujú sa siete režimu v lietadle"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Zapnúť siete"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Vypnúť siete"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Chcete internet resetovať?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Týmto ukončíte telefonický hovor"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Týmto ukončíte telefonický hovor"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Internet sa resetuje…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Odstrániť problém s pripojením"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Siete dostupné v režime v lietadle"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Ak chcete prepnúť siete, odpojte ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Počas pripojenia nie je možné prepnúť siete"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Siete režimu v lietadle"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Pripojené"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet sa nepripojí automaticky"</string>
@@ -5318,6 +5371,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Farba"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Iné"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Všeobecné"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Zobraziť všetky aplikácie"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Inteligentné presmerovanie"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Inteligentné presmerovanie je aktivované"</string>
@@ -5331,4 +5388,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Zadajte telefónne číslo"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Chýba telefónne číslo."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Povoliť 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Použite mobilné pripojenie 2G. Pre tiesňové volania je 2G stále zapnuté."</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9ea9506..2966d66 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -54,9 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Pomanjšava ali povečava besedila na zaslonu"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Pomanjšanje"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Povečanje"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Uporaba samodejnega zasuka"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Vzorčno besedilo"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Čudoviti čarovnik iz Oza"</string>
@@ -413,15 +412,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> prstnih odtisov je nastavljenih</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Odklepanje s prstnim odtisom"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Nastavitev prstnega odtisa"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Uporaba prstnega odtisa"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Dotaknite se tipala prstnih odtisov, če želite odkleniti telefon, odobriti nakupe ali se prijaviti v aplikacije. Pazite, čigave prstne odtise boste dodali. Ta dejanja bo mogoče izvesti že z enim dodanim prstnim odtisom."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Prstni odtis bo morda manj varen kot zapleten vzorec ali koda PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Vse imate pod nadzorom"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Upoštevajte"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Podatki, ki jih zabeleži Prstni odtis, so varno shranjeni in nikoli ne zapustijo telefona. Podatke lahko kadar koli izbrišete v nastavitvah."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Prstni odtis bo morda manj varen kot zapleten vzorec ali koda PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Telefon bo nedavne slike prstnih odtisov občasno uporabil za ustvarjanje izboljšanih modelov prstnih odtisov."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"S prstnim odtisom odklenite telefon ali odobrite nakupe.\n\nOpomba: prstnega odtisa ne morete uporabiti za odklepanje te naprave. Za več informacij se obrnite na skrbnika v organizaciji."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"S prstnim odtisom odklenite telefon ali odobrite nakupe.\n\nOpomba: Prstni odtis bo morda manj varen kot zapleten vzorec ali koda PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Prekliči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, hvala"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Naprej"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Strinjam se"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Naprej"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Brez prstnega odtisa?"</string>
@@ -438,16 +443,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Preskoči"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Prekliči"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Dotaknite se tipala"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Dotik in pridržanje ikone prstnih odtisov"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Je na hrbtni strani telefona. Uporabite kazalec."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Na zaslonu je. Poiščite prstni odtis s svetlečim krogcem."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Tipalo prstnih odtisov je na zaslonu. Najdete ga tako, da prst premaknete po zaslonu."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustracija z napravo in lokacijo tipala prstnih odtisov"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Ime"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"V redu"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Izbriši"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Dotaknite se tipala"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Položite prst na tipalo in ga dvignite, ko začutite vibriranje"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Dvignite in se spet dotaknite"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Še naprej privzdigujte prst, da dodate različne dele prstnega odtisa"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Prstni odtis dodan"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Ko je prikazana ta ikona, uporabite prstni odtis za identifikacijo ali odobritev nakupov"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Pozneje"</string>
@@ -1216,14 +1230,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Iskanje"</string>
     <string name="display_settings" msgid="7197750639709493852">"Zaslon"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Samodejno zasukaj zaslon"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Izklopljeno"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Vklopljeno"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Vklopljeno – na podlagi obraza"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Omogoči zaznavanje obraza"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Barve"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naravne"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Poudarjene"</string>
@@ -1268,7 +1278,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Vklopljeno / zaslon se ne bo izklopil, če ga gledate"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Izklopljeno"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Potreben je dostop do fotoaparata"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Dotaknite se, če želite upravljati dovoljenja za storitve osebnega prilagajanja naprave"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Preprečuje, da bi se zaslon izklopil, če ga gledate"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Funkcija zaznavanja pogleda na zaslon uporablja sprednji fotoaparat, da zazna, ali kdo gleda zaslon. Funkcija se izvaja v napravi, slike pa se v nobenem primeru ne shranijo in ne pošiljajo Googlu."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Vklop zaznavanja pogleda na zaslon"</string>
@@ -1349,7 +1362,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Ko zaslon ni osvetljen, se vklopi ob novih obvestilih"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Vedno pokaži uro in informacije"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Povečana poraba baterije"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Krepko besedilo"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Krepko besedilo"</string>
     <string name="title_font_size" msgid="570613010306330622">"Velikost pisave"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Pomanjšava ali povečava besedila"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Nastavitve zaklepanja SIM"</string>
@@ -1520,6 +1533,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Drugi uporabniki"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Shramba naprave"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Prenosna shramba"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmi in opomniki"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Dovoli nastavljanje alarmov ali opomnikov"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmi in opomniki"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Tej aplikaciji dovolite nastavljanje alarmov ali drugih časovnih dogodkov. S tem boste aplikaciji omogočili, da se prebudi iz stanja pripravljenosti in zažene, celo kadar naprave ne uporabljate. Upoštevajte, da s preklicem tega dovoljenja lahko povzročite nepravilno delovanje aplikacije – alarmi, ki jih je nastavila aplikacija, ne bodo več delovali."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"urnik, razpored, alarm, opomnik, dogodek"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Uporabljeno <xliff:g id="USED">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Uporabljeno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1769,7 +1787,8 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Lokacijske storitve"</string>
     <string name="location_title" msgid="5819154746934945021">"Moja lokacija"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokacija za delovni profil"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Dostop aplikacij do lokacije"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Zaznavanje lokacije je izklopljeno"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> Dostop do lokacije ima <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> od <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplikacij</item>
@@ -1777,24 +1796,24 @@
       <item quantity="few"> Dostop do lokacije ima <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> od <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplikacij</item>
       <item quantity="other"> Dostop do lokacije ima <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> od <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplikacij</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Nedavni dostop do lokacije"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Ogled podrobnosti"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"V zadnjem času ni nobena aplikacija zahtevala lokacijskih podatkov"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Nobena aplikacija ni nedavno dostopala do lokacije"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Visoka poraba baterije"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Nizka poraba baterije"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Iskanje omrežij Wi‑Fi in naprav Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Iskanje omrežij Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Aplikacijam in storitvam omogoči, da kadar koli iščejo omrežja Wi-Fi, tudi ko je Wi-Fi izklopljen. To funkcijo lahko na primer uporabite, če želite izboljšati funkcije in storitve, ki pri delovanju uporabljajo lokacijo."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Iskanje naprav Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Aplikacijam in storitvam omogoči, da kadar koli iščejo naprave v bližini, tudi ko je Bluetooth izklopljen. To funkcijo lahko na primer uporabite, če želite izboljšati funkcije in storitve, ki pri delovanju uporabljajo lokacijo."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Lokacijske storitve"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Lokacijske storitve za službo"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Uporaba lokacije za zaznavanje časovnega pasu"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Uporaba lokacije za zaznavanje časovnega pasu"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Dovoli uporabo lokacije naprave za zaznavanje trenutnega časovnega pasu. Druge nastavitve lokacije, na primer iskanje omrežij Wi‑Fi, lahko vplivajo na natančnost zaznavanja časovnega pasu."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Vklopljeno"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Izklopljeno"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Samodejno zaznavanje časovnega pasu je onemogočeno"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Samodejno nastavljanje časovnega pasu je izklopljeno."</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Uporaba lokacije za zaznavanje časovnega pasu je onemogočeno"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Uporaba lokacije za zaznavanje časovnega pasu ni podprta"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Spremembe uporabe lokacije za zaznavanje časovnega pasu niso dovoljene"</string>
@@ -1977,10 +1996,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Omogoči"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Počisti shrambo"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Odmesti posodobitve"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Izbrali ste, da se bo pri nekaterih dejanjih ta aplikacija samodejno zagnala."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Nekatere dejavnosti, ki ste jih izbrali, se privzeto odprejo v tej aplikaciji."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Aplikaciji dovolite, da ustvari pripomočke in dostopa do njihovih podatkov."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Ni privzetih nastavitev."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Počisti privzete nastavitve"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Počisti privzete nastavitve"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Ta aplikacija morda ni namenjena za vaš zaslon. Tu lahko nastavite način prilagajanja zaslonu."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Vprašaj, ko se zažene"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Upravljanje aplikacij"</string>
@@ -2192,7 +2211,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"To napravo lahko prilagodite svojim potrebam. Te funkcije za ljudi s posebnimi potrebami lahko pozneje spremenite v nastavitvah."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Spremenite velikost pisave"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Bralniki zaslona"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Zvok in besedilo na zaslonu"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Podnapisi"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Zvok"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Splošno"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Zaslon"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Besedilo in prikaz"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Potemnitev zaslona"</string>
@@ -2347,7 +2368,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rdeča – zelena"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rdeča – zelena"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Modra – rumena"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Zmanjšanje svetlosti"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Zmanjšanje svetlosti"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Nastavite lahko, da bo zaslon telefona temnejši od najmanjše svetlosti."</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Nastavite lahko, da bo zaslon tabličnega računalnika temnejši od najmanjše svetlosti."</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Potemnite zaslon, da bo branje prijetnejše.&lt;br/&gt;&lt;br/&gt; To je uporabno v teh primerih: &lt;ol&gt; &lt;li&gt; Privzeta najmanjša svetlost zaslona telefona je presvetla.&lt;/li&gt; &lt;li&gt; Telefon uporabljate v temnih okoliščinah, na primer ponoči ali v temni sobi, preden greste spat.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3422,8 +3443,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"obraz"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"prstni odtis, dodajanje prstnega odtisa"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"zatemnitev zaslona, zaslon na dotik, baterija, pametna svetlost, dinamična svetlost, samodejno prilagajanje svetlosti"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"zatemnitev zaslona, stanje pripravljenosti, akumulator, baterija, časovna omejitev, zaznavanje pogleda, prikaz, zaslon, nedejavnost"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"zavrteti, obrniti, vrtenje, pokončno, ležeče, postavitev, navpično, vodoravno"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"nadgradnja, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"ne moti, razpored, obvestila, blokirati, utišati, vibriranje, spanje, delo, zbranost, izklopiti zvok, dan, delavnik, vikend, noč med tednom, dogodek"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"zaslon, čas zaklepanja, časovna omejitev, zaklenjen zaslon"</string>
@@ -3592,9 +3615,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Melodije zvonjenja"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Drugi zvoki in vibriranja"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Obvestila"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Pogovor"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nedavno poslano"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Prikaz vseh za zadnjih 7 dni"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Dodatno"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Splošno"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Obvestila za delovni profil"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Prilagodljiva obvestila"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prilagodljiva prednost obvestil"</string>
@@ -3656,7 +3680,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Prikaz na poteznem zaslonu z obvestili, v vrstici stanja in na zaklenjenem zaslonu"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Skrivanje tihih obvestil v vrstici stanja"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Utripajoča lučka"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Obvestila na zaklenjenem zaslonu"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Zasebnost"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Preskok zaklenjenega zaslona"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Po odklepanju z obrazom se odpre nazadnje uporabljeni zaslon"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"odklepanje zaslona, zaklenjen zaslon, preskok, zaobitje"</string>
@@ -3751,7 +3775,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> obvestil na teden</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Nikoli"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Dostop do obvestil"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Obvestila naprave in aplikacij"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Upravljajte, katera obvestila se prikažejo v aplikacijah in napravah."</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Dostop do obvestil delovnega profila je blokiran"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Aplikacije ne morejo brati obvestil"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3772,17 +3797,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Izklop"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Prekliči"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Dovoljene vrste obvestil"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Pomembna sprotna obvestila"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Obvestila za pogovor"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Obvestila z opozorilom"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Tiha obvestila"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"V realnem času"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Komunikacija v realnem času iz aplikacij v uporabi, navigacije, telefonskih klicev in od drugod."</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Pogovori"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"Sporočila SMS in druga komunikacija"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Privzeto"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Obvestila, ki lahko sprožijo zvonjenje ali vibriranje (odvisno od nastavitev)."</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Tiho"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Obvestila, ki nikoli ne sprožijo zvonjenja ali vibriranja."</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Prikaz vseh aplikacij"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Spremenite nastavitve obvestil za vsako aplikacijo, ki lahko pošilja obvestila."</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Aplikacije, prikazane v napravi"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Storitve za pomoč za VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Nobena nameščena aplikacija ni zahtevala izvajanja kot storitev za pomoč za VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Dovolite storitvi <xliff:g id="SERVICE">%1$s</xliff:g> dostop za storitev za VR?"</string>
@@ -4082,9 +4107,36 @@
     <string name="launch_by_default" msgid="892824422067985734">"Privzeto odpiranje"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Odpiranje povezav"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Odpiranje podprtih povezav"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Podprte povezave se odprejo v tej aplikaciji."</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Povezave za odpiranje v tej aplikaciji"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Odpiranje brez vprašanj"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Podprte povezave"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Druge privzete nastavitve"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Druge privzete nastavitve"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Dodajanje povezave"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Aplikacija lahko preveri povezave za samodejno odpiranje v tej aplikaciji. "<annotation id="url">"Več o tem"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> preverjena povezava</item>
+      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> preverjeni povezavi</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> preverjene povezave</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> preverjenih povezav</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Te povezave so preverjene in se samodejno odprejo v tej aplikaciji.</item>
+      <item quantity="two">Ti povezavi sta preverjeni in se samodejno odpreta v tej aplikaciji.</item>
+      <item quantity="few">Te povezave so preverjene in se samodejno odprejo v tej aplikaciji.</item>
+      <item quantity="other">Te povezave so preverjene in se samodejno odprejo v tej aplikaciji.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"V redu"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Iskanje drugih podprtih povezav …"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Prekliči"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> podprta povezava</item>
+      <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> podprti povezavi</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> podprte povezave</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> podprtih povezav</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Dodaj"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Odpre se v aplikaciji <xliff:g id="APP_LABEL">%s</xliff:g>."</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"Uporabljeno: <xliff:g id="SIZE">%1$s</xliff:g> – <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"notranja shramba"</string>
     <string name="storage_type_external" msgid="125078274000280821">"zunanja shramba"</string>
@@ -4399,7 +4451,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Fotoaparat ni omogočen"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Ustvarjanje posnetka zaslona ni omogočeno"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Te aplikacije ni mogoče odpreti"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Če imate vprašanja, se obrnite na skrbnika za IT"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Več podrobnosti"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Skrbnik lahko nadzira in upravlja aplikacije ter podatke, povezane s tem delovnim profilom, vključno z nastavitvami, dovoljenji, dostopom za podjetje, omrežno dejavnostjo in podatki o lokaciji naprave."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Skrbnik lahko nadzira in upravlja aplikacije ter podatke, povezane s tem uporabnikom, vključno z nastavitvami, dovoljenji, dostopom za podjetje, omrežno dejavnostjo in podatki o lokaciji naprave."</string>
@@ -4482,7 +4535,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> omejitev</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operaterjeve meritve prenosa podatkov so morda drugačne kot v napravi"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ne vključuje podatkov, prenesenih v omrežjih operaterjev"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Ne vključuje podatkov, ki jih uporabljajo omrežja operaterjev."</string>
     <string name="data_used_template" msgid="8229342096562327646">"Preneseno: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Nastavi opozorilo za prenos podatkov"</string>
     <string name="data_warning" msgid="2925054658166062884">"Opozorilo za prenos podatkov"</string>
@@ -4845,7 +4898,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(odstranjeno za uporabnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(onemogočeno za uporabnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Storitev samodejnega izpolnjevanja"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"samodejno, izpolnjevanje, samoizpolnjevanje"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Gesla"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"samodejno, izpolnjevanje, samodejno izpolnjevanje, geslo"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Prepričajte se, ali zaupate tej aplikaciji&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Samodejno izpolnjevanje&gt;%1$s&lt;/xliff:g&gt; iz elementov na zaslonu ugotovi, kaj je mogoče samodejno izpolniti."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Samodejno izpolnjevanje"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Raven pisanja dnevnika"</string>
@@ -5054,7 +5108,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Sprememba načina delovanja omrežja"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Prednostna vrsta omrežja"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operater"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Različica nastavitev"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operaterjeve nastavitve različice"</string>
     <string name="call_category" msgid="641461844504128789">"Klicanje"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videoklicanje prek operaterja"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sistemska izbira"</string>
@@ -5103,6 +5157,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Kartico SIM odstranite in jo znova vstavite. Če s tem ne odpravite težave, znova zaženite napravo."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Poskusite znova vklopiti kartico SIM. Če s tem ne odpravite težave, znova zaženite napravo."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivacija omrežja"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Preklop operaterja"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Operater <xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktiven"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Dotaknite se, če želite posodobiti nastavitve kartice SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Preklopljeno na omrežje operaterja <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5267,8 +5322,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Izklopljeno"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Kartice SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Prikaz omrežij za uporabo v letalu"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Iskanje omrežij v načinu za letalo in povezovanje z njimi"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Poiščite omrežja Wi-Fi in vzpostavite povezavo z njimi."</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"letalo, varno za uporabo v letalu"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Klici in sporočila SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Klicanje prek Wi‑Fi-ja"</string>
@@ -5282,22 +5336,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ni na voljo"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Začasno ni na voljo"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ni kartice SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Nastavitve"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Omrežne nastavitve"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Povezovanje z javnimi omrežji"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"omrežna povezava, internet, brezžično, podatki, wifi, wi-fi, wi fi, mobilno omrežje, mobilno, mobilni operater, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Prikaži omrežja za uporabo v letalu"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Ogled omrežij za uporabo v letalu"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Vklop omrežij"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Izklop omrežij"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Želite ponastaviti internetno povezavo?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"S tem boste končali telefonski klic."</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"S tem boste končali telefonski klic."</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Ponastavljanje internetne povezave …"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Odpravljanje težav s povezavo"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Razpoložljiva omrežja v načinu za letalo"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Če želite preklopiti omrežje, prekinite ethernetno povezavo."</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Preklop med omrežji ni mogoč ob vzpostavljeni povezavi."</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Omrežja v načinu za letalo"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Povezano"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Samodejna povezava z internetom ni mogoča"</string>
@@ -5318,6 +5371,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Barva"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Drugo"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Splošno"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Prikaz vseh aplikacij"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Pametno posredovanje"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Pametno posredovanje je omogočeno."</string>
@@ -5331,4 +5388,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Vnesite telefonsko številko"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Manjka telefonska številka."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"V redu"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Omogočenje 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Uporaba mobilnih internetnih povezav 2G. Za klice v sili se vedno vklopi povezava 2G."</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index a9f0e1d..244a83f 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Zvogëlo"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Zmadho"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Përdor \"Rrotullimin automatik\""</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"\"Rrotullimi automatik\" në bazë të fytyrave përdor kamerën e përparme për të parë nëse dhe se si dikush po shikon tek ekrani. Lejon leximin ndërkohë që je shtrirë dhe imazhet asnjëherë nuk ruhen dhe as nuk dërgohen te Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Mëso më shumë&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Teksti shembull"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Magjistari i mrekullueshëm i Ozit"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Kapitulli 11: Qyteti i mrekullueshëm i smeraldtë i Ozit"</string>
@@ -403,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> gjurmë gishti u konfigurua</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Shkyçe me gjurmën e gishtit"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Konfiguro gjurmën e gishtit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Përdor gjurmën e gishtit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Thjesht prek te sensori i gjurmës së gishtit për të shkyçur telefonin, për të autorizuar blerjet ose për t\'u identifikuar tek aplikacionet. Ki kujdes se gjurmët e kujt shton. Çdo gjurmë gishti e shtuar mund t\'i kryejë këto gjëra."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Gjurma e gishtit mund të jetë më pak e sigurt se sa një kod PIN ose motiv i fortë."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Kontrolli është në duart e tua"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Mbaje mend"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Të dhënat e regjistruara nga \"Gjurma e gishtit\" ruhen në mënyrë të sigurt dhe nuk largohen asnjëherë nga telefoni yt. Të dhënat e tua mund t\'i fshish në çdo moment te \"Cilësimet\"."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Gjurma e gishtit mund të jetë më pak e sigurt se sa një kod PIN ose motiv i fortë."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Telefoni yt do të përdorë herë pas here imazhet e fundit të gjurmës së gishtit për të krijuar modele të përmirësuara të gjurmës së gishtit."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Përdor gjurmën e gishtit për të shkyçur telefonin ose për të miratuar blerjet.\n\nShënim. Nuk mund ta përdorësh gjurmën tënde të gishtit për ta shkyçur këtë pajisje. Për më shumë informacione, kontakto me administratorin e organizatës tënde."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Përdor gjurmën e gishtit për të shkyçur telefonin ose për të miratuar blerjet.\n\nShënim. Gjurma e gishtit mund të jetë më pak e sigurt se sa një kod PIN ose motiv i fortë."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Anulo"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Jo, faleminderit"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Kapërce"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Vazhdo"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Prano"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Kapërce"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Përpara"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Të kapërcehet gjurma e gishtit?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Kapërce"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Anulo"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Prek sensorin"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Prek dhe mbaj prekur ikonën e gjurmës së gishtit"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Ndodhet në pjesën e pasme të telefonit. Përdor gishtin tregues."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Është në ekran. Shiko për gjurmën e gishtit me rrethin e ndriçuar."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Sensori i gjurmës së gishtit është në ekranin tënd. Lëvize gishtin nëpër ekran për ta gjetur atë."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ilustrim me pajisjen dhe vendndodhjen e sensorit të gjurmës së gjishtit"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Emri"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Në rregull"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Fshi"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Prek sensorin"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Vendose gishtin mbi sensor dhe ngrije pasi të ndjesh një dridhje"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Ngrije dhe më pas prek përsëri"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Vazhdo ta ngresh gishtin për të shtuar pjesë të ndryshme të gjurmës së gishtit"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Gjurma e gishtit u shtua"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Kur shikon këtë ikonë, përdor gjurmën e gishtit për identifikim ose për të miratuar blerjet"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Bëje më vonë"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aktiv / Ekrani nuk do të fiket nëse shikon tek ai"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Joaktiv"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Nevojitet qasja te kamera"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Trokit për të menaxhuar autorizimet për \"Shërbimet e personalizimit të pajisjes\""</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Parandalon fikjen e ekranit nëse shikon tek ai"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Vëmendja ndaj ekranit përdor kamerën e përparme për të parë nëse dikush po shikon tek ekrani. Funksionon në pajisje dhe imazhet nuk dërgohen apo ruhen asnjëherë te Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Aktivizo vëmendjen ndaj ekranit"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kur ekrani është i errët, ai aktivizohet për njoftimet e reja"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Shfaq gjithmonë kohën dhe informacionin"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Përdorimi i rritur i baterisë"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Tekst i trashë"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Tekst i trashë"</string>
     <string name="title_font_size" msgid="570613010306330622">"Madhësia e shkrimit"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Bëje tekstin më të madh ose më të vogël"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Kyçja e kartës SIM"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Përdorues të tjerë"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Hapësira për ruajtje e pajisjes"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Hapësira ruajtëse e lëvizshme"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmet dhe alarmet rikujtuese"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Lejo që të caktohen alarmet dhe alarmet rikujtuese"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmet dhe alarmet rikujtuese"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Lejo që ky aplikacion të planifikojë alarmet dhe ngjarje të tjera të bazuara tek orari. Kjo do ta lejojë aplikacionin të zgjohet dhe të ekzekutohet edhe kur ti nuk e përdor pajisjen. Ki parasysh se anulimi i kësaj lejeje mund të shkaktojë keqfunksionim të aplikacionit. Në mënyrë specifike, çdo alarm që ka planifikuar aplikacioni nuk do të funksionojë më."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"planifiko, alarm, alarm rikujtues, ngjarje"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> të përdorura nga <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Përdorur nga gjithsej <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Shërbimet e vendndodhjes"</string>
     <string name="location_title" msgid="5819154746934945021">"Vendndodhja ime"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Vend. për profilin e punës"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Qasja e aplikacionit në vendndodhje"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Vendndodhja është joaktive"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> nga <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> aplikacione kanë qasje te vendndodhja</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> nga <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> aplikacione ka qasje te vendndodhja</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Qasja te vendndodhja e fundit"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Shiko detajet"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Asnjë aplikacion nuk ka kërkuar vendndodhje kohët e fundit"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Asnjë aplikacion nuk ka pasur qasje te vendndodhja së fundi"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Përdorimi i lartë i baterisë"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Përdorim i ulët baterie"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Skanimi për Wi‑Fi dhe Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Skanimi i Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Lejo që aplikacionet dhe shërbimet të skanojnë për rrjete Wi-Fi në çdo moment, edhe kur Wi-Fi është joaktiv. Kjo mund të përdoret, për shembull, për të përmirësuar funksionet dhe shërbimet e bazuara te vendndodhja."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Skanimi i Bluetooth-it"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Lejo që aplikacionet dhe shërbimet të skanojnë për pajisje në afërsi në çdo moment, edhe kur Bluetooth është joaktiv. Kjo mund të përdoret, për shembull, për të përmirësuar funksionet dhe shërbimet e bazuara te vendndodhja."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Shërbimet e vendndodhjes"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Shërbimet e vendndodhjes për punë"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Zbulimi i brezit orar të vendndodhjes"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Zbulimi i brezit orar të vendndodhjes"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Lejon vendndodhjen e pajisjes që të përdoret për të zbuluar brezin orar aktual. Cilësimet e tjera të vendndodhjes si skanimi për Wi‑Fi mund të ndikojnë në saktësinë e zbulimit të brezit orar."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Aktiv"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Joaktiv"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Zbulimi automatik i brezit orar është çaktivizuar"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Brezi orar automatik është joaktiv"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Zbulimi i brezit orar të vendndodhjes është çaktivizuar"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Zbulimi i brezit orar të vendndodhjes nuk mbështetet"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Nuk lejohen ndryshimet në zbulimin e brezit orar të vendndodhjes"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Aktivizo"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Pastro hapësirën ruajtëse"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Çinstalo përditësimet"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Ke zgjedhur që ta hapësh këtë aplikacion në mënyrë të parazgjedhur për disa veprime."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Disa aktivitete që ke zgjedhur hapen në këtë aplikacion si parazgjedhje."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Ke zgjedhur ta lejosh këtë aplikacion të krijojë dhe të ketë qasje te të dhënat e tyre."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Nuk ka parazgjedhje të caktuara."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Fshi parazgjedhjet"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Pastro preferencat e parazgjedhura"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Ky aplikacion mund të mos jetë i projektuar për ekranin tënd. Mund të kontrollosh si përputhet me ekranin tënd këtu."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Pyet kur të hapet"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Shkallëzo aplikacionin"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Mund ta personalizosh këtë pajisje për t\'iu përshtatur nevojave të tua. Këto veçori të qasshmërisë mund të ndryshohen më vonë te \"Cilësimet\"."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Ndrysho madhësinë e shkrimit"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Lexuesit e ekranit"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audioja dhe teksti në ekran"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Titrat"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Të përgjithshme"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekrani"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Teksti dhe ekrani"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Bëj ekranin më të errët"</string>
@@ -2152,7 +2179,7 @@
     <string name="talkback_summary" msgid="5820927220378864281">"Një lexues i ekranit kryesisht për personat e verbër dhe me shikim të dobët"</string>
     <string name="select_to_speak_summary" msgid="1995285446766920925">"Trokit artikujt në ekran për t\'i dëgjuar të lexuar me zë të lartë"</string>
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferencat e titrave"</string>
-    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Zmadhimi"</string>
+    <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"zmadhimit"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Zona e zmadhimit"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Zgjidh zonën(at) e zmadhimit që dëshiron të përdorësh kur zmadhon ekranin"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Ekrani i plotë"</string>
@@ -2276,7 +2303,7 @@
     </plurals>
     <string name="accessibility_audio_adjustment_title" msgid="1332113739136802997">"Rregullimi i audios"</string>
     <string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Shkurtorja aktive"</string>
-    <string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Joaktive"</string>
+    <string name="accessibility_summary_shortcut_disabled" msgid="564005462092499068">"Joaktiv"</string>
     <string name="accessibility_summary_state_enabled" msgid="1065431632216039369">"Aktiv"</string>
     <string name="accessibility_summary_state_disabled" msgid="9173234532752799694">"Joaktiv"</string>
     <string name="accessibility_summary_state_stopped" msgid="2343602489802623424">"Nuk funksionon. Trokit për informacione."</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"E kuqe - e gjelbër"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"E kuqe - e gjelbër"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"E kaltër - e verdhë"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Redukto ndriçimin"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Redukto ndriçimin"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Bëje ekranin më të errët se ndriçimi minimal i telefonit"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Bëje ekranin më të errët se ndriçimi minimal i tabletit"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Bëje ekranin më të errët në mënyrë që të jetë më komod për t\'u lexuar.&lt;br/&gt;&lt;br/&gt; Kjo mund të jetë e dobishme kur: &lt;ol&gt; &lt;li&gt; Ndriçimi minimal i parazgjedhur i telefonit tënd është përsëri tepër i ndritshëm&lt;/li&gt; &lt;li&gt; Po e përdor telefonin në situata të errëta, si natën ose në një dhomë të errët përpara gjumit&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"fytyrë"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"gjurmë gishti, shto një gjurmë gishti"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"errëso ekranin, ekrani me prekje, bateria, ndriçimi inteligjent, ndriçimi dinamik, ndriçimi automatik"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"errëso ekranin, në gjumë, bateria, koha e pritjes, vëmendja, ekrani, mungesa e aktivitetit"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"rrotullo, përmbys, rrotullim, portret, peizazh, orientimi, vertikal, horizontal"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"përmirëso, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"mos shqetëso, planifikimi, njoftimet, blloko, heshtje, dridhje, gjumë, punë, fokusi, tingull, hiq zërin, ditë, ditë jave, fundjavë, natë jave, ngjarje"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ekrani, koha e kyçjes, koha e pritjes, ekrani i kyçjes"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Zilet"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Tinguj dhe dridhje të tjera"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Njoftimet"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Biseda"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Dërguar së fundi"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Shih të gjithë apl. në 7 ditët e fundit"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Të përparuara"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Të përgjithshme"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Njoftimet e punës"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Njoftimet me përshtatje"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Përparësia e njoftimeve me përshtatje"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Shfaq në strehën me tërheqje poshtë, shiritin e statusit dhe në ekranin e kyçjes"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Fshih njoftimet në heshtje në shiritin e statusit"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Drita me pulsim"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Njoftimet në ekranin e kyçjes"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privatësia"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Të kapërcyer ekranin e kyçjes"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Pas shkyçjes me fytyrë, shko direkt te ekrani i fundit i përdorur"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ekrani i kyçjes, ekrani i bllokimit, kapërce, anashkalo"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> njoftim në javë</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Asnjëherë"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Qasja te njoftimet"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Njoftimet e pajisjes dhe aplikacioneve"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Kontrollo cilat njoftimet shfaqen në aplikacionet dhe pajisjet e tua"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Qasja në njoftimet e profilit të punës është bllokuar"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Aplikacionet nuk mund t\'i lexojnë njoftimet"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3662,25 +3693,25 @@
     <string name="no_notification_assistant" msgid="2533323397091834096">"Asnjë"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"Asnjë apl. i instaluar nuk ka kërkuar qasje te njoftimet."</string>
     <string name="notification_access_detail_switch" msgid="46386786409608330">"Lejo qasjen te njoftimet"</string>
-    <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"Të lejohet qasja e njoftimeve për <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"Të lejohet qasja te njoftimet për <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g> do të jetë në gjendje të lexojë të gjitha njoftimet, duke përfshirë informacione personale të tilla si emrat e kontakteve dhe tekstin e mesazheve që merr. Ky aplikacion do të jetë gjithashtu në gjendje të largojë njoftimet ose të veprojë mbi butonat te njoftimet, duke përfshirë përgjigjen ndaj telefonatave. \n\nKjo do t\'i japë aplikacionit aftësinë për të aktivizuar ose çaktivizuar \"Mos shqetëso\" dhe për të ndryshuar cilësimet përkatëse."</string>
     <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"Të lejohet qasja te njoftimet për <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> do të jetë në gjendje të lexojë të gjitha njoftimet, duke përfshirë informacione personale të tilla si emrat e kontakteve dhe tekstin e mesazheve që merr. Ky aplikacion do të jetë gjithashtu në gjendje të largojë njoftimet ose të veprojë mbi butonat te njoftimet, duke përfshirë përgjigjen ndaj telefonatave. \n\nKjo do t\'i japë aplikacionit aftësinë për të aktivizuar ose çaktivizuar \"Mos shqetëso\" dhe për të ndryshuar cilësimet përkatëse."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Nëse çaktivizon qasjen e njoftimeve për <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, mund të çaktivizohet edhe qasja e \"Mos shqetëso\"."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"Nëse çaktivizon qasjen te njoftimet për <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, mund të çaktivizohet edhe qasja te \"Mos shqetëso\"."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Çaktivizo"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Anulo"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Llojet e njoftimeve të lejuara"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Njoftimet e rëndësishme të vazhdueshme"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Njoftimet e bisedës"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Njoftimet sinjalizuese"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Njoftimet në heshtje"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Kohë reale"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Komunikimi në kohë reale nga aplikacionet në përdorim, navigimi, telefonatat etj."</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Biseda"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS ose komunikime të tjera"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Parazgjedhja"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Njoftimet për të cilat mund të bjerë zilja ose mund të dridhen në bazë të cilësimeve"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Në heshtje"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Njoftimet që asnjëherë nuk nxjerrin tinguj ose dridhje"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Shiko të gjitha aplikacionet"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Ndrysho cilësimet e njoftimeve për secilin aplikacion që mund të dërgojë njoftime"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Aplikacionet që shfaqen në pajisje"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Shërbimet e ndihmësit VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Asnjë aplikacion i instaluar nuk ka kërkuar të ekzekutohet si shërbim ndihmësi VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Të lejohet qasja e shërbimit VR për <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Hap me parazgjedhje"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Lidhjet po hapen"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Hap lidhjet e mbështetura"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Lidhjet e mbështetura hapen në këtë aplikacion"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Lidhje që hapen në këtë aplikacion"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Hape pa pyetur"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Lidhjet e mbështetura"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Parazgjedhjet e tjera"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Preferenca të tjera të parazgjedhura"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Shto lidhje"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Një aplikacion mund t\'i verifikojë lidhjet që të hapen automatikisht në aplikacion. "<annotation id="url">"Mëso më shumë"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> lidhje të verifikuara</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> lidhje e verifikuar</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Këto lidhje verifikohen dhe hapen automatikisht në këtë aplikacion.</item>
+      <item quantity="one">Kjo lidhje është verifikuar dhe hapet automatikisht në këtë aplikacion.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Në rregull"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Po kontrollon për lidhje të tjera të mbështetura…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Anulo"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> lidhje të mbështetura</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> lidhje e mbështetur</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Shto"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Hapet në <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> përdorur në <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"hap. ruajtëse e brendshme"</string>
     <string name="storage_type_external" msgid="125078274000280821">"hap. ruajtëse e jashtme"</string>
@@ -4173,7 +4225,7 @@
     <string name="no_data_usage" msgid="4665617440434654132">"Nuk janë përdorur të dhëna"</string>
     <string name="zen_access_warning_dialog_title" msgid="6323325813123130154">"Të lejohet qasja te \"Mos shqetëso\" për \"<xliff:g id="APP">%1$s</xliff:g>\"?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="8468714854067428987">"Aplikacioni do të jetë në gjendje të aktivizojë/çaktivizojë opsionin \"Mos shqetëso\", si dhe të bëjë ndryshimet në cilësimet përkatëse."</string>
-    <string name="zen_access_disabled_package_warning" msgid="6565908224294537889">"Duhet të qëndrojë e aktivizuar sepse qasja e njoftimeve është e aktivizuar"</string>
+    <string name="zen_access_disabled_package_warning" msgid="6565908224294537889">"Duhet të qëndrojë e aktivizuar sepse qasja te njoftimet është e aktivizuar"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="7377261509261811449">"Të anulohet qasja te \"Mos shqetëso\" për <xliff:g id="APP">%1$s</xliff:g>?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="8689801842914183595">"Të gjitha rregullat e \"Mos shqetëso\" të krijuara nga ky aplikacion, do të hiqen."</string>
     <string name="ignore_optimizations_on" msgid="6865583039303804932">"Mos optimizo"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Kamera nuk lejohet"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Pamja e ekranit nuk lejohet"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Ky aplikacion nuk mund të hapet"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Nëse ke pyetje, kontakto me administratorin e TI-së"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Më shumë detaje"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Administratori yt mund të monitorojë dhe të menaxhojë aplikacionet dhe të dhënat e lidhura me profilin tënd të punës, duke përfshirë cilësimet, lejet, qasjen e korporatës, aktivitetin e rrjetit dhe informacionet e vendndodhjes së pajisjes."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Administratori yt mund të monitorojë dhe të menaxhojë aplikacionet dhe të dhënat e lidhura me këtë përdorues, duke përfshirë cilësimet, lejet, qasjen e korporatës, aktivitetin e rrjetit dhe informacionet e vendndodhjes së pajisjes."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="one">1 kufizim</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Llogaritja e të dhënave nga operatori mund të ndryshojë nga llogaritja e pajisjes"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Përjashton të dhënat që përdoren nga rrjetet e operatorit celular"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Përjashton të dhënat që përdoren nga rrjetet e operatorëve celularë"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> të përdorura"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Cakto paralajm. për të dhënat"</string>
     <string name="data_warning" msgid="2925054658166062884">"Paralajmërimi i të dhënave"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(çinstaluar për përdoruesin <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(çaktivizuar për përdoruesin <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Shërbimi i plotësimit automatik"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"plotësim, automatik, plotësim automatik"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Fjalëkalimet"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"automatikisht, plotëso, plotësimi automatik, fjalëkalim"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Sigurohu që ke besim te ky aplikacion&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Plotësimi automatik i Google&gt;%1$s&lt;/xliff:g&gt; përdor atë që ndodhet në ekranin tënd për të përcaktuar se çfarë mund të plotësohet automatikisht."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Plotësim automatik"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Niveli i identifikimit"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Ndrysho modalitetin e operimit të rrjetit"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Lloji i rrjetit të preferuar"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operatori celular"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Versioni i cilësimeve"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Versioni i cilësimeve të operatorit celular"</string>
     <string name="call_category" msgid="641461844504128789">"Po telefonon"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Telefonata me video e operatorit celular"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Përzgjedhja e sistemit"</string>
@@ -4924,7 +4978,7 @@
     <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operatori celular nuk mund të çaktivizohet"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Ndodhi një gabim dhe operatori celular nuk mund të çaktivizohet."</string>
     <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Dëshiron të përdorësh 2 karta SIM?"</string>
-    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Kjo pajisje mund të ketë 2 karta SIM aktive në të njëjtën kohë. Që të vazhdosh të përdorësh 1 kartë SIM në të njëjtën kohë, trokit te \"Jo, faleminderit\"."</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Kjo pajisje mund të ketë 2 karta SIM aktive në të njëjtën kohë. Që të vazhdosh të përdorësh vetëm 1 kartë SIM, trokit te \"Jo, faleminderit\"."</string>
     <string name="sim_action_restart_title" msgid="7054617569121993825">"Të riniset pajisja?"</string>
     <string name="sim_action_restart_text" msgid="8019300474703571013">"Për të filluar, rinise pajisjen tënde. Më pas mund të shtosh një kartë tjetër SIM."</string>
     <string name="sim_action_continue" msgid="1688813133152389943">"Vazhdo"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Hiq kartën SIM dhe fute përsëri. Nëse problemi vazhdon, rinise pajisjen."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Provo të aktivizosh kartën SIM përsëri. Nëse problemi vazhdon, rinise pajisjen."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivizimi i rrjetit"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Ndërrimi i operatorit celular"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> është aktiv"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Trokit për të përditësuar cilësimet e kartës SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Kaloi te <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -4952,7 +5007,7 @@
     <string name="switch_sim_dialog_no_switch_title" msgid="809763410787744247">"Nuk ka karta SIM aktive"</string>
     <string name="switch_sim_dialog_no_switch_text" msgid="7053939850026876088">"Për të përdorur të dhënat celulare, funksionet e telefonatave dhe mesazhet SMS më vonë, shko te cilësimet e tua të rrjetit"</string>
     <string name="sim_card_label" msgid="5632157635124050923">"Karta SIM"</string>
-    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Dëshiron ta pastrosh këtë kartë SIM të shkarkuar?"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Të spastrohet kjo kartë SIM e shkarkuar?"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"Spastrimi i kësaj karte SIM e heq shërbimin e <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> nga kjo pajisje.\n\nShërbimi për <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> nuk do të anulohet."</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Spastro"</string>
     <string name="erasing_sim" msgid="7877703231075699139">"Karta SIM po spastrohet…"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Joaktiv"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Interneti"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Kartat SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Shfaq rrjetet në modalitetin e aeroplanit"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Gjej dhe lidhu me rrjetet në modalitetin e aeroplanit."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Gjej rrjetet Wi‑Fi dhe lidhu me to"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplan, të sigurta për në aeroplan"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Telefonatat dhe SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Telefonatë me Wi-Fi"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"e padisponueshme"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Nuk ofrohet për momentin"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nuk ka kartë SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencat"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Preferencat e rrjetit"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Lidhu me rrjetet publike"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"lidhja e rrjetit, internet, pa tel, të dhëna, wifi, wi-fi, wi fi, rrjeti celular, celular, operatori celular, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Shiko rrjetet e modalitetit të aeroplanit"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Po shikon rrjetet në modalitetin e aeroplanit"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Aktivizo rrjetet"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Çaktivizo rrjetet"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Të rivendoset interneti?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Kjo do ta mbyllë telefonatën"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Kjo do ta mbyllë telefonatën"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Interneti po rivendoset…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Rregullo problemin me lidhshmërinë"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Ofrohen rrjete të modalitetit të aeroplanit"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Për të ndërruar rrjetet, shkëput eternetin"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Rrjetet nuk mund të ndërrohen kur je lidhur"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Rrjetet e \"Modalitetit të aeroplanit\""</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Lidhur"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Interneti nuk do të lidhet automatikisht"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Ngjyra"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Të tjera"</string>
     <string name="category_name_general" msgid="7737273712848115886">"E përgjithshme"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Shiko të gjitha aplikacionet"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Transferimi inteligjent"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Transferimi inteligjent është aktivizuar"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Fut numrin e telefonit"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Numri i telefonit mungon."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Në rregull"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Lejo 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Përdor lidhjet celulare 2G. Për telefonatat e urgjencës, 2G është gjithmonë e aktivizuar."</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index decc498..3cbd966 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -53,9 +53,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Омогућава да текст на екрану буде мањи или већи."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Умањи"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Увећај"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Користите аутоматско ротирање"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Пример текста"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Чаробњак из Оза"</string>
@@ -409,15 +408,21 @@
       <item quantity="other">Подешено је <xliff:g id="COUNT_1">%1$d</xliff:g> отисака прстију</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Откључајте отиском прста"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Подесите отисак прста"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Користите отисак прста"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Само додирните сензор за отисак прста да бисте откључали телефон, дали овлашћење за куповине или се пријавили у апликације. Водите рачуна о томе чије отиске прстију додајете. Чак и само један додати отисак може да обавља било које од ових радњи."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Отисак прста може да буде мање безбедан од јаког шаблона или PIN-а."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Ви имате контролу"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Имајте на уму"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Подаци који се забележе помоћу отиска прста безбедно се чувају и остају само на телефону. Можете да избришете податке у било ком тренутку у Подешавањима."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Отисак прста може да буде мање безбедан од јаког шаблона или PIN-а."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Телефон ће повремено користити недавне слике отиска прста да би правио побољшане моделе отиска прста."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Откључавајте телефон или одобравајте куповине помоћу отиска прста.\n\nНапомена: Не можете да откључавате овај уређај помоћу отиска прста. Више информација затражите од администратора организације."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Откључавајте телефон или одобравајте куповине помоћу отиска прста.\n\nНапомена: Отисак прста може да буде мање безбедан од јаког шаблона или PIN-а."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Откажи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Не, хвала"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Прескочи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Настави"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Прихватам"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Прескочи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Даље"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Прескачете отиске прстију?"</string>
@@ -434,16 +439,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Прескочи"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Откажи"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Додирните сензор"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Додирните и задржите икону отиска прста"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Налази се на задњој страни телефона. Користите кажипрст."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"На екрану је. Потражите отисак прста са светлећим кругом."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Сензор за отисак прста је на екрану. Померајте прст преко екрана да бисте га пронашли."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Илустрација са уређајем и локацијом сензора за отисак прста"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Назив"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Потврди"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Избриши"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Додирните сензор"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Ставите прст на сензор и подигните га када осетите вибрацију"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Подигните, па опет додирните"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Наставите да подижете прст да бисте додали различите делове отиска прста"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Отисак прста је додат"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Када видите ову икону, користите отисак прста ради идентификације или одобравања куповина"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Урадићу то касније"</string>
@@ -1196,14 +1210,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Претрага"</string>
     <string name="display_settings" msgid="7197750639709493852">"Екран"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Аутоматско ротирање екрана"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Искључено"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Укључено"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Укључено – на основу лица"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Омогући препознавање лица"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Боје"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Природне"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Појачане"</string>
@@ -1248,7 +1258,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Укључено/екран се неће искључити ако гледате у њега"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Искључено"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Потребан је приступ камери"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Додирните да бисте управљали дозволама за услуге персонализације уређаја"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Спречава искључивање екрана ако гледате у њега"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Пажња екрана користи предњу камеру да би утврдила да ли неко гледа у екран. Ради на уређају, а слике се никада не чувају нити шаљу Google-у."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Укључите пажњу екрана"</string>
@@ -1329,7 +1342,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Када је екран таман, укључује се амбијентални екран за нова обавештења"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Увек приказуј време и податке"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Потрошња батерије је повећана"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Подебљани текст"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Подебљани текст"</string>
     <string name="title_font_size" msgid="570613010306330622">"Величина фонта"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Омогућава да текст буде већи или мањи"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Закључавање SIM картице"</string>
@@ -1499,6 +1512,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Остали корисници"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Меморија уређаја"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Преносна меморија"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Аларми и подсетници"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Дозволи подешавање аларма или подсетника"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Аларми и подсетници"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Дозволите овој апликацији да заказује аларме или друге догађаје засноване на времену. Тиме дозвољавате апликацији да се пробуди и ради чак и када не користите уређај. Имајте на уму да апликација можда неће исправно радити ако опозовете ову дозволу. Конкретно, ниједан аларм који је апликација заказала неће више радити."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"заказати, аларм, подсетник, догађај"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Користи се <xliff:g id="USED">%1$s</xliff:g> од <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"од укупно <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1748,31 +1766,32 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Услуге локације"</string>
     <string name="location_title" msgid="5819154746934945021">"Мојa локацијa"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Локација за пословни профил"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Приступ апликације локацији"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Локација је искључена"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> апликација од <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> има приступ локацији</item>
       <item quantity="few"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> апликације од <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> имају приступ локацији</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> апликација од <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> има приступ локацији</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Недавни приступ локацији"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Прикажи детаље"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Ниједна апликација није недавно тражила локацију"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ниједна апликација није недавно приступила локацији"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Велика потрошња батерије"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Мала потрошња батерије"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi и Bluetooth скенирају"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi скенирање"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Дозволите апликацијама и услугама да траже Wi‑Fi мреже у било ком тренутку, чак и када је Wi‑Fi искључен. Ово може да се користи, на пример, за побољшање функција и услуга заснованих на локацији."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth скенирање"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дозволите апликацијама и услугама да траже уређаје у близини у сваком тренутку, чак и када је Bluetooth искључен. Ово може да се користи, на пример, за побољшање функција и услуга заснованих на локацији."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Услуге локације"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Услуге локације за посао"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Откривање временске зоне локације"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Откривање временске зоне локације"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Омогућава да се локација уређаја користи за откривање актуелне временске зоне. Друга подешавања локације, попут Wi‑Fi скенирања, могу да утичу на прецизност откривања временске зоне."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Укључено"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Искључено"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Аутоматско откривање временске зоне је онемогућено"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Аутоматска временска зона је искључена"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Откривање временске зоне локације је онемогућено"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Откривање временске зоне локације није подржано"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Промене откривања временске зоне локације нису дозвољене"</string>
@@ -1953,10 +1972,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Омогући"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Обриши меморијски простор"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Деинсталирај ажурирања"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Изабрали сте подразумевано покретање ове апликације за неке радње."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Неке активности које сте изабрали се подразумевано отварају у овој апликацији."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Изабрали сте да дозволите овој апликацији да прави виџете и приступа њиховим подацима."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Нису постављене подразумеване вредности."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Обриши подразумевано"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Обриши подразумевана подешавања"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Ова апликација можда није дизајнирана за ваш екран. Овде можете да контролишете како ће се прилагодити вашем екрану."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Питај при покретању"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Промени величину апликације"</string>
@@ -2168,7 +2187,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Можете да прилагодите овај уређај према потребама. Те функције приступачности можете касније да промените у Подешавањима."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Промените величину фонта"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Читачи екрана"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Звук и текст на екрану"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Титл"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Звук"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Опште"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Приказ"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Текст и приказ"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Затамњује екран"</string>
@@ -2322,7 +2343,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Црвено-зелено"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Црвено-зелено"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Плаво-жуто"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Смањите осветљеност"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Смањите осветљеност"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Затамните екран више од минималне осветљености телефона"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Затамните екран више од минималне осветљености таблета"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Затамните екран да би вам читање било пријатније.&lt;br/&gt;&lt;br/&gt; То може да вам буде корисно: &lt;ol&gt; &lt;li&gt; када је подразумевана минимална осветљеност телефона и даље јака&lt;/li&gt; &lt;li&gt; када користите телефон у мраку, на пример, ноћу или у тамно соби пре одласка на спавање&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3378,8 +3399,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"лице"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"отисак прста, додај отисак прста"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"затамнити екран, додирни екран, батерија, паметна осветљеност, динамичка осветљеност, аутоматска осветљеност"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"затамњење екрана, спавање, батерија, гашење екрана, пажња, приказ, екран, неактивност"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"ротирај, обрни, ротација, усправно, водоравно, положај, вертикално, хоризонтално"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"надоградња, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"не узнемиравај, распоред, обавештења, блокирај, тишина, вибрација, спавање, рад, концентрација, звук, искључи звук, дан, радни дан, викенд, радни дан увече, догађај"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"екран, време закључавања, гашење екрана, закључан екран"</string>
@@ -3548,9 +3571,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Мелодије звона"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Други звукови и вибрације"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Обавештења"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Конверзација"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Недавно послато"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Погледајте све из последњих 7 дана"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Напредна"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Опште"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Пословна обавештења"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Прилагодљива обавештења"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Приоритет прилагодљивог обавештења"</string>
@@ -3612,7 +3636,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Прикажи на клизном панелу, статусној траци и закључаном екрану"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Сакриј нечујна обавештења на статусној траци"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Укључи треперење лампице"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Обавештења на закључаном екрану"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Приватност"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Прескочи закључан екран"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"После откључавања лицем иди директно на последњи екран"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"закључани екран, прескочити, заобићи"</string>
@@ -3704,7 +3728,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> обавештења недељно</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Никад"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Приступ обавештењима"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Обавештења на уређајима и у апликацијама"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Контролишите која обавештења се приказују у апликацијама и на уређајима"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Приступ обавештењима пословног профила је блокиран"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Апликације не могу да читају обавештења"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3724,17 +3749,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Искључи"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Откажи"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Дозвољени типови обавештења"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Важна активна обавештења"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Обавештења за конверзацију"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Звучна обавештења"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Нечујна обавештења"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"У реалном времену"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Обавештења у реалном времену из апликација које се користе, навигација, телефонски позиви и друго"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Конверзације"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS и друга обавештења"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Подразумевано"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Обавештења која могу да звоне или вибрирају на основу подешавања"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Нечујно"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Обавештења која никада не производе звук нити вибрације"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Прикажи све апликације"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Промените подешавања обавештења за сваку апликацију која може да шаље обавештења"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Апликације које се приказују на уређају"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Услуге помагача за виртуелну реалност"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Ниједна инсталирана апликација није захтевала да се покрене као услуга помагача за виртуелну реалност."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Желите ли да дозволите приступ услузи виртуелне реалности за <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4028,9 +4053,33 @@
     <string name="launch_by_default" msgid="892824422067985734">"Подразумевано отварај"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Отварање линкова"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Отварај подржане линкове"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Подржани линкови се отварају у овој апликацији"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Линкови који се отварају у овој апликацији"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Отварај без питања"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Подржани линкови"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Друге подразумеване апликације"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Друга подразумевана подешавања"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Додај линк"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Апликација може да потврђује линкове како би се аутоматски отварали у њој. "<annotation id="url">"Сазнајте више"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> потврђени линк</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> потврђена линка</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> потврђених линкова</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Ови линкови су потврђени и аутоматски се отварају у овој апликацији.</item>
+      <item quantity="few">Ови линкови су потврђени и аутоматски се отварају у овој апликацији.</item>
+      <item quantity="other">Ови линкови су потврђени и аутоматски се отварају у овој апликацији.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Потврди"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Траже се други подржани линкови…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Откажи"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> подржани линк</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> подржана линка</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> подржаних линкова</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Додај"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Отвара се у:<xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"Користи се <xliff:g id="SIZE">%1$s</xliff:g> у: <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"интерна меморија"</string>
     <string name="storage_type_external" msgid="125078274000280821">"спољна меморија"</string>
@@ -4335,7 +4384,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Камера није дозвољена"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Прављење снимака екрана није дозвољено"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Не можете да отворите ову апликацију"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Ако имате питања, обратите се ИТ администратору"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Још детаља"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Администратор може да надгледа апликације и податке повезане са пословним профилом, укључујући подешавања, дозволе, корпоративни приступ, активности на мрежи и информације о локацији уређаја, као и да управља њима."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Администратор може да надгледа апликације и податке повезане са овим корисником, укључујући подешавања, дозволе, корпоративни приступ, активности на мрежи и информације о локацији уређаја, као и да управља њима."</string>
@@ -4415,7 +4465,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ограничења</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Обрачун података код мобилног оператера се можда разликује од обрачуна уређаја."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Не обухвата податке које користе мреже мобилних оператера"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Не обухвата податке које користе мреже мобилних оператера"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Потрошили сте <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Подеси упозорење о подацима"</string>
     <string name="data_warning" msgid="2925054658166062884">"Упозорење за потрошњу података"</string>
@@ -4765,7 +4815,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(деинсталирано за корисника <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(онемогућено за корисника <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Услуга аутоматског попуњавања"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"аутоматски, попуњавање, аутоматско попуњавање"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Лозинке"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"аутоматски, попунити, аутоматски попунити, лозинка"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Уверите се да је ова апликација поуздана&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google аутоматско попуњавање&gt;%1$s&lt;/xliff:g&gt; користи садржај екрана за утврђивање података који могу аутоматски да се попуне."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Аутоматско попуњавање"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Ниво евидентирања"</string>
@@ -4973,7 +5024,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Промена режима рада мреже"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Жељени тип мреже"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Мобилни оператер"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Верзија подешавања"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Верзија подешавања мобилног оператера"</string>
     <string name="call_category" msgid="641461844504128789">"Позивање"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Видео позивање преко оператера"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Избор система"</string>
@@ -5022,6 +5073,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Уклоните SIM картицу, па је ставите поново. Ако се проблем и даље јавља, рестартујте уређај."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Пробајте поново да укључите SIM картицу. Ако се проблем и даље јавља, рестартујте уређај."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Активација мреже"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Прелазак на другог мобилног оператера"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Мобилни оператер <xliff:g id="CARRIER_NAME">%1$s</xliff:g> је активан"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Додирните да бисте ажурирали подешавања SIM-а"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Прешли сте на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5173,7 +5225,7 @@
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Дозолите апликацијама које могу да се приказују преко других апликација да прекривају садржај екрана Подешавања"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Медији"</string>
     <string name="media_controls_summary" msgid="3573121049460596520">"Медија плејер у Брзим подешавањима"</string>
-    <string name="media_controls_resume_description" msgid="7702723104730495227">"Приказује медија плејер у дужем периоду да би се лако наставила репродукција"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Приказује медија плејер дуже време да би се лако наставила репродукција"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Сакриј плејер"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Прикажи плејер"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Није доступан ниједан плејер"</string>
@@ -5184,8 +5236,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Искључено"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM картице"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Прикажи мреже за режим рада у авиону"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Пронађите мреже и повежите се са њима у режиму рада у авиону."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Пронађите WiFi мреже и повежите се са њима"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"авион, безбедно по авион"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Позиви и SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Позивање преко WiFi-а"</string>
@@ -5199,22 +5250,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"недоступно"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Привремено је недоступно"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Нема SIM картице"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Подешавања"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Подешавања мреже"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Повежите се са јавним мрежама"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"мрежна веза, интернет, бежично, подаци, wifi, wi-fi, wi fi, мобилни телефон, мобилни, мобилни оператер, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Прикажи мреже за режим рада у авиону"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Приказују се мреже за режим рада у авиону"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Укључите мреже"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Искључите мреже"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Желите ли да ресетујете интернет?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Овим завршавате телефонски позив"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Овим завршавате телефонски позив"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Ресетује се интернет…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Реши проблем са повезивањем"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Доступне су мреже за режим рада у авиону"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Да бисте променили мрежу, прекините етернет везу"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Не можете да промените мрежу док сте повезани"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Мреже у режиму рада у авиону"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Повезано"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Аутоматско повезивање на интернет није могуће"</string>
@@ -5235,6 +5285,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Боја"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Друго"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Опште"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Прикажи све апликације"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Паметно прослеђивање"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Паметно прослеђивање је омогућено"</string>
@@ -5248,4 +5302,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Унесите број телефона"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Није наведен број телефона."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Потврди"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Дозволите 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Користите 2G мобилне везе. 2G је увек укључен за хитне позиве."</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b6f4822..e898997 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Gör texten på skärmen större eller mindre."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Förminska"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Förstora"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Använd automatiskt rotation"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Exempeltext"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Den fantastiska trollkarlen från Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fingeravtryck har konfigurerats</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Lås upp med fingeravtryck"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Konfigurera fingeravtryck"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Använda ditt fingeravtryck"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Tryck på fingeravtryckssensorn när du vill låsa upp telefonen, auktorisera köp eller logga in i appar. Var försiktig med vems fingeravtryck du lägger till eftersom alla som du lägger till kan utföra alla dessa åtgärder."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Fingeravtryck kan vara mindre säkra än ett säkert grafiskt lösenord eller en pinkod."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Använd fingeravtrycket för att låsa upp mobilen eller godkänna köp.\n\nObs! Du kan inte använda fingeravtrycket för att låsa upp den här enheten. Kontakta organisationens administratör om du vill veta mer."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Använd fingeravtrycket för att låsa upp mobilen eller godkänna köp.\n\nObs! Fingeravtrycket kan vara mindre säkert än ett starkt grafiskt lösenord eller en bra pinkod."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Du bestämmer själv"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Tänk på detta"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Den data som registreras med fingeravtryck sparas säkert och lämnar aldrig din telefon. Du kan när som helst radera din data i inställningarna."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Fingeravtryck kan vara mindre säkra än ett säkert grafiskt lösenord eller en pinkod."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Dina senaste fingeravtrycksbilder används regelbundet till att förbättra fingeravtrycksmodeller på telefonen."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Du kan använda fingeravtrycket för att låsa upp mobilen och godkänna köp.\n\nObs! Du kan inte använda fingeravtrycket för att låsa upp den här enheten. Kontakta organisationens administratör om du vill veta mer."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Du kan använda fingeravtrycket för att låsa upp mobilen och godkänna köp.\n\nObs! Fingeravtrycket kan vara mindre säkert än ett starkt grafiskt lösenord eller en bra pinkod."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Avbryt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nej tack"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Hoppa över"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Fortsätt"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Godkänn"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Hoppa över"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Nästa"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Vill du hoppa över fingeravtryck?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Hoppa över"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Avbryt"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Tryck på sensorn"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Tryck länge på fingeravtrycksikonen"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Den sitter på telefonens baksida. Använd pekfingret."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Den finns på skärmen. Titta efter fingeravtrycket med en skinande cirkel."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Fingeravtryckssensorn finns på skärmen. Rör fingret över skärmen för att hitta den."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Illustration med enheten och fingeravtryckssensorns plats"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Namn"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Radera"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Tryck på sensorn"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Lägg fingret på sensorn och ta bort det när du känner en vibration"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Lyft och tryck sedan igen"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Lyft fingret flera gånger för att lägga till hela fingeravtrycket"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Fingeravtrycket är tillagt"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"När du ser den här ikonen kan du identifiera dig eller godkänna köp med hjälp av ditt fingeravtryck"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Gör det senare"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Sök"</string>
     <string name="display_settings" msgid="7197750639709493852">"Skärm"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Rotera skärmen automatiskt"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Av"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"På"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"På – ansiktsbaserad"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Aktivera ansiktsidentifiering"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Färger"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Naturliga"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Förstärkta"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"På/Skärmen stängs inte av om du tittar på den"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Av"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Kameraåtkomst krävs"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Tryck om du vill hantera behörigheter för tjänster för enhetsanpassning"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Skärmen hindras från att stängas av när du tittar på den"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Den främre kameran används i Blickavkänning för att avgöra om någon tittar på skärmen. Funktionen finns på enheten och bilderna varken lagras eller skickas till Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Aktivera blickavkänning"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Skärmen väcks vid nya aviseringar"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Visa alltid klocka och info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Batterianvändningen ökar"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Fetstil"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Fetstil"</string>
     <string name="title_font_size" msgid="570613010306330622">"Teckenstorlek"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Gör texten större eller mindre."</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Låsinställningar för SIM-kort"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Andra användare"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Lagring på enhet"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Bärbar lagringsenhet"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarm och påminnelser"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Tillåt att alarm eller påminnelser ställs in"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarm och påminnelser"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Tillåt att appen schemalägger alarm och andra tidsbaserade händelser. På så vis kan appen aktiveras och köras också när du inte använder enheten. Om du återkallar behörigheten kan det leda till att appen inte fungerar. Mer specifikt kommer alarm som schemalagts i appen inte längre att fungera."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"schemalägga, alarm, påminnelse, händelse"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> av <xliff:g id="TOTAL">%2$s</xliff:g> används"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"av <xliff:g id="TOTAL">%1$s</xliff:g> används"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Platstjänster"</string>
     <string name="location_title" msgid="5819154746934945021">"Min plats"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Plats för jobbprofil"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Appåtkomst till plats"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Plats har inaktiverats"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> av <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> appar har platsåtkomst</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> av <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> appar har platsåtkomst</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Senaste platsåtkomsten"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Läs mer"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Inga appar har begärt uppgifter om plats nyligen"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Inga appar har nyligen använt din plats"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Hög batterianvändning"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Låg batterianvändning"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Platssökning med Wi‑Fi och Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi-sökning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Tillåt att appar och tjänster söker efter Wi‑Fi-nätverk när som helst, även när Wi‑Fi är inaktiverat. Funktionen kan till exempel användas till att förbättra platsbaserade funktioner och tjänster."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-sökning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Tillåt att appar och tjänster söker efter enheter i närheten när som helst, även när Bluetooth är inaktiverat. Funktionen kan till exempel användas till att förbättra platsbaserade funktioner och tjänster."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Platstjänster"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Platstjänster för jobbet"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Identifiering av tidszon utifrån plats"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Identifiering av tidszon utifrån plats"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Tillåter att enhetens plats används för att identifiera aktuell tidszon. Andra platsinställningar, till exempel Wi‑Fi-sökning, kan påverka exaktheten för identifieringen av tidszon."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"På"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Av"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatisk identifiering av tidzon har inaktiverats"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Automatisk tidszon är inaktiverat"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Identifiering av tidzon utifrån plats har inaktiverats"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Identifiering av tidzon utifrån plats stöds inte"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Det är inte tillåtet med ändringar i samband med identifiering av tidszon utifrån plats"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Aktivera"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Rensa lagringsutrymme"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Avinstallera uppdateringar"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Du har valt att starta appen som standard för vissa åtgärder."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Vissa aktiviteter som du har valt öppnas i den här appen som standard."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Du har valt att tillåta att den här appen skapar widgetar och får åtkomst till apparnas data."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Inga standardinställningar har angetts."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Rensa standardinställn."</string>
+    <string name="clear_activities" msgid="488089228657585700">"Rensa standardinställningar"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Det är inte säkert att den här appen har skapats för din skärm. Här kan du välja hur den ska anpassas till skärmen."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Fråga vid start"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Skala app"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Du kan anpassa enheten efter dina behov. Tillgänglighetsfunktionerna kan ändras senare under Inställningar."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Ändra teckenstorlek"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Skärmläsningsprogram"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Ljud och text på skärmen"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Textning"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Ljud"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Allmänt"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Skärm"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text och visning"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Gör skärmen mörkare"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Röd–grön"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Röd–grön"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Gul–blå"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Minska ljusstyrkan"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Minska ljusstyrkan"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Gör skärmen mörkare än telefonens lägsta ljusstyrka"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Gör skärmen mörkare än surfplattans lägsta ljusstyrka"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Gör skärmen mörkare så att det blir behagligare att läsa.&lt;br/&gt;&lt;br/&gt; Detta kan vara användbart när &lt;ol&gt; &lt;li&gt; telefonens lägsta ljusstyrka fortfarande är för ljus&lt;/li&gt; &lt;li&gt; du använder telefonen i mörker, t.ex. på natten eller i ett mörkt rum innan du ska sova.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"ansikte"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"fingeravtryck, lägg till fingeravtryck"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"nedtonad skärm, pekskärm, batteri, intelligent ljusstyrka, dynamisk ljusstyrka, automatisk ljusstyrka"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"tona ned skärmen, viloläge, batteri, tidsgräns, avkänning, skärm, inaktiv"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"rotera, vänd, rotation, stående, liggande, orientering, lodrätt, vågrätt"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"uppgradera, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, schema, aviseringar, blockering, tystnad, vibration, viloläge, arbete, fokus, ljud, ljudlös, dag, veckodag, helg, vardagskväll, händelse"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"skärm, låstid, tidsgräns, låsskärm"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringsignaler"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Andra ljud och vibrationer"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Aviseringar"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Konversation"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Nyligen skickat"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Visa alla för de senaste sju dagarna"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Avancerat"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Allmänt"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Jobbaviseringar"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Anpassade aviseringar"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioritet för anpassad avisering"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Visa på aviseringspanelen, i statusfältet och på låsskärmen."</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Dölj tysta aviseringar i statusfältet"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Blinkande ljus"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Aviseringar på låsskärmen"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Integritet"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Hoppa över låsskärmen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Öppna den senast använda skärmen när ansiktslåset låses upp"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Låsskärm, Hoppa över, Kringgå"</string>
@@ -3638,7 +3662,7 @@
     <string name="allow_interruption" msgid="5237201780159482716">"Tillåt avbrott"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"Tillåt att appen spelar upp ljud, vibrerar och/eller visar popup-aviseringar på skärmen"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"Prioritet"</string>
-    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Visas högst upp bland konversationerna som en flytande bubbla, visar profilbilden på låsskärmen"</string>
+    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Visas högst upp bland konversationerna som en flytande bubbla och visar profilbilden på låsskärmen"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"De flesta funktioner för konversationer stöds inte av <xliff:g id="APP_NAME">%1$s</xliff:g>. Det går inte att markera en konversation som prioriterad och konversationer visas inte som flytande bubblor."</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"Komprimera aviseringar på den övre panelen på en rad"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"Inga ljud eller vibrationer"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">Ca <xliff:g id="NUMBER_0">%d</xliff:g> avisering i veckan</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Aldrig"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Åtkomst till aviseringar"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Enhets- och appaviseringar"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Styr vilka aviseringar som visas i dina appar och på dina enheter"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Åtkomsten till aviseringar för jobbprofilen har blockerats"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Appar kan läsa meddelanden"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Inaktivera"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Avbryt"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Tillåtna aviseringstyper"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Viktiga pågående aviseringar"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Aviseringar om konversationer"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Aviseringar med vibrationer eller ljud"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Ljudlösa aviseringar"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Realtid"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Realtidskommunikation från appar som används, navigering, telefonsamtal med mera"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Konversationer"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"Sms och annan kommunikation"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Standard"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Aviseringar som låter eller vibrerar beroende på inställningarna"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Ljudlöst"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Aviseringar som aldrig låter eller vibrerar"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Visa alla appar"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Ändra aviseringsinställningarna för varje app som kan skicka aviseringar"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Appar som visas på enheten"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Hjälptjänster för VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Inga installerade appar har begärt att få köras som hjälptjänster för VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vill du tillåta att tjänsten för VR får tillgång till <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Öppna som standard"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Öppnar länkar"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Öppna länkar som stöds"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Länkar som stöds öppnas i den här appen"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Länkar som ska öppnas i appen"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Öppna utan att fråga"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Länkar som stöds"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Andra standardinställningar"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Andra standardinställningar"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Lägg till länk"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"En app kan verifiera länkar så att de kan öppnas automatiskt i appen. "<annotation id="url">"Läs mer"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> verifierade länkar</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> verifierad länk</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Dessa länkar har verifierats och öppnas automatiskt i den här appen.</item>
+      <item quantity="one">Denna länk har verifierats och öppnas automatiskt i den här appen.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Söker efter andra länkar som stöds …"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Avbryt"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> länkar som stöds</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> länk som stöds</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Lägg till"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Öppnas i <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> används i <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"intern lagring"</string>
     <string name="storage_type_external" msgid="125078274000280821">"extern lagring"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Kameran har inaktiverats"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Skärmbild har inaktiverats"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Det gick inte att öppna appen"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Kontakta IT-administratören om du har frågor"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Mer information"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Administratören kan övervaka och hantera appar och data som är kopplade till den här jobbprofilen, bland annat inställningar, behörigheter, företagsåtkomst, nätverksaktivitet och enhetens platsuppgifter."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Administratören kan övervaka och hantera appar och data som är kopplade till den här användaren, bland annat inställningar, behörigheter, företagsåtkomst, nätverksaktivitet och enhetens platsuppgifter."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 begränsning</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operatörens dataredovisning kan skilja sig från enhetens dataredovisning."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Data som används via operatörer utesluts"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Data som används via operatörer utesluts"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> har använts"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Ställ in en datavarning"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datavarning"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(har avinstallerats för <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(har inaktiverats för <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Tjänsten Autofyll"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"auto, fyll, autofyll"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Lösenord"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"auto, fyll, autofyll, lösenord"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Kontrollera att du litar på den här appen&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofyll&gt;%1$s&lt;/xliff:g&gt; identifierar vad som kan fyllas i automatiskt utifrån vad som visas på skärmen."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Autofyll"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Loggningsnivå"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Ändra nätverksläge"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Önskad nätverkstyp"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operatör"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Version av inställningarna"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Version av operatörsinställningarna"</string>
     <string name="call_category" msgid="641461844504128789">"Ringer upp"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Videosamtal via operatören"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Systemval"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Ta ut SIM-kortet och sätt i det igen. Starta om enheten om problemet kvarstår."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Testa att aktivera SIM-kortet igen. Starta om enheten om problemet kvarstår."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Nätverksaktivering"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operatörsbyte"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> är aktiv"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tryck för att uppdatera SIM-inställningarna"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Du har bytt till <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Av"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kort"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Visa nätverk med flygplansläge"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Hitta och ansluta till nätverk med flygplansläge."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Hitta och anslut till Wi-Fi-nätverk"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"flygplan, flygplanssäker"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Samtal och sms"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi-samtal"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"otillgängligt"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Inte tillgängligt just nu"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Inget SIM-kort"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Inställningar"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Nätverksinställningar"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Anslut till offentliga nätverk"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"nätverksanslutning, internet, trådlös, data, wifi, wi-fi, wi fi, mobil, telefon, mobiloperatör, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Visa nätverk med flygplansläge"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Visar nätverk för flygplansläge"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Sätt på nätverk"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Stäng av nätverk"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Vill du återsluta din internetanslutning?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Detta avslutar samtalet"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Detta avslutar samtalet"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Internetanslutningen återställs …"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Åtgärda anslutning"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Nätverk för flygplansläge är tillgängliga"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Koppla bort Ethernet för att byta nätverk"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Det går inte att växla nätverk när du är ansluten"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Nätverk för flygplansläge"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ansluten"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Du ansluts inte automatiskt till internet"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Färg"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Annat"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Allmänt"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Visa alla appar"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart vidarebefordran"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart vidarebefordran har aktiverats"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Ange telefonnummer"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefonnummer saknas."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Tillåt 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Använd 2G-mobildataanslutningar. 2G är alltid på för nödsamtal."</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d6202cc..2c0c33f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Punguza"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Kuza"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Tumia Mipangilio ya Kuzungusha Skrini Kiotomatiki"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Kipengele cha kuzungusha skrini kiotomatiki kulingana na nyuso hutumia kamera ya mbele ili kuona ikiwa mtu anaangalia skrini, na jinsi anavyoiangalia. Inakuruhusu usome ukiwa umelala chini na haihifadhi wala kutuma picha kwa Google.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Pata maelezo zaidi&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Sampuli ya maandishi"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Wachawi wa Ajabu kutoka Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Sura ya 11: Mji wa Ajabu wa Johari wa Oz"</string>
@@ -403,15 +404,21 @@
       <item quantity="one">Alama ya kidole <xliff:g id="COUNT_0">%1$d</xliff:g> imewekwa</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Fungua kwa alama ya kidole"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Weka alama ya kidole chako"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Tumia alama ya kidole chako"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Gusa tu kitambua alama ya kidole ili ufungue simu yako, uthibitishe ununuzi au uingie katika akaunti za programu. Kuwa makini unapoongeza alama za vidole. Alama yoyote ya kidole unayoongeza inaweza kufanya shughuli hizi."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Huenda utumiaji wa alama ya kidole usiwe na usalama imara ukilinganishwa na mchoro au PIN thabiti."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Uamuzi ni wako"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Kumbuka"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Data inayorekodiwa na kipengele cha Alama ya kidole huhifadhiwa kwa usalama na husalia kwenye simu yako. Unaweza kufuta data yako wakati wowote katika Mipangilio."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Huenda utumiaji wa alama ya kidole usiwe na usalama imara ukilinganishwa na mchoro au PIN thabiti."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Mara chache, simu yako itatumia picha za hivi majuzi za alama ya kidole ili kuunda miundo iliyoboreshwa ya alama ya kidole."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Tumia alama ya kidole chako kufungua simu yako au kuidhinisha ununuzi.\n\nKumbuka: Huwezi kutumia alama ya kidole chako kufungua kifaa hiki. Kwa maelezo zaidi, wasiliana na msimamizi wa shirika lako."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Tumia alama ya kidole chako kufungua simu yako au kuidhinisha ununuzi.\n\nKumbuka: Usalama wa alama ya kidole chako unaweza kuwa wa chini ukilinganishwa na wa mchoro au PIN thabiti."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Ghairi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Hapana"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Ruka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Endelea"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Kubali"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ruka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Endelea"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Ungependa kuruka alama ya kidole?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Ruka"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Ghairi"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Gusa kitambua alama ya kidole"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Gusa na ushikilie aikoni ya alama ya kidole"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Kinapatikana nyuma ya simu yako. Tumia kidole chako cha shahada."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Kiko kwenye skrini. Tafuta alama ya kidole yenye mduara wenye mwanga."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Kitambua alama ya kidole kiko kwenye skrini yako. Sogeza kidole chako kwenye skrini ili ukipate."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Mchoro unaooyesha mahali kitambua alama ya kidole kilipo kwenye kifaa"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Jina"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"SAWA"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Futa"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Gusa kitambua alama ya kidole"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Weka kidole chako juu ya kitambua alama kisha ukiinue baada ya kuhisi mtetemo"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Inua, kisha uguse tena"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Endelea kuinua kidole chako ili uongeze sehemu tofauti za alama ya kidole chako"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Alama ya kidole imeongezwa"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Ukiona aikoni hii, tumia alama ya kidole kujitambulisha au kuidhinisha ununuzi"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Ongeza baadaye"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Umewashwa / Skrini haitazima ikiwa unaiangalia"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Imezimwa"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Inahitaji idhini ya kufikia kamera"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Gusa ili udhibiti ruhusa za Huduma za Kubadilisha Kifaa Upendavyo"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Huzuia skrini yako kuzima ikiwa unaiangalia"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Kipengele cha utashi wa skrini hutumia kamera ya mbele ili kuona ikiwa kuna mtu anayeangalia skrini. Kipengele hiki hufanya kazi kwenye kifaa na picha hazihifadhiwi wala kutumwa kwa Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Washa utashi wa skrini"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Skrini ikiwa nyeusi, huwa inawaka arifa zinapoingia"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Onyesha saa na maelezo kila wakati"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Inatumia chaji nyingi"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Tumia Herufi Nzito"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Herufi nzito"</string>
     <string name="title_font_size" msgid="570613010306330622">"Ukubwa wa fonti"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Ongeza au upunguze ukubwa wa maandishi"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Mipangilio ya kufunga SIM"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Watumiaji wengine"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Hifadhi ya kifaa"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Hifadhi inayohamishika"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Kengele na vikumbusho"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Ruhusu ili uweke kengele au vikumbusho"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Kengele na vikumbusho"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Ruhusu programu hii iweke kengele au matukio mengine yanayolenga muda. Hatua hii itaruhusu programu Ifunguke na ifanye kazi hata wakati hutumii kifaa. Kumbuka kuwa hatua ya kubatilisha ruhusa hii inaweza kusababisha programu isifanye kazi ipasavyo, hasa kengele zozote zilizowekwa na programu hazitafanya kazi tena."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"ratiba, kengele, kikumbusho, tukio"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> kati ya <xliff:g id="TOTAL">%2$s</xliff:g> zimetumika"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Iliyotumika kati ya <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1615,7 +1639,7 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Programu zinaweza kuwekwa upya"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Badilisha mipangilio ya Wi-Fi, data ya simu na Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Hatua hii itabadilisha mipangilio yote ya mtandao ikiwa ni pamoja na:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data ya simu"</li>\n<li>"Bluetooth"</li></string>
-    <string name="erase_euicc_data_button" msgid="728078969563311737">"Futa data yote"</string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Futa"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Futa SIM zilizopakuliwa"</string>
     <string name="reset_esim_desc" msgid="3662444090563399131">"Hatua hii haitaghairi mipango yoyote ya huduma za simu. Ili upakue SIM za kubadilisha, wasiliana na mtoa huduma wako."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Badilisha mipangilio"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Huduma za mahali"</string>
     <string name="location_title" msgid="5819154746934945021">"Mahali pangu"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Wasifu wa kazi kutambua mahali"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Programu kufikia mahali"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Utambuzi wa mahali umezimwa"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> Programu <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> kati ya <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> zinaweza kufikia maelezo ya mahali</item>
       <item quantity="one"> Programu <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> kati ya <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> inaweza kufikia maelezo ya mahali</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Zilizofikia utambuzi wa mahali hivi majuzi"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Angalia maelezo"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Hakuna programu iliyotaka kutambua mahali hivi karibuni"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Hakuna programu iliyofikia mahali hivi karibuni"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Matumizi ya betri ya hali ya juu"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Huwa haitumii chaji nyingi"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Utafutaji Wi‑Fi na Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Kutafuta Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Ruhusu programu na huduma zitafute mitandao ya Wi-Fi wakati wowote, hata wakati umezima Wi-Fi. Hali hii inaweza kutumika, kwa mfano, kuboresha huduma na vipengele vinavyohusiana na mahali."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Kutafuta Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Ruhusu programu na huduma zitafute vifaa vilivyo karibu wakati wowote, hata wakati umezima Bluetooth. Hali hii inaweza kutumika, kwa mfano, kuboresha huduma na vipengele vinavyohusiana na mahali."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Huduma za Mahali"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Huduma za Mahali za kazini"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Utambuzi wa saa za eneo"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Utambuzi wa saa za eneo"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Huruhusu hali ya kutumia maelezo ya mahali kifaa kilipo ili kutambua saa za sasa za eneo. Mipangilio mingine ya mahali kama vile kutafuta Wi-Fi inaweza kuathiri usahihi wa utambuzi wa saa za eneo."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Umewashwa"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Umezimwa"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Utambuzi wa kiotomatiki wa saa za eneo umezimwa"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Utambuzi otomatiki wa saa za eneo umezimwa"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Utambuzi wa saa za eneo umezimwa"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Utambuzi wa saa za eneo hautumiki"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Huruhusiwi kufanya mabadiliko kwenye utambuzi wa saa za eneo"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Washa"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Futa data ya hifadhi"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Ondoa masasisho"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Umechagua kuzindua programu hii kwa mbadala kwa baadhi ya vitendo."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Baadhi ya shughuli ulizochagua hufunguka katika programu hii kwa chaguomsingi."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Umechagua kuruhusu programu hii kuunda wijeti na kufikia data yao."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Hakuna chaguo-misingi zilizowekwa."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Futa chaguomsingi"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Ondoa mapendeleo chaguomsingi"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Programu hii haiwezi kuundwa kwa skrini yako: Unaweza kudhibiti jinsi inavyojirekebidhwa kwa skrini yako hapa."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Uliza wakati imezinduliwa"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Pima programu"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Unaweza kubadilisha mipangilio ya kifaa hiki kulingana na mahitaji yako. Vipengele hivi vya zana za walio na matatizo ya kuona au kusikia vinaweza kubadilishwa baadaye kwenye Mipangilio."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Badilisha ukubwa wa fonti"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Visomaji skrini"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Maandishi kwenye skrini na sauti"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Manukuu"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Sauti"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Jumla"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Skrini"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Maandishi na onyesho"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Geuza skrini iwe nyeusi"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Nyekundu-kijani"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Nyekundu-kijani"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Bluu-manjano"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Punguza Ung\'aavu"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Punguza ung\'aavu"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Fanya skrini iwe nyeusi kuliko kiwango cha chini cha ung\'aavu cha simu yako"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Fanya skrini iwe nyeusi kuliko kiwango cha chini cha ung\'aavu cha kompyuta yako kibao"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Fanya skrini yako iwe nyeusi kidogo ili uweze kusoma bila tatizo.&lt;br/&gt;&lt;br/&gt; Hali hii inaweza kuwa muhimu wakati: &lt;ol&gt; &lt;li&gt; Ung\'aavu chaguomsingi wa kiwango cha chini kwenye simu yako bado una mwangaza mkubwa&lt;/li&gt; &lt;li&gt; Unatumia simu yako katika hali zenye giza, kama vile usiku au katika chumba chenye giza kabla ya kulala&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"uso"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"alama ya kidole, ongeza alama ya kidole"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"skrini yenye mwanga hafifu, skrini ya kugusa, betri, mwangaza mahiri, ung\'avu maalum, Ung\'avu otomatiki"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"punguza mwangaza wa skrini, hali tuli, betri, muda wa skrini kujizima, utashi wa skrini, onyesho, skrini, kutokuwa na shughuli"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"zungusha, gueza, kuzungusha, wima, mlalo, mkao"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"pata toleo jipya, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, ratiba, arifa, zuia, nyamazisha, tetema, lala, kazini, angazia, sauti, zima sauti, siku, siku ya kazi, wikiendi, usiku wa siku za wiki, tukio"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"skrini, wakati wa kufunga, muda wa skrini kujizima, kifunga skrini"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Milio ya simu"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Mitetemo na sauti zingine"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Arifa"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Mazungumzo"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Zilizotumwa hivi majuzi"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Angalia zilizotumika katika siku 7 zilizopita"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Mipangilio ya kina"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Jumla"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Arifa za kazini"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Arifa zinazojirekebisha"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Kipaumbele cha arifa inayojirekebisha"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Onyesha katika orodha kunjuzi, sehemu ya arifa na kwenye skrini iliyofungwa"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ficha arifa zisizo na sauti katika sehemu ya arifa"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Mwangaza umemeteke"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Arifa kwenye skrini iliyofungwa"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Faragha"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Kuruka skrini iliyofungwa"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Ukishafungua kwa uso, nenda kwenye skrini iliyotumika mwisho"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Skrini iliyofungwa, Kufunga skrini, Ruka, Kwepa"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="one">Takriban arifa <xliff:g id="NUMBER_0">%d</xliff:g> kwa wiki</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Kamwe"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Kufikia arifa"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Arifa za programu na vifaa"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Dhibiti arifa unazotaka kuonyesha kwenye programu na vifaa vyako"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Ufikiaji kwenye arifa za wasifu wa kazi umezuiwa"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Programu haziwezi kusoma arifa"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Zima"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Ghairi"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Aina zinazoruhusiwa za arifa"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Arifa muhimu zinazoendelea"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Arifa za mazungumzo"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Arifa za tahadhari"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Arifa zisizo na sauti"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Muda halisi"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Mawasiliano ya muda halisi katika programu zinazotumika, usogezaji, simu na zaidi"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Mazungumzo"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS na mawasiliano mengine"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Chaguomsingi"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Arifa zinazoweza kutoa sauti au kutetema kulingana na mipangilio"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Kimya"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Arifa zisizotoa sauti wala kutetema"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Angalia programu zote"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Badilisha mipangilio ya arifa kwa kila programu inayoweza kutuma arifa"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Programu zinazoonyeshwa kwenye kifaa"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Huduma za kisaidizi cha Uhalisia Pepe"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Hakuna programu zilizosakinishwa ambazo zinaweza kutekeleza huduma za kisaidizi cha Uhalisia Pepe."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Ungependa kuruhusu huduma za Uhalisia Pepe katika <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Fungua moja kwa moja"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Kufungua viungo"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Fungua viungo vinavyoweza kutumika"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Viungo vinavyoweza kutumika hufunguka katika programu hii"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Viungo vya kufunguka katika programu hii"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Fungua bila kuuliza"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Viungo vinavyoweza kutumika"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Chaguomsingi nyingine"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Mapendeleo mengine chaguomsingi"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Weka kiungo"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Programu inaweza kuthibitisha viungo ili vifunguke kiotomatiki katika programu. "<annotation id="url">"Pata maelezo zaidi"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other">Viungo <xliff:g id="COUNT_1">%d</xliff:g> vilivyothibitishwa</item>
+      <item quantity="one">Kiungo <xliff:g id="COUNT_0">%d</xliff:g> kilichothibitishwa</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Viungo hivi vimethibitishwa na vinafunguka kiotomatiki katika programu hii.</item>
+      <item quantity="one">Kiungo hiki kimethibitishwa na kunafunguka kiotomatiki katika programu hii.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Sawa"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Inatafuta viungo vingine vinavyoweza kutumika…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Ghairi"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other">Viungo <xliff:g id="COUNT_1">%d</xliff:g> vinavyoweza kutumika</item>
+      <item quantity="one">Kiungo <xliff:g id="COUNT_0">%d</xliff:g> kinachoweza kutumika</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Weka"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Hufunguka katika <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> zimetumika katika <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"hifadhi ya mfumo"</string>
     <string name="storage_type_external" msgid="125078274000280821">"hifadhi ya nje"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Kamera imezimwa na msimamizi"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Huruhusiwi kupiga picha za skrini"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Haiwezi kufungua programu"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Ikiwa una maswali, wasiliana na msimamizi wako wa TEHAMA"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Maelezo zaidi"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Msimamizi wako anaweza kufuatilia na kudhibiti programu na data zinazohusiana na wasifu wako wa kazini, ikiwa ni pamoja na mipangilio, ruhusa, ufikiaji wa shirika, shughuli za mtandao na maelezo ya mahali kilipo kifaa."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Msimamizi wako anaweza kufuatilia na kudhibiti programu na data zinazohusiana na mtumiaji huyu, ikiwa ni pamoja na mipangilio, ruhusa, ufikiaji wa shirika, shughuli za mtandao na maelezo ya mahali kilipo kifaa."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="one">Kizuizi 1</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Huenda hesabu ya data ya mtoa huduma ikawa tofauti na ya kifaa chako"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Haijumuishi data inayotumiwa na mitandao ya mtoa huduma"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Haijumuishi data inayotumiwa na mitandao ya mtoa huduma"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> zimetumika"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Weka onyo la matumizi ya data"</string>
     <string name="data_warning" msgid="2925054658166062884">"Onyo kuhusu data"</string>
@@ -4680,7 +4733,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(imeondolewa kwa mtumiaji <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(imezimwa kwa mtumiaji <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Huduma ya kujaza kiotomatiki"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"otomatiki, jaza, kujaza kiotomatiki"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Manenosiri"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"otomatiki, jaza, kujaza kiotomatiki, nenosiri"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Hakikisha kuwa unaamini programu hii&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; hutumia kilicho kwenye skrini yako kubaini kinachoweza kujazwa kiotomatiki."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Kujaza Kiotomatiki"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Kiwango cha kumbukumbu"</string>
@@ -4887,7 +4941,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Badilisha hali ya utendaji wa mtandao"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Aina ya mtandao inayopendelewa"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Mtoa huduma"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Toleo la mipangilio"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Toleo la mipangilio ya mtoa huduma"</string>
     <string name="call_category" msgid="641461844504128789">"Kupiga simu"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Kupiga simu ya video kupitia kampuni ya simu"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Chagua mfumo"</string>
@@ -4936,6 +4990,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Ondoa SIM na uiweke tena. Iwapo tatizo litaendelea, zima kisha uwashe kifaa chako."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Jaribu kuwasha SIM tena. Iwapo tatizo litaendelea, zima kisha uwashe kifaa chako."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Kuwasha mtandao"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Inabadilisha mtoa huduma"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Unatumia <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Gusa ili usasishe mipangilio ya SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Sasa unatumia <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -4955,7 +5010,7 @@
     <string name="sim_card_label" msgid="5632157635124050923">"SIM kadi"</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"Je, ungependa kufuta data yote kwenye SIM hii iliyopakuliwa?"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"Kufuta data yote kwenye SIM hii huondoa huduma ya <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> kwenye kifaa hiki.\n\nHuduma ya <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> haitaghairiwa."</string>
-    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Futa data yote"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Futa"</string>
     <string name="erasing_sim" msgid="7877703231075699139">"Inafuta data yote kwenye SIM…"</string>
     <string name="erase_sim_fail_title" msgid="2024446702985862427">"Imeshindwa kufuta data yote kwenye SIM"</string>
     <string name="erase_sim_fail_text" msgid="7870804401227483131">"Hitilafu imetokea wakati wa kufuta data kwenye SIM.\n\nZima kisha uwashe kifaa chako na ujaribu tena."</string>
@@ -5096,8 +5151,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Kimezimwa"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Intaneti"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Onyesha mitandao ya hali ya ndegeni"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Tafuta na uunganishe kwenye mitandao katika hali ya ndegeni."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Tafuta na uunganishe kwenye mitandao ya Wi-Fi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ndegeni, salama ya ndegeni"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Simu na SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Kupiga simu kupitia Wi-Fi"</string>
@@ -5111,22 +5165,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"haipatikani"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Haipatikani kwa muda"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Hakuna SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Mapendeleo"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Mapendeleo ya mtandao"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Unganisha kwenye mitandao ya umma"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"muunganisho wa mtandao, intaneti, isiyotumia waya, data, wifi, wi-fi, wi fi, mtandao wa simu, vifaa vya mkononi, mtoa huduma za vifaa vya mkononi, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Angalia mitandao ya hali ya ndegeni"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Kuangalia mitandao inayopatikana katika hali ya ndegeni"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Washa mitandao"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Zima mitandao"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Ungependa kubadilisha mipangilio yako ya intaneti?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Hatua hii itakata simu yako"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Hatua hii itakata simu yako"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Inabadilisha mipangilio yako ya intaneti…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Rekebisha hitilafu ya muunganisho"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Mitandao inayotumika katika hali ya ndegeni inapatikana"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Ili kubadili mitandao, tenganisha ethaneti"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Haiwezi kubadili mitandao wakati imeunganishwa"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mitandao ya hali ya ndegeni"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Imeunganishwa"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Intaneti haitaunganishwa kiotomatiki"</string>
@@ -5147,6 +5200,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Rangi"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Vingine"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Jumla"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Angalia programu zote"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Usambazaji Mahiri"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Umewasha kipengele cha Usambazaji Mahiri"</string>
@@ -5160,4 +5217,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Weka Nambari ya simu"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Nambari ya simu haipo."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Sawa"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Ruhusu 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Tumia miunganisho ya 2G ya mitandao ya simu. Kwa simu za dharura, 2G huwa imewashwa kila wakati."</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 3d4fe11..50faec6 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"திரையில் காட்டப்படும் உரையைச் சிறிதாக்கும் அல்லது பெரிதாக்கும்."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"சிறிதாக்கு"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"பெரிதாக்கு"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"தானாகச் சுழற்றுதல் அமைப்பைப் பயன்படுத்து"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"மாதிரி உரை"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"தி விசார்ட் ஆஃப் ஓஸ்"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> கைரேகையின் அமைவு</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"கைரேகை மூலம் திறக்கலாம்"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"உங்கள் கைரேகையை அமையுங்கள்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"கைரேகையைப் பயன்படுத்தவும்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"மொபைலைத் திறக்க, பர்ச்சேஸ்களை அங்கீகரிக்க அல்லது ஆப்ஸில் உள்நுழைய, கைரேகை சென்சாரைத் தொட்டால் போதும். யாருடைய கைரேகைகளைச் சேர்க்கிறீர்கள் என்பதில் கவனமாக இருங்கள். சேர்க்கப்பட்டவற்றில் ஒரே ஒரு கைரேகையை மட்டும் வைத்தே மேலே குறிப்பிட்டுள்ள எதையும் செய்ய முடியும்."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"குறிப்பு: எளிதில் ஊகிக்க முடியாத பேட்டர்னையோ பின்னையோ பயன்படுத்தும்போது கிடைக்கும் பாதுகாப்பை விட, கைரேகையைப் பயன்படுத்தும்போது குறைவான பாதுகாப்பே கிடைக்கும்."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"முழுமையான கட்டுப்பாட்டைப் பெற்றுள்ளீர்கள்"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"கவனத்திற்கு"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"கைரேகை அம்சத்தால் பதிவுசெய்யப்படும் தரவு உங்கள் மொபைலில் பாதுகாப்பாகச் சேமிக்கப்படும், அவை யாருடனும் பகிரப்படாது. அமைப்புகளில் உங்கள் தரவை எப்போது வேண்டுமானாலும் நீக்கலாம்."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"எளிதில் ஊகிக்க முடியாத பேட்டர்ன் அல்லது பின்னுடன் ஒப்பிடுகையில் கைரேகையானது குறைவான பாதுகாப்புடையதாக இருக்கக்கூடும்."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"மேம்பட்ட கைரேகை மாதிரிகளை உருவாக்க, உங்கள் சமீபத்திய கைரேகைப் படங்களை மொபைல் அவ்வப்போது பயன்படுத்தும்."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"மொபைலைத் திறக்க அல்லது வாங்குவதை அங்கீகரிக்க, உங்கள் கைரேகையைப் பயன்படுத்தவும்.\n\n குறிப்பு: இந்தச் சாதனத்தைத் திறக்க, கைரேகையைப் பயன்படுத்த முடியாது. மேலும் தகவலுக்கு, உங்கள் நிறுவனத்தின் நிர்வாகியைத் தொடர்புகொள்ளவும்."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"மொபைலைத் திறக்க அல்லது வாங்குவதை அங்கீகரிக்க, உங்கள் கைரேகையைப் பயன்படுத்தவும்.\nகுறிப்பு: எளிதில் ஊகிக்க முடியாத பேட்டர்ன் அல்லது பின்னைப் பயன்படுத்தும் போது கிடைக்கும் பாதுகாப்பை விட, கைரேகையைப் பயன்படுத்தும் போது குறைவான பாதுகாப்பே கிடைக்கும்.\n"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ரத்துசெய்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"வேண்டாம்"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"தவிர்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"தொடரவும்"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"ஏற்கிறேன்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"தவிர்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"அடுத்து"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"கைரேகையை அமைக்க வேண்டாமா?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"தவிர்"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"வேண்டாம்"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"சென்சாரைத் தொடவும்"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"கைரேகை ஐகானைத் தொட்டுப் பிடியுங்கள்"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"இது மொபைலின் பின்புறம் இருக்கும். ஆள்காட்டி விரலைப் பயன்படுத்தவும்."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"இது திரைமேல் உள்ளது. ஒளிரும் வட்டத்துடன் கூடிய கைரேகையைத் தேடிப் பாருங்கள்."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"கைரேகை சென்சார் உங்கள் திரையிலுள்ளது. அதைக் கண்டறிய, உங்கள் விரலைத் திரையில் நகர்த்துங்கள்."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"சாதனத்தில் கைரேகை சென்சார் அமைந்துள்ள இடத்தின் விளக்கப்படம்"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"பெயர்"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"சரி"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"நீக்கு"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"சென்சாரைத் தொடவும்"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"விரலை சென்சாரில் வைத்து, அதிர்வை உணர்ந்த பின்னர் விரலை எடுக்கவும்"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"விரலை எடுத்துவிட்டு, மீண்டும் தொடுக"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"கைரேகையின் பகுதிகளைச் சேர்க்க, விரலை எடுத்து எடுத்து வைக்கவும்"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"கைரேகை சேர்க்கப்பட்டது"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"திரையில் இந்த ஐகானைப் பார்க்கும்போது, உங்களை அடையாளப்படுத்துவதற்கும், ஆன்லைனில் வாங்குதல்களை அங்கீகரிக்கவும், உங்கள் கைரேகையைப் பயன்படுத்தவும்"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"பின்னர் செய்"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"தேடு"</string>
     <string name="display_settings" msgid="7197750639709493852">"திரை அமைப்பு"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"திரையைத் தானாகச் சுழற்று"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"ஆஃப்"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"ஆன்"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"ஆன் - முகம் அடிப்படையிலானது"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"முகம் கண்டறிதல் அமைப்பை இயக்கு"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"வண்ணங்கள்"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"இயற்கை வண்ணம்"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"பூஸ்ட் செய்யப்பட்டது"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ஆன் / திரையைப் பார்த்துக் கொண்டிருக்கையில் அது ஆஃப் ஆகாது"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"முடக்கு"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"கேமரா அணுகல் தேவை"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"\'சாதனப் பிரத்தியேகமாக்குதல் சேவைகள்’ அனுமதிகளை நிர்வகிக்கத் தட்டவும்"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"நீங்கள் பார்த்துக் கொண்டிருக்கையில் திரை ஆஃப் ஆவதைத் தவிர்க்கும்"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"முன்பக்கக் கேமராவைப் பயன்படுத்தி திரையை யாராவது பார்க்கிறார்களா என்பதை \'திரை மீது கவனம்\' எனும் அம்சம் அறியும். இது சாதன அளவிலேயே இயங்கும், படங்கள் சேமிக்கப்படவோ Googleளுக்கு அனுப்பப்படவோ மாட்டாது."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"\'திரை மீது கவனத்தை\' ஆன் செய்தல்"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"திரை டார்க்காக இருக்கும்போது புதிய அறிவிப்புகளுக்கு இது ஆன் ஆகும்"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"நேரம் &amp; தகவலை எப்போதும் காட்டு"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"பேட்டரியை அதிகமாகப் பயன்படுத்தும்"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"தடிமனான உரை"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"உரையைத் தடிமனாக்கு"</string>
     <string name="title_font_size" msgid="570613010306330622">"எழுத்துரு அளவு"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"உரையைப் பெரிதாக்கும் அல்லது சிறிதாக்கும்"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"சிம் கார்டின் பூட்டு அமைப்பு"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"பிற பயனர்கள்"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"சாதனச் சேமிப்பகம்"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"கையடக்கச் சேமிப்பகம்"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"அலாரங்களும் நினைவூட்டல்களும்"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"அலாரங்களையோ நினைவூட்டல்களையோ அமைக்க அனுமதித்தல்"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"அலாரங்களும் நினைவூட்டல்களும்"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"அலாரங்களையோ பிற நேரம் சார்ந்த நிகழ்வுகளையோ திட்டமிட இந்த ஆப்ஸை அனுமதிக்கவும். சாதனத்தைப் பயன்படுத்தாதபோதும், ஆப்ஸ் தொடங்கவும் இயங்கவும் இது அனுமதிக்கும். கவனத்திற்கு: இந்த அனுமதியைத் திரும்பப் பெற்றால், ஆப்ஸ் செயலிழக்கக்கூடும். குறிப்பாக, ஆப்ஸ் திட்டமிட்டுள்ள அலாரங்கள் எதுவும் இனி இயங்காது."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"திட்ட அட்டவணை, அலாரம், நினைவூட்டல், நிகழ்வு"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"பயன்படுத்தியது: <xliff:g id="USED">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"பயன்படுத்தியது: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"இருப்பிடச் சேவைகள்"</string>
     <string name="location_title" msgid="5819154746934945021">"எனது இருப்பிடம்"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"பணி சுயவிவரத்திற்கான இருப்பிடம்"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"இருப்பிடத்திற்கான ஆப்ஸ் அணுகல்"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"இருப்பிடம் ஆஃப் செய்யப்பட்டுள்ளது"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ஆப்ஸில் <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ஆப்ஸ் இருப்பிட அணுகலைப் பெற்றுள்ளன</item>
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> ஆப்ஸில் <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> ஆப்ஸ் இருப்பிட அணுகலைப் பெற்றுள்ளது</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"சமீபத்திய இருப்பிட அணுகல்"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"விவரங்களைக் காட்டு"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"எந்த ஆப்ஸும் சமீபத்தில் இருப்பிடத்தைக் கோரவில்லை"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"சமீபத்தில் எந்த ஆப்ஸும் இருப்பிடத்தை அணுகவில்லை"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"அதிகப் பேட்டரி பயன்பாடு"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"குறைவான பேட்டரி பயன்பாடு"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"வைஃபை மற்றும் புளூடூத் மூலமாக ஸ்கேன் செய்தல்"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"வைஃபை ஸ்கேனிங்"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"வைஃபை ஆஃப் செய்யப்பட்டிருந்தாலும்கூட, எந்தநேரத்திலும் வைஃபை நெட்வொர்க்குகளைத் தேட, ஆப்ஸையும் சேவைகளையும் அனுமதிக்கும். உதாரணத்திற்கு, இருப்பிடம் சார்ந்த அம்சங்கள் மற்றும் சேவைகளை மேம்படுத்துவதற்கும் இதைப் பயன்படுத்தலாம்."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"புளூடூத் ஸ்கேன் செய்தல்"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"புளூடூத் ஆஃப் செய்யப்பட்டிருந்தாலும்கூட, எந்தநேரத்திலும் அருகிலுள்ள சாதனங்களைத் தேட, ஆப்ஸையும் சேவைகளையும் அனுமதிக்கும். உதாரணத்திற்கு, இருப்பிடம் சார்ந்த அம்சங்கள் மற்றும் சேவைகளை மேம்படுத்துவதற்கும் இதைப் பயன்படுத்தலாம்."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"இருப்பிடச் சேவைகள்"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"பணிக் கணக்கிற்கான இருப்பிடச் சேவைகள்"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"இருப்பிட நேர மண்டலத்தைக் கண்டறிதல்"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"இருப்பிட நேர மண்டலத்தைக் கண்டறிதல்"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"தற்போதைய நேர மண்டலத்தைக் கண்டறிய சாதனத்தின் இருப்பிடம் உபயோகிக்கப்படுவதை அனுமதிக்கும். நேர மண்டலத்தைக் கண்டறிதலின் துல்லியத்தன்மையை வைஃபை ஸ்கேனிங் போன்ற பிற இருப்பிட அமைப்புகள் பாதிக்கக்கூடும்."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ஆன்"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ஆஃப்"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"தானியங்கு நேர மண்டலத்தைக் கண்டறிதல் முடக்கப்பட்டுள்ளது"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"தானியங்கு நேர மண்டலம் முடக்கப்பட்டுள்ளது"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"இருப்பிட நேர மண்டலத்தைக் கண்டறிதல் முடக்கப்பட்டுள்ளது"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"இருப்பிட நேர மண்டலத்தைக் கண்டறிதல் ஆதரிக்கப்படவில்லை"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"இருப்பிட நேர மண்டலத்தைக் கண்டறிதல் தொடர்பான மாற்றங்கள் அனுமதிக்கப்படவில்லை"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"இயக்கு"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"சேமிப்பகத்தில் உள்ளவற்றை அழி"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"புதுப்பிப்புகளை நிறுவல் நீக்கு"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"சில செயல்பாடுகளுக்கு இந்த ஆப்ஸை இயல்பாகத் தொடங்க தேர்வுசெய்துள்ளீர்கள்."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"நீங்கள் தேர்ந்தெடுத்துள்ள சில செயல்பாடுகள் இயல்பாகவே இந்த ஆப்ஸில் திறக்கும்."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"விட்ஜெட்களை உருவாக்கவும், அவற்றின் தரவை அணுகவும் இந்த ஆப்ஸை அனுமதிக்க தேர்வுசெய்துள்ளீர்கள்."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"இயல்பு அமைப்பு இல்லை."</string>
-    <string name="clear_activities" msgid="341345438786077236">"இயல்புகளை அழி"</string>
+    <string name="clear_activities" msgid="488089228657585700">"இயல்பான விருப்பத்தேர்வுகளை நீக்கு"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"இந்த ஆப்ஸ் உங்கள் திரைக்காக வடிவமைக்கபட்டதில்லை. உங்கள் திரைக்கு ஏற்ப நீங்கள் சரிசெய்துகொள்ளலாம்."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"தொடங்கப்படும்போது கேள்"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"ஆப்ஸின் அளவு"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"உங்கள் தேவைகளுக்கேற்ப இந்தச் சாதனத்தைப் பிரத்தியேகமாக்கலாம். பின்னர் அணுகுமுறை அம்சங்களை, அமைப்புகளில் மாற்றி கொள்ளலாம்"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"எழுத்தின் அளவை மாற்று"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"திரைப் படிப்பான்கள்"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ஆடியோ &amp; திரையில் காட்டப்படும் உரை"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"வசனங்கள்"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ஆடியோ"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"பொது"</string>
     <string name="display_category_title" msgid="6638191682294461408">"திரை அமைப்பு"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"உரை மற்றும் காட்சி"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"திரையின் ஒளிர்வைக் குறைத்தல்"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"சிவப்பு-பச்சை"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"சிவப்பு-பச்சை"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"நீலம்-மஞ்சள்"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ஒளிர்வைக் குறைத்தல்"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"ஒளிர்வைக் குறைத்தல்"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"உங்கள் மொபைலின் குறைந்தபட்ச ஒளிர்வை விடவும் திரையின் ஒளிர்வை இன்னும் குறைக்கலாம்"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"உங்கள் டேப்லெட்டின் குறைந்தபட்ச ஒளிர்வை விடவும் திரையின் ஒளிர்வை இன்னும் குறைக்கலாம்"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"திரையில் உள்ளவற்றை எளிதாக வாசிக்க அதன் ஒளிர்வைக் குறையுங்கள்.&lt;br/&gt;&lt;br/&gt; பின்வரும் தருணங்களில் இது உதவிகரமானதாக இருக்கும்: &lt;ol&gt; &lt;li&gt; மொபைலின் குறைந்தபட்ச இயல்புநிலை ஒளிர்வே மிகவும் வெளிச்சமானதாக இருக்கும்போது&lt;/li&gt; &lt;li&gt; இரவுநேரம், இருட்டான அறை போன்ற இருள் சூழ்ந்த தருணங்களில் மொபைலைப் பயன்படுத்தும்போது&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3177,7 +3198,7 @@
     <string name="preferred_network_type_title" msgid="812509938714590857">"விரும்பும் நெட்வொர்க் வகை"</string>
     <string name="preferred_network_type_summary" msgid="8786291927331323061">"LTE (பரிந்துரைக்கப்பட்டது)"</string>
     <string name="mms_message_title" msgid="6624505196063391964">"MMS மெசேஜ்கள்"</string>
-    <string name="mms_message_summary" msgid="2855847140141698341">"மொபைல் ஆஃப் செய்யப்பட்டிருந்தாலும் அனுப்பலாம் பெறலாம்"</string>
+    <string name="mms_message_summary" msgid="2855847140141698341">"மொபைல் டேட்டா ஆஃப் செய்யப்பட்டிருந்தாலும் அனுப்பலாம் பெறலாம்"</string>
     <string name="data_during_calls_title" msgid="3940276893360429144">"அழைப்புகளின் போது டேட்டாவைப் பயன்படுத்துதல்"</string>
     <string name="data_during_calls_summary" msgid="2289050189544214759">"அழைப்புகளின் போது மட்டும் இந்த சிம்மின் மொபைல் டேட்டாவைப் பயன்படுத்த அனுமதி"</string>
     <string name="work_sim_title" msgid="8999872928646924429">"பணியிட சிம்"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"முகம்"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"கைரேகை, கைரேகையைச் சேர்"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"மங்கல் திரை, டச்ஸ்கிரீன், பேட்டரி, ஸ்மார்ட் ஒளிர்வு, சிறப்பு ஒளிர்வு, தானியங்கு ஒளிர்வு"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"மங்கலான திரை, உறக்கம், பேட்டரி, அணைவு நேரம், கவனம், காட்சி, திரை, செயலின்மை"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"சுழற்று, ஃபிலிப், சுழற்சி, போர்ட்ரெய்ட், லேண்ட்ஸ்கேப், திசையமைப்பு, நீளவாக்கு, அகலவாக்கு"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"மேம்படுத்து, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, திட்டமிடு, அறிவிப்புகள், தடு, நிசப்தம், அதிர்வு, உறங்கு, பணி, ஒலி, ஒலியடக்கு, நாள், வார நாள், வாரயிறுதி, வார நாளின் இரவு, நிகழ்வு"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"திரை, பூட்டு நேரம், அணைவு நேரம், பூட்டுத் திரை"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"ரிங்டோன்கள்"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"பிற ஒலிகள் மற்றும் அதிர்வுகள்"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"அறிவிப்புகள்"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"உரையாடல்"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"சமீபத்தில் அனுப்பியவை"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"கடந்த 7 நாட்களில் உள்ள அனைத்தையும் காட்டு"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"மேம்பட்டவை"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"பொது"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"பணி அறிவிப்புகள்"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"சூழலுக்கேற்ற அறிவிப்புகள்"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"சூழலுக்கேற்ற அறிவிப்புக்கான முன்னுரிமை"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"கீழ் இழுக்கும் ஷேட், நிலைப்பட்டி &amp; பூட்டுத் திரையில் காட்டப்படும்"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"நிலைப் பட்டியில் ஒலியில்லாத அறிவிப்புகளை மறை"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ஒளியைச் சிமிட்டு"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"பூட்டுத்திரையில் அறிவிப்புகள்"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"தனியுரிமை"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"பூட்டுத் திரையைத் தவிர்த்தல்"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"முகம் காட்டித் திறந்ததும் கடைசியாக பார்த்த திரைக்கு செல்லும்"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"பூட்டுத் திரை, பூட்டுத்திரை, தவிர், தவிர்த்துச் செல்"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> அறிவிப்பு / வாரம்</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"ஒருபோதும் அனுப்பியதில்லை"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"அறிவிப்பு அணுகல்"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"சாதனம் &amp; ஆப்ஸ் அறிவிப்புகள்"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"உங்கள் ஆப்ஸிலும் சாதனங்களிலும் எந்தெந்த அறிவிப்புகள் காட்டப்பட வேண்டும் என்பதைக் கட்டுப்படுத்துங்கள்"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"பணிக் கணக்கு அறிவிப்புகளுக்கான அணுகல் தடுக்கப்பட்டுள்ளது"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"ஆப்ஸால் அறிவிப்புகளைப் படிக்க முடியாது"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"முடக்கு"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"ரத்துசெய்"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"அனுமதிக்கப்பட்ட அறிவிப்பு வகைகள்"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"முக்கியமான செயலில் உள்ள அறிவிப்புகள்"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"உரையாடல் அறிவிப்புகள்"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"விழிப்பூட்டல் அறிவிப்புகள்"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"ஒலியில்லாத அறிவிப்புகள்"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"நிகழ்நேரம்"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"உபயோகத்தில் உள்ள ஆப்ஸ், வழிசெலுத்தல், மொபைல் அழைப்புகள் மற்றும் பலவற்றிலிருந்தும் பெறப்படும் நிகழ்நேரத் தகவல்தொடர்பு"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"உரையாடல்கள்"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"மெசேஜ் மற்றும் பிற தகவல்தொடர்புகள்"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"இயல்பு"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"அமைப்புகளைப் பொறுத்து ஒலிக்கக்கூடிய அல்லது அதிர்வடையக்கூடிய அறிவிப்புகள்"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"நிசப்தம்"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"ஒலிக்காத அல்லது அதிர்வடையாத அறிவிப்புகள்"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"அனைத்து ஆப்ஸையும் காட்டு"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"அறிவிப்புகளை அனுப்பக்கூடிய ஒவ்வொரு ஆப்ஸுக்கும் அறிவிப்பு அமைப்புகளை மாற்றுங்கள்"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"சாதனத்தில் காட்டப்படும் ஆப்ஸ்"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR உதவிச் சேவைகள்"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"VR உதவிச் சேவைகளாக இயங்குவதற்காகக் கோரிய ஆப்ஸ் எதுவும் நிறுவப்படவில்லை."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g>ஐ அணுக VR சேவையை அனுமதிக்கவா?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"இயல்பாகத் திற"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"இணைப்புகளைத் திறக்க"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"ஆதரிக்கப்படும் இணைப்புகளைத் திறத்தல்"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"ஆதரிக்கப்படும் இணைப்புகள் இந்த ஆப்ஸில் திறக்கும்"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"இந்த ஆப்ஸில் திறக்கப்பட வேண்டிய இணைப்புகள்"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"கேட்காமலே திறக்கும்"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"ஆதரிக்கப்படும் இணைப்புகள்"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"பிற இயல்புகள்"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"பிற இயல்பான விருப்பத்தேர்வுகள்"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"இணைப்பைச் சேர்"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"ஆப்ஸில் இணைப்புகளைத் தானாகத் திறக்க ஆப்ஸ் அவற்றைச் சரிபார்க்கலாம். "<annotation id="url">"மேலும் அறிக"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> சரிபார்க்கப்பட்ட இணைப்புகள்</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> சரிபார்க்கப்பட்ட இணைப்பு</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">இந்த இணைப்புகள் சரிபார்க்கப்பட்டு தானாகவே இந்த ஆப்ஸில் திறக்கும்.</item>
+      <item quantity="one">இந்த இணைப்பு சரிபார்க்கப்பட்டு தானாகவே இந்த ஆப்ஸில் திறக்கும்.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"சரி"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"பிற ஆதரிக்கப்படும் இணைப்புகளைத் தேடுகிறது…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"ரத்துசெய்"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ஆதரிக்கப்படும் இணைப்புகள்</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ஆதரிக்கப்படும் இணைப்பு</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"சேர்"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> ஆப்ஸில் திறக்கும்"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>: <xliff:g id="SIZE">%1$s</xliff:g> பயன்படுத்தப்பட்டது"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"அகச் சேமிப்பகம்"</string>
     <string name="storage_type_external" msgid="125078274000280821">"வெளிப்புறச் சேமிப்பகம்"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"கேமரா அனுமதிக்கப்படவில்லை"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"ஸ்கிரீன்ஷாட் அனுமதிக்கப்படவில்லை"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"இந்தப் பயன்பாட்டைத் திறக்க முடியாது"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"கேள்விகள் இருந்தால், IT நிர்வாகியைத் தொடர்புகொள்ளவும்"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"மேலும் விவரங்கள்"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"உங்கள் நிர்வாகியால் அமைப்புகள், அனுமதிகள், கார்ப்பரேட் அணுகல், நெட்வொர்க் செயல்பாடு, சாதனத்தின் இருப்பிடத் தகவல் உட்பட உங்கள் பணி விவரத்துடன் தொடர்புடைய பயன்பாடுகளையும் தரவையும் கண்காணிக்கவும் நிர்வகிக்கவும் முடியும்."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"உங்கள் நிர்வாகியால் அமைப்புகள், அனுமதிகள், கார்ப்பரேட் அணுகல், நெட்வொர்க் செயல்பாடு, சாதனத்தின் இருப்பிடத் தகவல் உட்பட இந்தப் பயனருடன் தொடர்புடைய பயன்பாடுகளையும் தரவையும் கண்காணிக்கவும் நிர்வகிக்கவும் முடியும்."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 கட்டுப்பாடு</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"மொபைல் நிறுவனம் கணக்கிடும் டேட்டா அளவும், சாதனம் கணக்கிடும் டேட்டா அளவும் மாறுபடலாம்"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"மொபைல் நிறுவன நெட்வொர்க்குகள் மூலம் பயன்படுத்திய டேட்டா தவிர்த்து"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"மொபைல் நிறுவன நெட்வொர்க்குகள் பயன்படுத்திய டேட்டா அளவு சேர்க்கப்படவில்லை"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> பயன்படுத்தப்பட்டது"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"டேட்டா பயன்பாட்டு எச்சரிக்கையை அமை"</string>
     <string name="data_warning" msgid="2925054658166062884">"டேட்டா பயன்பாட்டு எச்சரிக்கை"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g>க்கு நிறுவல்நீக்கப்பட்டது)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g>க்கு முடக்கப்பட்டது)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"தன்னிரப்பிச் சேவை"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"தானாக, நிரப்பு, தானாக நிரப்பு, தன்னிரப்பி"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"கடவுச்சொற்கள்"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"தானியங்கு, நிரப்பு, தன்னிரப்பி, கடவுச்சொல்"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;இந்த ஆப்ஸை நம்புகிறீர்கள் என்பதை உறுதிப்படுத்திக்கொள்ளவும்&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; உங்கள் திரையில் இருப்பதைப் பயன்படுத்தி, எவற்றையெல்லாம் தன்னிரப்ப முடியும் என்பதைத் தீர்மானிக்கும்."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"தன்னிரப்பி"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Logging நிலை"</string>
@@ -4878,7 +4926,7 @@
     <string name="mobile_network_sim_name_label" msgid="1452440641628369625">"பெயர்"</string>
     <string name="mobile_network_sim_color_label" msgid="5293944087609632340">"வண்ணம் (இணக்கமான ஆப்ஸ் உபயோகிப்பவை)"</string>
     <string name="mobile_network_sim_name_rename" msgid="5967588549571582924">"சேமி"</string>
-    <string name="mobile_network_use_sim_on" msgid="7298332437547707908">"இந்த சிம்மைப் பயன்படுத்து"</string>
+    <string name="mobile_network_use_sim_on" msgid="7298332437547707908">"சிம்மைப் பயன்படுத்து"</string>
     <string name="mobile_network_use_sim_off" msgid="6303281166199670639">"முடக்கு"</string>
     <string name="mobile_network_disable_sim_explanation" msgid="2851862257846773796">"சிம் கார்டை அகற்றுவதன் மூலம் அதனை முடக்கலாம்"</string>
     <string name="mobile_network_tap_to_activate" msgid="4139979375717958102">"<xliff:g id="CARRIER">%1$s</xliff:g> சிம்மை இயக்குவதற்குத் தட்டவும்"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"நெட்வொர்க் இயங்கும் பயன்முறையை மாற்று"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"விருப்பமான நெட்வொர்க் வகை"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"மொபைல் நிறுவனம்"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"அமைப்புகளின் பதிப்பு"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"மொபைல் நிறுவன அமைப்புகளின் பதிப்பு"</string>
     <string name="call_category" msgid="641461844504128789">"அழைப்பு"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"மொபைல் நிறுவன வீடியோ அழைப்பு"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"சிஸ்டம் தேர்வு"</string>
@@ -4906,7 +4954,7 @@
     <string name="register_automatically" msgid="5208258089316657167">"தானியங்குப் பதிவு…"</string>
     <string name="roaming_alert_title" msgid="9052791521868787985">"டேட்டா ரோமிங்கை அனுமதிக்கவா?"</string>
     <string name="roaming_check_price_warning" msgid="5876977438036791361">"கட்டணம் பற்றி அறிய நெட்வொர்க் வழங்குநரைத் தொடர்புகொள்ளவும்."</string>
-    <string name="mobile_data_usage_title" msgid="2047864499317759728">"ஆப்ஸின் டேட்டா ஆப்ஸ்"</string>
+    <string name="mobile_data_usage_title" msgid="2047864499317759728">"ஆப்ஸ் டேட்டா உபயோகம்"</string>
     <string name="mobile_network_mode_error" msgid="9222056129897416074">"தவறான நெட்வொர்க் பயன்முறை <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. நிராகரி."</string>
     <string name="mobile_network_apn_title" msgid="5582995550142073054">"ஆக்சஸ் பாயிண்ட் நேம்கள்"</string>
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> உடன் இணைந்திருக்கும்போது கிடைக்காது"</string>
@@ -4915,7 +4963,7 @@
     <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ஐ ஆன் செய்யவா?"</string>
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"சிம்மை ஆன் செய்யவா?"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>க்கு மாற்றவா?"</string>
-    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"சிம் கார்டைப் பயன்படுத்தவா?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"சிம் கார்டுப் பயன்பாட்டிற்கு மாற்றவா?"</string>
     <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ஒரு நேரத்தில் ஒரு சிம் மட்டுமே செயலில் இருக்கும்.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> சேவைக்கு மாற்றுவதனால் <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> சேவை ரத்துசெய்யப்படாது."</string>
     <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ஒரு நேரத்தில் ஒரு பதிவிறக்கிய சிம் மட்டுமே செயலில் இருக்கும்.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> சேவைக்கு மாற்றுவதனால் <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> சேவை ரத்துசெய்யப்படாது."</string>
     <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ஒரு நேரத்தில் ஒரு சிம் மட்டுமே செயலில் இருக்கும்.\n\nமாற்றுவதனால் <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> சேவை ரத்துசெய்யப்படாது."</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"சிம்மை அகற்றிவிட்டு மீண்டும் செருகவும். சிக்கல் தொடரும்பட்சத்தில் சாதனத்தை மீண்டும் தொடங்கவும்."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"சிம்மை மீண்டும் ஆன் செய்து பார்க்கவும். சிக்கல் தொடரும்பட்சத்தில் சாதனத்தை மீண்டும் தொடங்கவும்."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"மொபைல் நெட்வொர்க்கை இயக்குதல்"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"மொபைல் நிறுவனத்தை மாற்றுகிறது"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> செயல்பாட்டில் உள்ளது"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM அமைப்புகளை மாற்ற தட்டவும்"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>க்கு மாற்றப்பட்டது"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"ஆஃப்"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"இணையம்"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"சிம்கள்"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"விமானப் பயன்முறை நெட்வொர்க்குகளைக் காட்டு"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"விமானப் பயன்முறையில் நெட்வொர்க்குகளைக் கண்டறிந்து அவற்றுடன் இணைக்கும்."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"வைஃபை நெட்வொர்க்குகளைக் கண்டறிந்து அவற்றுடன் இணைக்கும்"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"விமானம், விமானப்-பாதுகாப்பு"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"அழைப்புகள் &amp; மெசேஜ்"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"வைஃபை அழைப்பு"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"அழைப்புகள்/மெசேஜ் செய்ய முடியாது"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"தற்காலிகமாகக் கிடைக்கவில்லை"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"சிம் இல்லை"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"விருப்பத்தேர்வுகள்"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"நெட்வொர்க் விருப்பத்தேர்வுகள்"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"பொது நெட்வொர்க்குகளுடன் இணைக்கலாம்"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"நெட்வொர்க் இணைப்பு, இணையம், வயர்லெஸ், டேட்டா, வைஃபை, வை-ஃபை, வை ஃபை, செல்லுலார், மொபைல், செல் கேரியர், 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"விமானப் பயன்முறை நெட்வொர்க்குகளை காட்டு"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"விமானப் பயன்முறை நெட்வொர்க்குகளைக் காட்டுகிறது"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"நெட்வொர்க்குகளை ஆன் செய்தல்"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"நெட்வொர்க்குகளை ஆஃப் செய்தல்"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"இணையத்தை மீட்டமைக்கவா?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"இது உங்கள் அழைப்பைத் துண்டிக்கும்"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"இது உங்கள் அழைப்பைத் துண்டிக்கும்"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"இணையத்தை மீட்டமைக்கிறது…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"இணைப்புநிலையைச் சரிசெய்"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"விமானப் பயன்முறை நெட்வொர்க்குகள் கிடைக்கின்றன"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"நெட்வொர்க்குகளை மாற்ற ஈதர்நெட் இணைப்பைத் துண்டிக்கவும்"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"இணைப்பில் இருக்கும்போது நெட்வொர்க்குகளை மாற்ற முடியாது"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"விமானப் பயன்முறை நெட்வொர்க்குகள்"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"இணைக்கப்பட்டது"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"இணையத்துடன் தானாகவே இணைக்காது"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"வண்ணம்"</string>
     <string name="category_name_others" msgid="2366006298768550310">"மற்றவை"</string>
     <string name="category_name_general" msgid="7737273712848115886">"பொதுவானவை"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"எல்லா ஆப்ஸையும் காட்டு"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"ஸ்மார்ட் முன்னனுப்புதல்"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"ஸ்மார்ட் முன்னனுப்புதல் அம்சம் இயக்கப்பட்டது"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"மொபைல் எண்ணை உள்ளிடுக"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"மொபைல் எண் உள்ளிடப்படவில்லை."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"சரி"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G சேவையை அனுமதி"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G செல்லுலார் இணைப்புகளைப் பயன்படுத்துதல். அவசர அழைப்புகளுக்கு 2G நெட்வொர்க் எப்போதும் இயக்கத்தில் இருக்கும்."</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 231a6fe..aef4844 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"స్క్రీన్‌పై ఉండే వచనాన్ని చిన్నదిగా లేదా పెద్దదిగా చేస్తుంది."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"చిన్నదిగా చేస్తుంది"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"పెద్దదిగా చేస్తుంది"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ఆటో-రొటేట్‌ను ఉపయోగించండి"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"నమూనా వచనం"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"ది వండర్‌ఫుల్ విజర్డ్ ఆఫ్ ఆజ్"</string>
@@ -245,8 +244,8 @@
     <string name="cellular_data_summary" msgid="6551434804367912367">"మొబైల్ నెట్‌వర్క్ ద్వారా డేటాని ఉపయోగించు"</string>
     <string name="allow_data_usage_title" msgid="2645963379925196671">"రోమింగ్‌లో డేటా వినియో. అనుమతి"</string>
     <string name="roaming" msgid="3055365654530847985">"రోమింగ్"</string>
-    <string name="roaming_enable" msgid="7845716016861535340">"రోమింగ్‌లో ఉన్నప్పుడు డేటా సేవలకు కనెక్ట్ చేయి"</string>
-    <string name="roaming_disable" msgid="729512894708689604">"రోమింగ్‌లో ఉన్నప్పుడు డేటా సేవలకు కనెక్ట్ చేయి"</string>
+    <string name="roaming_enable" msgid="7845716016861535340">"రోమింగ్‌లో ఉన్నప్పుడు డేటా సర్వీసులకు కనెక్ట్ చేయండి"</string>
+    <string name="roaming_disable" msgid="729512894708689604">"రోమింగ్‌లో ఉన్నప్పుడు డేటా సర్వీసులకు కనెక్ట్ చేయండి"</string>
     <string name="roaming_reenable_message" msgid="5150423860521673540">"మీరు ఆఫ్ చేయబడిన డేటా రోమింగ్‌తో మీ హోమ్ నెట్‌వర్క్ నుండి నిష్క్రమించినందున డేటా కనెక్టివిటీని కోల్పోయారు."</string>
     <string name="roaming_turn_it_on_button" msgid="6999283810847157816">"దీన్ని ప్రారంభించు"</string>
     <string name="roaming_warning" msgid="7703647889040229013">"రోమింగ్ ఛార్జీలు వర్తించవచ్చు."</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> వేలిముద్ర సెటప్ చేయబడింది</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"వేలిముద్రతో అన్‌లాక్ చేయండి"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"మీ వేలిముద్రను సెటప్ చేయండి"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"మీ వేలిముద్రను ఉపయోగించండి"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి, కొనుగోళ్లను ప్రామాణీకరించడానికి లేదా యాప్‌లకు సైన్ ఇన్ చేయడానికి వేలిముద్ర సెన్సార్‌ను తాకండి. మీరు ఎవరి వేలిముద్రలు జోడిస్తున్నారనే విషయంలో జాగ్రత్త వహించండి. జోడించిన ఒక ప్రింట్ అయినా సరే వీటిలో దేనినైనా చేయగలదు."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"క్లిష్టమైన ఆకృతి లేదా పిన్ కంటే మీ వేలిముద్ర తక్కువ సురక్షితమైనది కావచ్చు."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"మీరు కంట్రోల్ చేయవచ్చు"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"గుర్తుంచుకోండి"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"వేలిముద్ర ద్వారా రికార్డ్ చేయబడిన డేటా సురక్షితంగా స్టోర్ చేయబడుతుంది, మీ ఫోన్ నుండి ఎప్పటికీ తీసివేయబడదు. మీరు సెట్టింగ్‌లలో మీ డేటాను ఎప్పుడైనా తొలగించవచ్చు."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"క్లిష్టమైన ఆకృతి లేదా పిన్ కంటే మీ వేలిముద్ర తక్కువ సురక్షితమైనది కావచ్చు."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"మెరుగైన ఫేస్ మోడల్‌లను క్రియేట్ చేయడానికి మీ ఫోన్ అప్పుడప్పుడు మీ ఇటీవలి వేలిముద్ర ఇమేజ్‌లను ఉపయోగిస్తుంది."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"మీ ఫోన్‌ని అన్‌లాక్ చేయడం లేదా కొనుగోళ్లను ఆమోదించడం కోసం మీ వేలిముద్రను ఉపయోగించండి.\n\nగమనించండి: మీరు మీ వేలిముద్రను ఉపయోగించి ఈ డివైజ్‌ను అన్‌లాక్ చేయలేరు. మరింత సమాచారం కావాలంటే మీ నిర్వాహకులను సంప్రదించండి."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"మీ ఫోన్‌ను అన్‌లాక్ చేయడం లేదా కొనుగోళ్లను ఆమోదించడం కోసం మీ వేలిముద్రను ఉపయోగించండి.\n\nగమనిక: నమూనా లేదా పిన్ కంటే మీ వేలిముద్ర తక్కువ సురక్షితం కావచ్చు."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"రద్దు చేయి"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"వద్దు"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"స్కిప్ చేయి"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"కొనసాగించు"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"అంగీకరించండి"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"దాటవేయి"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"తర్వాత"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"వేలిముద్రను దాటవేయాలా?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"దాటవేయి"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"రద్దు చేయి"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"సెన్సార్‌ని తాకండి"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"తాకి &amp; వేలిముద్ర చిహ్నాన్ని పట్టుకోండి"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"ఇది మీ ఫోన్ వెనుక భాగంలో ఉంది. మీ చూపుడు వేలిని ఉపయోగించండి."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"ఇది స్క్రీన్‌పై ఉంది. మెరుస్తున్న సర్కిల్‌తో వేలిముద్రను చూడండి."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"మీ స్క్రీన్ మీద వేలిముద్ర సెన్సార్ ఉంది. దానిని కనుగొనడానికి, స్క్రీన్ అంతటా వేలిని జరపండి."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"పరికరం మరియు వేలిముద్ర సెన్సార్ స్థానంతో చిత్రపటం"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"పేరు"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"సరే"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"తొలగించు"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"సెన్సార్‌ని తాకండి"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"మీ వేలిని సెన్సార్‌పై ఉంచి, మీకు వైబ్రేషన్ అనుభూతి కలిగిన తర్వాత దాన్ని తీసివేయండి"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"పైకి ఎత్తి, మళ్లీ తాకండి"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"మీ వేలిముద్ర యొక్క వివిధ భాగాలను జోడించడం కోసం మీ వేలిని అనేకసార్లు పైకి ఎత్తండి"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"వేలిముద్ర జోడించబడింది"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"మీకు ఈ చిహ్నం కనిపించినప్పుడు, గుర్తింపు లేదా కొనుగోళ్ల ఆమోదం కోసం మీ వేలిముద్రను ఉపయోగించండి"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"దీనిని తర్వాత చేయి"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"సెర్చ్"</string>
     <string name="display_settings" msgid="7197750639709493852">"డిస్‌ప్లే"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"స్క్రీన్ ఆటో-రొటేట్‌"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"ఆఫ్‌లో ఉంది"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"ఆన్‌లో ఉంది"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"\'ముఖం ఆధారం\'ను ఆన్ చేయండి"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"ముఖ గుర్తింపును ఎనేబుల్ చేయండి"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"రంగులు"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"సహజం"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"మెరుగుపరిచినవి"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ఆన్ / మీరు స్క్రీన్ వేపే చూస్తూ ఉంటే అది ఆఫ్ కాదు"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"ఆఫ్‌లో ఉంది"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"కెమెరా యాక్సెస్ అవసరం"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"\'పరికరం వ్యక్తిగతీకరణ సేవల\' కోసం అనుమతులను నిర్వహించడానికి నొక్కండి"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"మీరు స్క్రీన్ వైపు చూస్తున్నప్పుడు అది ఆఫ్ కాకుండా నివారిస్తుంది"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"స్క్రీన్ వైపు ఎవరైనా చూస్తున్నారా అని స్క్రీన్ అటెన్ష‌న్‌ ముందరి కెమెరాను ఉపయోగిస్తుంది. ఇది పరికరంలో పనిచేస్తుంది మరియు చిత్రాలు Googleలో నిల్వ కావు లేదా పంపబడవు."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"స్క్రీన్ అటెన్షన్‌ను ఆన్ చేయి"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"స్క్రీన్ చీకటిగా ఉన్నప్పుడు, కొన్ని నోటిఫికేషన్‌ల కోసం ఇది ఆన్ అవుతుంది"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"టైమ్, సమాచారం ఎల్లప్పుడూ చూపు"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"బ్యాటరీ వినియోగం పెరుగుతుంది"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"బోల్డ్ టెక్స్ట్"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"బోల్డ్ టెక్స్ట్"</string>
     <string name="title_font_size" msgid="570613010306330622">"ఫాంట్ పరిమాణం"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"వచనాన్ని పెద్దదిగా లేదా చిన్నదిగా చేస్తుంది"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"సిమ్ కార్డు లాక్ సెట్టింగ్‌లు"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"ఇతర వినియోగదారులు"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"పరికర నిల్వ"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"పోర్టబుల్ నిల్వ"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"అలారాలు మరియు రిమైండర్‌లు"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"అలారాలు లేదా రిమైండర్‌లను సెట్ చేయడానికి అనుమతించు"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"అలారాలు మరియు రిమైండర్‌లు"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"అలారాలు లేదా ఇతర సమయ ఆధారిత ఈవెంట్‌లను షెడ్యూల్ చేయడానికి ఈ యాప్‌ను అనుమతించండి. మీరు పరికరాన్ని ఉపయోగించనప్పుడు కూడా యాప్ మేల్కొలపడానికి అలాగే అమలు చేయడానికి ఇది అనుమతిస్తుంది. ఈ అనుమతిని ఉపసంహరించుకోవడం యాప్ పనిచేయకపోవటానికి కారణమవుతుందని గమనించండి, ప్రత్యేకంగా యాప్ షెడ్యూల్ చేసిన ఏవైనా అలారాలు ఇకపై పనిచేయవు."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"షెడ్యూల్, అలారం, రిమైండర్, ఈవెంట్"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g>లో <xliff:g id="USED">%1$s</xliff:g> ఉపయోగించబడింది"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g>లో ఉపయోగించినది"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"స్థాన సేవలు"</string>
     <string name="location_title" msgid="5819154746934945021">"నా స్థానం"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ఆఫీస్ ప్రొఫైల్ కోసం లొకేషన్"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"యాప్‌లు - లొకేషన్‌ యాక్సెస్"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"లొకేష‌న్ ఆఫ్‌లో ఉంది"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> యాప్‌లలో <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>కి లొకేషన్‌కు యాక్సెస్ ఉంది</item>
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> యాప్‌లలో <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g>కి లొకేషన్‌కు యాక్సెస్ ఉంది</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"ఇటీవలి స్థాన యాక్సెస్"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"వివరాలను చూడండి"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"యాప్‌లు ఏవీ లొకేషన్‌ను ఇటీవల అభ్యర్థించలేదు"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"యాప్‌లు ఏవీ స్థానాన్ని ఇటీవల యాక్సెస్ చేయలేదు"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"అధిక బ్యాటరీ వినియోగం"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"తక్కువ బ్యాటరీ వినియోగం"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi, బ్లూటూత్‌ స్కానింగ్‌"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi‑Fi స్కానింగ్"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi‑Fi ఆఫ్‌లో ఉన్నా కూడా, ఏ సమయంలోనైనా Wi‑Fi నెట్‌‍వర్క్‌లను స్కాన్ చేయడానికి యాప్‌లను, సేవలను అనుమతించండి. ఉదాహరణకు, లొకేషన్ ఆధారిత ఫీచర్‌లు, సేవలను మెరుగుపరచడానికి దీనిని ఉపయోగించవచ్చు."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"బ్లూటూత్ స్కానింగ్"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"బ్లూటూత్ ఆఫ్‌లో ఉన్నప్పుడు కూడా, ఏ సమయంలోనైనా సమీపంలోని పరికరాలను స్కాన్ చేయడానికి యాప్‌లను, సేవలను అనుమతించండి. ఉదాహరణకు, లొకేషన్ ఆధారిత ఫీచర్‌లు, సేవలను మెరుగుపరచడానికి దీనిని ఉపయోగించవచ్చు."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"లొకేషన్ సర్వీస్‌లు"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ఆఫీస్ కోసం స్థాన సేవలు"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"లొకేషన్ టైమ్ జోన్ గుర్తింపు"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"లొకేషన్ టైమ్ జోన్ గుర్తింపు"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"ప్రస్తుత టైమ్ జోన్‌ను గుర్తించడానికి పరికరం‌ యొక్క లొకేషన్‌ను ఉపయోగించడానికి అనుమతిస్తుంది. Wi‑Fi స్కానింగ్ వంటి ఇతర లొకేషన్ సెట్టింగ్‌లు టైమ్ జోన్ గుర్తింపు యొక్క ఖచ్చితత్వాన్ని ప్రభావితం చేస్తాయి."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ఆన్‌లో ఉంది"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ఆఫ్‌లో ఉంది"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ఆటోమేటిక్ టైమ్ జోన్ గుర్తింపు డిజేబుల్ చేయబడింది"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"ఆటోమేటిక్ టైమ్ జోన్ ఆఫ్‌లో ఉంది"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"లొకేషన్ టైమ్ జోన్ గుర్తింపు డిజేబుల్ చేయబడింది"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"లొకేషన్ టైమ్ జోన్ గుర్తింపుకు మద్దతు లేదు"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"లొకేషన్ టైమ్ జోన్ గుర్తింపు మార్పులు అనుమతించబడవు"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"ప్రారంభించు"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"నిల్వను తీసివేయండి"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"అప్‌డేట్‌లను అన్‌ఇన్‌స్టాల్ చేయండి"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"మీరు కొన్ని చర్యల కోసం ఈ యాప్‌ను డిఫాల్ట్‌గా ప్రారంభించడానికి ఎంచుకున్నారు."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"మీరు ఎంచుకున్న కొన్ని యాక్టివిటీలు ఈ యాప్‌లో ఆటోమేటిక్‌గా తెరవబడతాయి."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"మీరు విడ్జెట్‌లను సృష్టించడానికి మరియు వాటి డేటాను యాక్సెస్ చేయడానికి ఈ యాప్‌ను ఎంచుకున్నారు."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"ఆటోమేటిక్ ఆప్ష‌న్‌లు ఏవీ సెట్ చేయ‌‌లేదు."</string>
-    <string name="clear_activities" msgid="341345438786077236">"డిఫాల్ట్‌లను క్లియర్ చేయి"</string>
+    <string name="clear_activities" msgid="488089228657585700">"ఆటోమేటిక్ సెట్టింగ్ ప్రాధాన్యతలను క్లియర్ చేయండి"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"ఈ యాప్ మీ స్క్రీన్ కోసం రూపొందించబడి ఉండకపోవచ్చు. మీరు దీన్ని మీ స్క్రీన్‌కు ఎలా సర్దుబాటు చేయాలనేదాన్ని ఇక్కడ నియంత్రించవచ్చు."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"ప్రారంభించేటప్పుడు అడుగు"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"స్కేల్ యాప్"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"మీ అవసరాలకు అనుగుణంగా ఈ పరికరాన్ని అనుకూలీకరించవచ్చు. ఈ యాక్సెస్ ఫీచర్‌లను సెట్టింగ్‌లలో తర్వాత మార్చవచ్చు."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"ఫాంట్ పరిమాణాన్ని మార్చండి"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"స్క్రీన్ రీడర్‌లు"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"ఆడియో &amp; స్క్రీన్‌పై ఉండే టెక్స్ట్"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"క్యాప్షన్‌లు"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"ఆడియో"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"సాధారణం"</string>
     <string name="display_category_title" msgid="6638191682294461408">"డిస్‌ప్లే"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"టెక్స్ట్, డిస్‌ప్లే"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"స్క్రీన్‌ను ముదురు రంగులో కనిపించేలా చేయండి"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ఎరుపు-ఆకుపచ్చ రంగు"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ఎరుపు-ఆకుపచ్చ రంగు"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"నీలం-పసుపు"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ప్రకాశాన్ని తగ్గించండి"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"ప్రకాశాన్ని తగ్గించండి"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"మీ ఫోన్ కనీస ప్రకాశం కంటే స్క్రీన్‌ను ముదురు రంగులో ఉంచండి"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"మీ టాబ్లెట్ కనీస ప్రకాశం కంటే స్క్రీన్‌ను ముదురు రంగులో ఉంచండి"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"మీ స్క్రీన్‌ను ముదురు రంగులో ఉంచండి, తద్వారా చదవడానికి మరింత సౌకర్యంగా ఉంటుంది.&lt;br/&gt;&lt;br/&gt; ఇది ఈ విషయాలలో సహాయపడుతుంది: &lt;ol&gt; &lt;li&gt; మీ ఫోన్ ఆటోమేటిక్ సెట్టింగ్ కనీస ప్రకాశం ఇప్పటికీ చాలా ప్రకాశవంతంగా ఉన్నప్పుడు&lt;/li&gt; &lt;li&gt; రాత్రిపూట లేదా నిద్రపోయే ముందు రూమ్‌లో ఉండేటటువంటి చీకటి పరిస్థితులలో మీరు మీ ఫోన్‌ను ఉపయోగిస్తున్నప్పుడు&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3176,7 +3197,7 @@
 </xliff:g>ఈ సమాచారం, వీడియో కాల్స్‌లాంటి నిర్దిష్ట ఫీచర్‌లు లేదా కొన్ని మెసేజింగ్ ఫీచర్‌లను మీ కాంటాక్ట్‌లలో ఉన్నవారు ఉపయోగించగలుగుతారో లేదో గుర్తిస్తుంది."</string>
     <string name="preferred_network_type_title" msgid="812509938714590857">"ప్రాధాన్య నెట్‌వర్క్ రకం"</string>
     <string name="preferred_network_type_summary" msgid="8786291927331323061">"LTE (సిఫార్సు చేయబడింది)"</string>
-    <string name="mms_message_title" msgid="6624505196063391964">"MMS సందేశాలు"</string>
+    <string name="mms_message_title" msgid="6624505196063391964">"MMS మెసేజ్‌లు"</string>
     <string name="mms_message_summary" msgid="2855847140141698341">"మొబైల్ డేటా ఆఫ్‌లో ఉన్నప్పుడు పంపుతుంది &amp; అందుకుంటుంది"</string>
     <string name="data_during_calls_title" msgid="3940276893360429144">"కాల్స్ మాట్లాడే సమయంలో ఉపయోగించే డేటా"</string>
     <string name="data_during_calls_summary" msgid="2289050189544214759">"కేవలం కాల్స్ మాట్లాడే సమయంలో మొబైల్ డేటాను ఉపయోగించడానికి ఈ SIMను అనుమతించండి"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"ముఖం"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"వేలిముద్ర, వేలిముద్రను జోడించు"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"కాంతిహీన స్క్రీన్, టచ్‌స్క్రీన్, బ్యాటరీ, స్మార్ట్ ప్రకాశం, గతిశీల ప్రకాశం, స్వీయ ప్రకాశం"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"స్క్రీన్‌ కాంతిహీనం, స్లీప్, బ్యాటరీ, గడువు ముగింపు, అటెన్ష‌న్‌, ప్రదర్శన, స్క్రీన్, ఇన్‌యాక్టివ్‌"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"తిప్పండి, తిప్పు, పరిభ్రమణం, పోర్ట్రెయిట్, ల్యాండ్‌స్కేప్, ఓరియంటేషన్, నిలువు, అడ్డం"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"అప్‌గ్రేడ్, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, షెడ్యూల్, నోటిఫికేషన్‌లు, బ్లాక్ చేయి, నిశ్శబ్దం, వైబ్రేట్, స్లీప్, కార్యాలయం, దృష్టి సారించడం, ధ్వని, మ్యూట్, రోజు, వారంలో రోజు, వారాంతం, వారంలో రాత్రి, ఈవెంట్"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"స్క్రీన్, లాక్ సమయం, గడువు ముగింపు, లాక్‌స్క్రీన్"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"రింగ్‌టోన్‌లు"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"ఇతర ధ్వనులు మరియు వైబ్రేషన్‌లు"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"నోటిఫికేషన్‌లు"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"సంభాషణ"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"ఇటీవల పంపినవి"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"గత 7 రోజుల నుండి అన్నింటినీ చూడండి"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"అధునాతన సెట్టింగ్‌లు"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"సాధారణం"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"కార్యాలయ నోటిఫికేషన్‌లు"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"అనుకూల నోటిఫికేషన్‌లు"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"అనుకూల నోటిఫికేషన్ ప్రాధాన్యత"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"కిందకు-లాగే షేడ్, స్థితి పట్టీ &amp; లాక్ స్క్రీన్‌లో ప్రదర్శింపబడుతుంది"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"స్టేటస్ బార్‌లో నిశ్శబ్ద నోటిఫికేషన్‌లను దాచు"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"కాంతి మిణుకుమిణుకు అనేలా ఉంచు"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"లాక్‌స్క్రీన్‌లో నోటిఫికేషన్స్"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"గోప్యత"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"లాక్ స్క్రీన్‌ను దాటవేయి"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ఫేస్ అన్‌లాక్ చేశాక చివరిసారి ఉపయోగించిన స్క్రీన్‌కు తీసుకువెళుతుంది"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"లాక్ స్క్రీన్, లాక్ స్క్రీన్, దాటవేయి, బైపాస్"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">వారానికి ~<xliff:g id="NUMBER_0">%d</xliff:g> నోటిఫికేషన్</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"ఎప్పటికీ వ‌ద్దు"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"నోటిఫికేషన్ యాక్సెస్"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"పరికరం &amp; యాప్ నోటిఫికేషన్‌లు"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"మీ యాప్‌లు, అలాగే పరికరాల్లో ఏ నోటిఫికేషన్‌లు చూపించాలి అనే దానిని కంట్రోల్ చేయండి"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"కార్యాలయ ప్రొఫైల్‌ నోటిఫికేషన్‌లకు యాక్సెస్ బ్లాక్ చేయబడింది"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"యాప్‌లు నోటిఫికేషన్‌లను చదవలేవు"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"ఆఫ్ చేయండి"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"రద్దు చేయి"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"అనుమతించిన నోటిఫికేషన్ రకాలు"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"ముఖ్యమైన కొనసాగుతున్న నోటిఫికేషన్‌లు"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"సంభాషణ నోటిఫికేషన్‌లు"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"అలర్ట్ చేసే నోటిఫికేషన్‌లు"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"నిశ్శబ్ద నోటిఫికేషన్‌లు"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"రియల్-టైమ్"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"ఉపయోగంలో ఉన్న యాప్‌లు, నావిగేషన్, ఫోన్ కాల్‌లు, మరిన్నింటి నుండి రియల్-టైమ్ కమ్యూనికేషన్"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"సంభాషణలు"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS, ఇతర కమ్యూనికేషన్‌లు"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"ఆటోమేటిక్ సెట్టింగ్"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"సెట్టింగ్‌ల మీద ఆధారపడి రింగ్ లేదా వైబ్రేట్ అయ్యే నోటిఫికేషన్‌లు"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"సైలెంట్"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"సౌండ్ లేదా వైబ్రేషన్‌లు ఎప్పుడూ చేయని నోటిఫికేషన్‌లు"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"అన్ని యాప్‌లను చూడండి"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"నోటిఫికేషన్‌లను పంపించగలిగే ప్రతి యాప్ కోసం నోటిఫికేషన్ సెట్టింగ్‌లను మార్చుకోండి"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"పరికరంలో కనిపించే యాప్‌లు"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR సహాయక సేవలు"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"ఇన్‌స్టాల్ చేసిన యాప్‌లు ఏవీ VR సహాయక సేవలుగా అమలు కావడానికి అభ్యర్థించబడలేదు."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> కోసం VR సేవ ప్రాప్యతను అనుమతించాలా?"</string>
@@ -3831,9 +3856,9 @@
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"నక్షత్రం గుర్తు ఉన్న పరిచయాలు"</string>
     <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ఏవీ లేవు}=1{{contact_1}}=2{{contact_1}, {contact_2}}=3{{contact_1}, {contact_2}, {contact_3}}other{{contact_1}, {contact_2}, # మంది ఇతరులు}}"</string>
     <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(పేరు లేదు)"</string>
-    <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
+    <string name="zen_mode_messages" msgid="7315084748885170585">"మెసేజ్‌లు"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"మెసేజ్‌లు"</string>
-    <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
+    <string name="zen_mode_messages_title" msgid="1777598523485334405">"మెసేజ్‌లు"</string>
     <string name="zen_mode_messages_header" msgid="253721635061451577">"అంతరాయం కలిగించగల మెసేజ్‌లు"</string>
     <string name="zen_mode_messages_footer" msgid="6002468050854126331">"అనుమతించిన మెసేజ్‌లు వచ్చినప్పుడు శబ్దం వస్తుందని నిర్ధారించుకోవడానికి, పరికరం రింగ్ మోడ్‌లో ఉందో లేదో చెక్ చేయండి"</string>
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’కి సంబంధించిన ఇన్‌కమింగ్ కాల్‌లు బ్లాక్ చేయబడ్డాయి. మీ స్నేహితులు, కుటుంబ సభ్యులు లేదా ఇతర పరిచయాలు మిమ్మల్ని సంప్రదించగలిగేలా మీరు సెట్టింగ్‌లను సర్దుబాటు చేయవచ్చు."</string>
@@ -3976,9 +4001,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"ఆటోమేటిక్‌గా తెరువు"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"లింక్‌లను తెరవడం"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"మద్దతిచ్చే లింక్‌లను తెరవడం"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"సపోర్ట్ చేయబడిన లింక్‌లు ఈ యాప్‌లో తెరవబడతాయి"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"ఈ యాప్‌లో తెరవబడే లింక్‌లు"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"అడగకుండానే తెరవాలి"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"మద్దతిచ్చే లింక్‌లు"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"ఇతర డిఫాల్ట్‌లు"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"ఇతర ఆటోమేటిక్ సెట్టింగ్ ప్రాధాన్యతలు"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"లింక్‌ను యాడ్ చేయి"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"యాప్‌లో ఆటోమేటిక్‌గా తెరవబడే లింక్‌లను ఆ యాప్ వెరిఫై చేయగలదు. "<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> వెరిఫై చేయబడిన లింక్‌లు</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> వెరిఫై చేయబడిన లింక్</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">ఈ లింక్‌లు వెరిఫై చేయబడ్డాయి, అవి ఈ యాప్‌లో ఆటోమేటిక్‌గా తెరవబడతాయి.</item>
+      <item quantity="one">ఈ లింక్ వెరిఫై చేయబడింది, అది ఈ యాప్‌లో ఆటోమేటిక్‌గా తెరవబడుతుంది.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"సరే"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"సపోర్ట్ చేయబడిన ఇతర లింక్‌ల కోసం చెక్ చేస్తోంది…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"రద్దు చేయి"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> సపోర్ట్ చేయబడిన లింక్‌లు</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> సపోర్ట్ చేయబడిన లింక్</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"జోడించు"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g>లో తెరవబడుతుంది"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>లో <xliff:g id="SIZE">%1$s</xliff:g> ఉపయోగించబడింది"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"అంతర్గత నిల్వ"</string>
     <string name="storage_type_external" msgid="125078274000280821">"బాహ్య నిల్వ"</string>
@@ -4078,9 +4124,9 @@
     <string name="always_running" msgid="9012705720688200252">"ఎల్లప్పుడూ అమలు చేయబడుతోంది (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
     <string name="sometimes_running" msgid="7954947311082655448">"కొన్నిసార్లు అమలు చేయబడుతోంది (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
     <string name="rarely_running" msgid="2704869567353196798">"అరుదుగా అమలు చేయబడుతోంది (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
-    <string name="memory_max_use" msgid="8721866158069974846">"గరిష్టం"</string>
+    <string name="memory_max_use" msgid="8721866158069974846">"గరిష్ఠం"</string>
     <string name="memory_avg_use" msgid="4620476409349875703">"సగటు"</string>
-    <string name="memory_max_desc" msgid="6966923521720393526">"గరిష్టం <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
+    <string name="memory_max_desc" msgid="6966923521720393526">"గరిష్ఠం <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_avg_desc" msgid="2632995851138152303">"సగటు <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="4376086847362492613">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="4239069158701023623">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
@@ -4273,7 +4319,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"కెమెరాకి అనుమతి లేదు"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"స్క్రీన్‌షాట్ తీయడానికి అనుమతి లేదు"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"ఈ యాప్‌ని తెరవలేరు"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"మీకు ఏవైనా సందేహాలు ఉంటే, మీ IT అడ్మిన్‌ను సంప్రదించండి"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"మరిన్ని వివరాలు"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"సెట్టింగ్‌లు, అనుమతులు, కార్పొరేట్ యాక్సెస్, నెట్‌వర్క్ కార్యకలాపం మరియు డివైజ్ యొక్క స్థాన సమాచారంతో పాటు మీ కార్యాలయ ప్రొఫైల్‌కి అనుబంధితంగా ఉన్న యాప్‌లు మరియు డేటాని మీ నిర్వాహకులు పర్యవేక్షించగలరు మరియు నిర్వహించగలరు ."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"సెట్టింగ్‌లు, అనుమతులు, కార్పొరేట్ యాక్సెస్, నెట్‌వర్క్ కార్యకలాపం మరియు డివైజ్ యొక్క స్థాన సమాచారంతో పాటు ఈ వినియోగదారుకి అనుబంధితంగా ఉన్న యాప్‌లు  మరియు డేటాని మీ నిర్వాహకులు పర్యవేక్షించగలరు మరియు నిర్వహించగలరు."</string>
@@ -4350,7 +4397,7 @@
       <item quantity="one">1 పరిమితి</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"క్యారియర్ డేటా గణన మరియు పరికర డేటా గణన మధ్య తేడా ఉండవచ్చు"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"క్యారియర్ నెట్‌వర్క్‌ల ద్వారా వినియోగించబడిన డేటా మినహాయించబడుతుంది"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"క్యారియర్ నెట్‌వర్క్‌ల ద్వారా వినియోగించబడిన డేటా మినహాయించబడుతుంది"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> వినియోగించబడింది"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"డేటా హెచ్చరికను సెట్ చేయండి"</string>
     <string name="data_warning" msgid="2925054658166062884">"డేటా హెచ్చరిక"</string>
@@ -4687,7 +4734,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g>కు అన్ఇన్‌స్టాల్ చేయబడింది)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g>కు నిలిపివేయబడింది)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"ఆటోఫిల్‌ సేవ"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"స్వయంచాలకం, పూరించు, స్వీయ పూరింపు"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"పాస్‌వర్డ్‌లు"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"ఆటో, పూరించు, ఆటోఫిల్, పాస్‌వర్డ్"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;ఈ యాప్‌ను మీరు విశ్వసిస్తున్నట్లు నిర్ధారించండి&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; మీ స్క్రీన్‌పై ఉన్నవాటిని పరిగణనలోకి తీసుకొని వేటిని ఆటోమేటిక్‌గా పూరించాలో నిశ్చయిస్తుంది."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"ఆటోఫిల్"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"లాగింగ్ స్థాయి"</string>
@@ -4880,7 +4928,7 @@
     <string name="mobile_network_sim_name_label" msgid="1452440641628369625">"పేరు"</string>
     <string name="mobile_network_sim_color_label" msgid="5293944087609632340">"రంగు (అనుకూల యాప్‌లు ఉపయోగిస్తాయి)"</string>
     <string name="mobile_network_sim_name_rename" msgid="5967588549571582924">"సేవ్ చేయి"</string>
-    <string name="mobile_network_use_sim_on" msgid="7298332437547707908">"SIMను ఉపయోగించు"</string>
+    <string name="mobile_network_use_sim_on" msgid="7298332437547707908">"SIMను ఉపయోగించండి"</string>
     <string name="mobile_network_use_sim_off" msgid="6303281166199670639">"ఆఫ్"</string>
     <string name="mobile_network_disable_sim_explanation" msgid="2851862257846773796">"ఈ SIMను డిజేబుల్ చేయడానికి, SIM కార్డ్‌ను తీసివేయండి"</string>
     <string name="mobile_network_tap_to_activate" msgid="4139979375717958102">"<xliff:g id="CARRIER">%1$s</xliff:g>ను యాక్టివేట్ చేయడానికి నొక్కండి"</string>
@@ -4894,7 +4942,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"నెట్‌వర్క్ ఆపరేటింగ్ మోడ్‌ను మార్చండి"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ప్రాధాన్యత గల నెట్‌వర్క్ రకం"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"క్యారియర్"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"సెట్టింగ్‌ల వెర్షన్"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"క్యారియర్ సెట్టింగ్‌ల వెర్షన్"</string>
     <string name="call_category" msgid="641461844504128789">"కాల్ చేయడం"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"క్యారియర్ వీడియో కాలింగ్"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"సిస్టమ్ ఎంపిక"</string>
@@ -4917,7 +4965,7 @@
     <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ను ఆన్ చేయాలా?"</string>
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIMను ఆన్ చేయాలా?"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవ్వాలా?"</string>
-    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"సిమ్ కార్డ్‌ను ఉపయోగించడానికి స్విచ్ చేయాలనుకుంటున్నారా?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"సిమ్ కార్డ్‌ను ఉపయోగించాలని అనుకుంటున్నారా?"</string>
     <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ఒకసారి ఒక SIM మాత్రమే యాక్టివ్‌గా ఉంటుంది.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవ్వడం వలన మీ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> సర్వీస్ రద్దు చేయబడదు."</string>
     <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ఒకసారి ఒక డౌన్‌లోడ్ చేయబడిన SIM మాత్రమే యాక్టివ్‌గా ఉంటుంది.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవ్వడం వలన మీ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> సర్వీస్ రద్దు చేయబడదు."</string>
     <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ఒకసారి ఒక SIM మాత్రమే యాక్టివ్‌గా ఉంటుంది.\n\nస్విచ్ అవ్వడం వలన మీ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> సర్వీస్ రద్దు చేయబడదు."</string>
@@ -4943,6 +4991,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIMను తీసివేసి, తిరిగి ఇన్‌సర్ట్ చేయండి. సమస్య ఇంకా కొనసాగితే, మీ పరికరాన్ని రీస్టార్ట్ చేయండి."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIMను తిరిగి ఆన్ చేయడానికి ట్రై చేయండి. సమస్య ఇంకా కొనసాగితే, మీ పరికరాన్ని రీస్టార్ట్ చేయండి."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"నెట్‌వర్క్ యాక్టివేషన్"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"క్యారియర్‌ మారుతోంది"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> యాక్టివ్‌గా ఉంది"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM సెట్టింగ్‌లను అప్‌డేట్ చేయడానికి ట్యాప్ చేయండి"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>కి మార్చబడింది"</string>
@@ -5103,8 +5152,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"ఆఫ్"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"ఇంటర్నెట్"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMలు"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"విమానం మోడ్ నెట్‌వర్క్‌లను చూపించు"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"విమానం మోడ్‌లో ఉన్న నెట్‌వర్క్‌లను కనుగొని, కనెక్ట్ చేయండి."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Wi-Fi నెట్‌వర్క్‌లను కనుగొనండి, కనెక్ట్ అవ్వండి"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"విమానం, విమానం-సురక్షిత"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"కాల్స్ &amp; SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi కాలింగ్"</string>
@@ -5118,22 +5166,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"అందుబాటులో లేదు"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"తాత్కాలికంగా అందుబాటులో లేదు"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"సిమ్ లేదు"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ప్రాధాన్యతలు"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"నెట్‌వర్క్ ప్రాధాన్యతలు"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"పబ్లిక్ నెట్‌వర్క్‌లకు కనెక్ట్ అవ్వండి"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"నెట్‌వర్క్ కనెక్షన్, ఇంటర్‌నెట్, వైర్‌లెస్, డేటా, Wi-Fi, Wi-Fi, Wi-Fi, సెల్యూలార్, మొబైల్, సెల్ క్యారియర్, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"విమానం మోడ్ నెట్‌వర్క్‌లను చూడండి"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"విమానం మోడ్ నెట్‌వర్క్‌లను చూస్తున్నారు"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"నెట్‌వర్క్‌లను ఆన్ చేయండి"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"నెట్‌వర్క్‌లను ఆఫ్ చేయండి"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"మీ ఇంటర్నెట్‌ను రీసెట్ చేయాలా?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"ఇది మీ ఫోన్ కాల్‌ను ముగించింది"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"ఇది మీ ఫోన్ కాల్‌ను ముగించింది"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"మీ ఇంటర్నెట్‌ను రీసెట్ చేస్తోంది…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"కనెక్టివిటీని సరిచేయి"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"విమానం మోడ్ నెట్‌వర్క్‌లు అందుబాటులో ఉన్నాయి"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"నెట్‌వర్క్‌లను మార్చడానికి, ఈథర్‌నెట్‌ను డిస్‌కనెక్ట్ చేయండి"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"కనెక్ట్ అయి ఉన్నప్పుడు నెట్‌వర్క్‌లను మార్చలేరు"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"విమానం మోడ్ నెట్‌వర్క్‌లు"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"కనెక్ట్ చేయబడింది"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"ఇంటర్నెట్ ఆటోమెటిక్‌గా కనెక్ట్ అవ్వదు"</string>
@@ -5154,6 +5201,10 @@
     <string name="category_name_color" msgid="937514550918977151">"రంగు"</string>
     <string name="category_name_others" msgid="2366006298768550310">"ఇతరాలు"</string>
     <string name="category_name_general" msgid="7737273712848115886">"సాధారణం"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"అన్ని యాప్‌లను చూడండి"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"స్మార్ట్ ఫార్వర్డింగ్"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"స్మార్ట్ ఫార్వర్డింగ్ ఎనేబుల్ చేయబడింది"</string>
@@ -5167,4 +5218,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ఫోన్ నంబర్‌ను ఎంటర్ చేయండి"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ఫోన్ నంబర్ లేదు."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"సరే"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2Gని అనుమతించండి"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G సెల్యులార్ కనెక్షన్‌ను ఉపయోగించండి. ఎమర్జెన్సీ కాల్‌ల కోసం, 2G ఎల్లప్పుడూ ఆన్‌లో ఉంటుంది."</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index a1bfe26..51c25e0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"ปรับขนาดข้อความบนหน้าจอให้เล็กลงหรือใหญ่ขึ้น"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"ทำให้เล็กลง"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"ทำให้ใหญ่ขึ้น"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"ใช้การหมุนอัตโนมัติ"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"ข้อความตัวอย่าง"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"พ่อมดมหัศจรรย์แห่งออซ"</string>
@@ -405,15 +404,21 @@
       <item quantity="one">ตั้งค่าลายนิ้วมือ <xliff:g id="COUNT_0">%1$d</xliff:g> รายการ</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"ปลดล็อกด้วยลายนิ้วมือ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"ตั้งค่าลายนิ้วมือ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"การใช้ลายนิ้วมือ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"เพียงแตะเซ็นเซอร์ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์ ให้สิทธิ์การซื้อ หรือลงชื่อเข้าใช้แอป โปรดระมัดระวังหากจะเพิ่มลายนิ้วมือของใคร ลายนิ้วมือที่เพิ่มแม้เพียงลายเดียวก็จะทำสิ่งต่างๆ เหล่านี้ได้"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"ลายนิ้วมืออาจมีความปลอดภัยน้อยกว่ารูปแบบหรือ PIN ที่เดายาก"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"คุณควบคุมได้"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"ข้อควรจำ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"ระบบจะจัดเก็บข้อมูลที่บันทึกโดยลายนิ้วมือไว้อย่างปลอดภัยและจะไม่มีการส่งออกไปจากโทรศัพท์ คุณลบข้อมูลได้ทุกเมื่อในการตั้งค่า"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"ลายนิ้วมืออาจมีความปลอดภัยน้อยกว่ารูปแบบหรือ PIN ที่เดายาก"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"โทรศัพท์จะใช้รูปภาพล่าสุดจากลายนิ้วมือเพื่อสร้างรูปแบบลายนิ้วมือที่ปรับปรุงให้ดียิ่งขึ้นเป็นระยะๆ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ใช้ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์หรืออนุมัติการซื้อ\n\nหมายเหตุ: คุณไม่สามารถใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์นี้ โปรดติดต่อผู้ดูแลระบบขององค์กรสำหรับข้อมูลเพิ่มเติม"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ใช้ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์หรืออนุมัติการซื้อ\n\nหมายเหตุ: ลายนิ้วมืออาจปลอดภัยน้อยกว่า PIN หรือรูปแบบที่เดายาก"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ยกเลิก"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ไม่เป็นไร"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"ข้าม"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ต่อไป"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"ยอมรับ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ข้าม"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ถัดไป"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"ข้ามการตั้งค่าลายนิ้วมือไหม"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"ข้าม"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"ยกเลิก"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"แตะเซ็นเซอร์"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"แตะไอคอนลายนิ้วมือค้างไว้"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"เซ็นเซอร์อยู่ที่ด้านหลังโทรศัพท์ โปรดใช้นิ้วขี้"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"เซ็นเซอร์อยู่บนหน้าจอ มองหาลายนิ้วมือที่มีวงกลมเรืองแสง"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"เซ็นเซอร์ลายนิ้วมืออยู่ในหน้าจอ เลื่อนนิ้วไปมาบนหน้าจอเพื่อค้นหา"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"ภาพประกอบที่มีตำแหน่งของอุปกรณ์และเซ็นเซอร์ลายนิ้วมือ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"ชื่อ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ตกลง"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"ลบ"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"แตะเซ็นเซอร์"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"วางนิ้วบนเซ็นเซอร์และยกขึ้นหลังจากรู้สึกถึงการสั่น"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"ยกนิ้วขึ้นแล้วแตะอีกครั้ง"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"ยกนิ้วมือเรื่อยๆ เพื่อเพิ่มส่วนอื่นๆ ของลายนิ้วมือ"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"เพิ่มลายนิ้วมือแล้ว"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"เมื่อเห็นไอคอนนี้ ให้ใช้ลายนิ้วมือเพื่อระบุตัวตนหรือเพื่ออนุมัติการซื้อ"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"ข้ามไปก่อน"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"ค้นหา"</string>
     <string name="display_settings" msgid="7197750639709493852">"การแสดงผล"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"หมุนหน้าจออัตโนมัติ"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"ปิด"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"เปิด"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"เปิด - ตามใบหน้า"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"เปิดใช้การตรวจจับใบหน้า"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"สี"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"ธรรมชาติ"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"บูสต์"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"เปิด/หน้าจอจะไม่ปิดหากคุณกำลังดูอยู่"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"ปิด"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"ต้องใช้สิทธิ์เข้าถึงกล้อง"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"แตะเพื่อจัดการสิทธิ์สำหรับบริการปรับอุปกรณ์ตามการใช้งานของผู้ใช้"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"ป้องกันไม่ให้หน้าจอปิดหากคุณกำลังดูอยู่"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"การจดจ่อที่หน้าจอใช้กล้องหน้าเพื่อดูว่ามีใครกำลังดูหน้าจออยู่หรือไม่ ฟีเจอร์นี้จะทำงานในอุปกรณ์และจะไม่มีการเก็บหรือส่งรูปภาพไปให้ Google"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"เปิดฟีเจอร์การจดจ่อที่หน้าจอ"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"ขณะที่หน้าจอมืดอยู่ ฟีเจอร์นี้จะเปิดขึ้นเมื่อมีการแจ้งเตือนเข้ามาใหม่"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"แสดงเวลาและข้อมูลเสมอ"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"การใช้งานแบตเตอรี่เพิ่มขึ้น"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"ทำข้อความเป็นตัวหนา"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"ทำข้อความเป็นตัวหนา"</string>
     <string name="title_font_size" msgid="570613010306330622">"ขนาดอักษร"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ทำให้ข้อความมีขนาดใหญ่ขึ้นหรือเล็กลง"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"การตั้งค่าการล็อกซิมการ์ด"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"ผู้ใช้รายอื่นๆ"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"ที่เก็บข้อมูลอุปกรณ์"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"ที่จัดเก็บข้อมูลแบบพกพา"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"การปลุกและการช่วยเตือน"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"อนุญาตให้ตั้งนาฬิกาปลุกหรือการช่วยเตือน"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"การปลุกและการช่วยเตือน"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"อนุญาตให้แอปนี้ตั้งนาฬิกาปลุกหรือเหตุการณ์ตามการจับเวลาอื่นๆ ซึ่งจะเป็นการปลุกระบบให้แอปทำงานแม้ว่าคุณไม่ได้ใช้อุปกรณ์อยู่ก็ตาม โปรดทราบว่าการเพิกถอนสิทธิ์นี้อาจทำให้แอปทำงานผิดปกติ นั่นคือการปลุกที่แอปตั้งเวลาไว้จะใช้ไม่ได้อีก"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"กำหนดเวลา การปลุก การช่วยเตือน เหตุการณ์"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"ใช้ไป <xliff:g id="USED">%1$s</xliff:g> จากทั้งหมด <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"ใช้ไปจากทั้งหมด <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"บริการตำแหน่ง"</string>
     <string name="location_title" msgid="5819154746934945021">"ตำแหน่งของฉัน"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"ตำแหน่งสำหรับโปรไฟล์งาน"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"สิทธิ์เข้าถึงตำแหน่งของแอป"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"ตำแหน่งปิดอยู่"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> แอป <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> แอปจาก <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> แอปมีสิทธิ์เข้าถึงตำแหน่ง</item>
       <item quantity="one"> แอป <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> แอปจาก <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> แอปมีสิทธิ์เข้าถึงตำแหน่ง</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"การเข้าถึงตำแหน่งล่าสุด"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"ดูรายละเอียด"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"ไม่มีแอปใดขอตำแหน่งเมื่อเร็วๆ นี้"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"ไม่มีแอปที่เข้าถึงตำแหน่งเมื่อเร็วๆ นี้"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"ใช้แบตเตอรี่มาก"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"ใช้แบตเตอรี่น้อย"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"การสแกนหา Wi‑Fi และบลูทูธ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"การสแกนหา Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"อนุญาตให้แอปและบริการต่างๆ สแกนหาเครือข่าย Wi‑Fi ตลอดเวลาแม้ Wi‑Fi จะปิดอยู่ การตั้งค่านี้ใช้เพื่อปรับปรุงสิ่งต่างๆ เช่น ฟีเจอร์และบริการตามสถานที่"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"การสแกนหาบลูทูธ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"อนุญาตให้แอปและบริการต่างๆ สแกนหาอุปกรณ์ใกล้เคียงตลอดเวลา แม้บลูทูธจะปิดอยู่ การตั้งค่านี้ใช้เพื่อปรับปรุงสิ่งต่างๆ เช่น ฟีเจอร์และบริการตามสถานที่"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"บริการตำแหน่ง"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"บริการตำแหน่งสำหรับการทำงาน"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"การตรวจหาเขตเวลาของสถานที่"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"การตรวจหาเขตเวลาของสถานที่"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"อนุญาตให้ใช้ตำแหน่งของอุปกรณ์ในการตรวจหาเขตเวลาปัจจุบัน การตั้งค่าตำแหน่งอื่นๆ เช่น การสแกนหา Wi-Fi อาจส่งผลต่อความแม่นยำในการตรวจหาเขตเวลา"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"เปิด"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ปิด"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"การตรวจหาเขตเวลาอัตโนมัติปิดอยู่"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"เขตเวลาอัตโนมัติปิดอยู่"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"การตรวจหาเขตเวลาของสถานที่ปิดอยู่"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ไม่รองรับการตรวจหาเขตเวลาของสถานที่"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ไม่อนุญาตให้เปลี่ยนแปลงการตรวจหาเขตเวลาของสถานที่"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"เปิดใช้งาน"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"ล้างพื้นที่เก็บข้อมูล"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"ถอนการติดตั้งการอัปเดต"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"คุณเลือกให้เปิดแอปพลิเคชันนี้เป็นค่าเริ่มต้นสำหรับการทำงานบางอย่าง"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"กิจกรรมบางอย่างที่คุณเลือกจะเปิดในแอปนี้โดยค่าเริ่มต้น"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"คุณได้เลือกอนุญาตให้แอปพลิเคชันนี้สร้างวิดเจ็ตและเข้าถึงข้อมูลวิดเจ็ตได้"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"ไม่ได้ตั้งค่าเริ่มต้น"</string>
-    <string name="clear_activities" msgid="341345438786077236">"ล้างค่าเริ่มต้น"</string>
+    <string name="clear_activities" msgid="488089228657585700">"ล้างค่ากำหนดเริ่มต้น"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"แอปพลิเคชันนี้อาจไม่ได้รับการออกแบบมาสำหรับหน้าจอของคุณ คุณสามารถควบคุมวิธีที่แอปพลิเคชันถูกปรับให้เข้ากับหน้าจอของคุณได้ที่นี่"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"ถามเมื่อเปิดโปรแกรม"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"กำหนดขนาดแอปพลิเคชัน"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"คุณปรับแต่งอุปกรณ์นี้ให้ตรงกับความต้องการได้ และเปลี่ยนฟีเจอร์การช่วยเหลือพิเศษเหล่านี้ได้ภายหลังในการตั้งค่า"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"เปลี่ยนขนาดแบบอักษร"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"โปรแกรมอ่านหน้าจอ"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"เสียงและข้อความบนหน้าจอ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"คำบรรยายวิดีโอ"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"เสียง"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"ทั่วไป"</string>
     <string name="display_category_title" msgid="6638191682294461408">"การแสดงผล"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"ข้อความและจอแสดงผล"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"ปรับแสงหน้าจอให้มืดลง"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"สีแดง/เขียว"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"สีแดง/เขียว"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"สีน้ำเงิน/เหลือง"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"ลดความสว่าง"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"ลดความสว่าง"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"ปรับแสงหน้าจอให้มืดกว่าความสว่างต่ำสุดของโทรศัพท์"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"ปรับแสงหน้าจอให้มืดกว่าความสว่างต่ำสุดของแท็บเล็ต"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"ปรับแสงหน้าจอให้มืดลงเพื่อให้อ่านได้สบายตายิ่งขึ้น&lt;br/&gt;&lt;br/&gt; ฟีเจอร์นี้จะเป็นประโยชน์เมื่อ &lt;ol&gt; &lt;li&gt; ความสว่างต่ำสุดเริ่มต้นของโทรศัพท์ยังคงสว่างเกินไป&lt;/li&gt; &lt;li&gt; คุณกำลังใช้โทรศัพท์ในสภาพแวดล้อมที่มืด เช่น ในเวลากลางคืนหรือก่อนเข้านอนในห้องที่มืด&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"ใบหน้า"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"ลายนิ้วมือ เพิ่มลายนิ้วมือ"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"หน้าจอสลัว หน้าจอสัมผัส แบตเตอรี่ ความสว่างอัจฉริยะ ความสว่างแบบไดนามิก ปรับความสว่างอัตโนมัติ"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"หรี่แสงหน้าจอ สลีป แบตเตอรี่ ระยะหมดเวลา การจดจ่อ จอแสดงผล หน้าจอ ไม่มีการใช้งาน"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"หมุน, พลิก, การหมุน, แนวตั้ง, แนวนอน, การวางแนว, ตั้ง, นอน"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"อัปเกรด, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, ตั้งเวลา, การแจ้งเตือน, บล็อก, เงียบ, สั่น, สลีป, ทำงาน, โฟกัส, เสียง, ปิดเสียง, วัน, วันทำการ, วันหยุดสุดสัปดาห์, คืนวันทำการ, กิจกรรม"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"หน้าจอ, เวลาล็อก, ระยะหมดเวลา, หน้าจอล็อก"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"เสียงเรียกเข้า"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"เสียงอื่นๆ และการสั่น"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"การแจ้งเตือน"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"การสนทนา"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"ส่งล่าสุด"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"ดูทั้งหมดในช่วง 7 วันล่าสุด"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"ขั้นสูง"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"ทั่วไป"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"การแจ้งเตือนงาน"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"การแจ้งเตือนแบบปรับอัตโนมัติ"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"ลำดับความสำคัญของการแจ้งเตือนแบบปรับอัตโนมัติ"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"แสดงในหน้าต่างแบบเลื่อนลง แถบสถานะ และในหน้าจอล็อก"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"ซ่อนการแจ้งเตือนที่ปิดเสียงในแถบสถานะ"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"ไฟกะพริบ"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"การแจ้งเตือนบนหน้าจอล็อก"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"ความเป็นส่วนตัว"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"ข้ามหน้าจอล็อก"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"ไปที่หน้าจอที่ใช้ล่าสุดหลังปลดล็อกด้วยใบหน้า"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"หน้าจอล็อก, ข้าม, เลี่ยง"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">การแจ้งเตือนประมาณ <xliff:g id="NUMBER_0">%d</xliff:g> ครั้งต่อสัปดาห์</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"ไม่เลย"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"การเข้าถึงการแจ้งเตือน"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"การแจ้งเตือนของอุปกรณ์และแอป"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"ควบคุมการแจ้งเตือนที่จะแสดงในแอปและอุปกรณ์"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"การเข้าถึงการแจ้งเตือนโปรไฟล์งานถูกบล็อก"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"แอปไม่สามารถอ่านการแจ้งเตือน"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"ปิด"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"ยกเลิก"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"ประเภทการแจ้งเตือนที่อนุญาต"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"การแจ้งเตือนต่อเนื่องที่สำคัญ"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"การแจ้งเตือนการสนทนา"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"การแจ้งเตือนแบบส่งเสียง"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"การแจ้งเตือนแบบไม่มีเสียง"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"เรียลไทม์"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"การติดต่อสื่อสารแบบเรียลไทม์จากแอปที่ใช้งานอยู่ การนำทาง การโทร และอื่นๆ"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"การสนทนา"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS และการติดต่อสื่อสารรูปแบบอื่นๆ"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"ค่าเริ่มต้น"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"การแจ้งเตือนที่อาจส่งเสียงหรือสั่นตามการตั้งค่า"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"เงียบ"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"การแจ้งเตือนที่ไม่ส่งเสียงหรือสั่น"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"ดูแอปทั้งหมด"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"เปลี่ยนการตั้งค่าการแจ้งเตือนของแต่ละแอปที่ส่งการแจ้งเตือนได้"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"แอปที่แสดงในอุปกรณ์"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"บริการตัวช่วย VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"แอปที่ติดตั้งอยู่ไม่ได้ขอให้เรียกใช้เป็นบริการตัวช่วย VR"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"อนุญาตให้ <xliff:g id="SERVICE">%1$s</xliff:g> เข้าถึงบริการ VR ไหม"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"เปิดโดยค่าเริ่มต้น"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"การเปิดลิงก์"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"เปิดลิงก์ที่สนับสนุน"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"ลิงก์ที่รองรับจะเปิดในแอปนี้"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"ลิงก์ที่จะเปิดในแอปนี้"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"เปิดโดยไม่ต้องถาม"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"ลิงก์ที่สนับสนุน"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"ค่าเริ่มต้นอื่นๆ"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"ค่ากำหนดเริ่มต้นอื่นๆ"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"เพิ่มลิงก์"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"แอปจะยืนยันลิงก์เพื่อเปิดโดยอัตโนมัติในแอปได้ "<annotation id="url">"ดูข้อมูลเพิ่มเติม"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ลิงก์ที่ได้รับการยืนยันแล้ว</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ลิงก์ที่ได้รับการยืนยันแล้ว</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">ลิงก์เหล่านี้ได้รับการยืนยันแล้วและจะเปิดโดยอัตโนมัติในแอปนี้</item>
+      <item quantity="one">ลิงก์นี้ได้รับการยืนยันแล้วและจะเปิดโดยอัตโนมัติในแอปนี้</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ตกลง"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"กำลังตรวจหาลิงก์ที่รองรับอื่นๆ…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"ยกเลิก"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ลิงก์ที่รองรับ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ลิงก์ที่รองรับ</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"เพิ่ม"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"เปิดใน <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"ใช้ไป <xliff:g id="SIZE">%1$s</xliff:g> ใน<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"ที่จัดเก็บข้อมูลภายใน"</string>
     <string name="storage_type_external" msgid="125078274000280821">"ที่จัดเก็บข้อมูลภายนอก"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"ไม่อนุญาตให้ใช้กล้องถ่ายรูป"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"ไม่อนุญาตให้จับภาพหน้าจอ"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"เปิดแอปนี้ไม่ได้"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"หากมีคำถาม โปรดติดต่อผู้ดูแลระบบไอที"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"รายละเอียดเพิ่มเติม"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"ผู้ดูแลระบบสามารถตรวจสอบและจัดการแอปและข้อมูลที่เชื่อมโยงกับโปรไฟล์งานของคุณ ซึ่งรวมถึงการตั้งค่า สิทธิ์ การเข้าถึงขององค์กร กิจกรรมเครือข่าย และข้อมูลตำแหน่งของอุปกรณ์"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"ผู้ดูแลระบบสามารถตรวจสอบและจัดการแอปและข้อมูลที่เชื่อมโยงกับผู้ใช้นี้ ซึ่งรวมถึงการตั้งค่า สิทธิ์ การเข้าถึงขององค์กร กิจกรรมเครือข่าย และข้อมูลตำแหน่งของอุปกรณ์"</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">ข้อจำกัด 1 ข้อ</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"การบันทึกการใช้อินเทอร์เน็ตของผู้ให้บริการอาจแตกต่างไปจากการบันทึกในอุปกรณ์"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"ไม่รวมอินเทอร์เน็ตที่ใช้โดยเครือข่ายผู้ให้บริการ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"ไม่รวมอินเทอร์เน็ตที่ใช้โดยเครือข่ายผู้ให้บริการ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"ใช้ไป <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ตั้งค่าเตือนการใช้อินเทอร์เน็ต"</string>
     <string name="data_warning" msgid="2925054658166062884">"เตือนปริมาณอินเทอร์เน็ต"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(ถอนการติดตั้งแล้วสำหรับ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(ปิดใช้อยู่สำหรับ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"บริการป้อนข้อความอัตโนมัติ"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"ป้อน, อัตโนมัติ, ป้อนอัตโนมัติ"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"รหัสผ่าน"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"อัตโนมัติ ป้อนข้อความ ป้อนข้อความอัตโนมัติ รหัสผ่าน"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;ตรวจดูว่าคุณเชื่อถือแอปนี้ได้&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ป้อนอัตโนมัติ&gt;%1$s&lt;/xliff:g&gt; ใช้สิ่งที่อยู่บนหน้าจอเพื่อดูว่าจะป้อนข้อมูลใดโดยอัตโนมัติได้บ้าง"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"ป้อนอัตโนมัติ"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"ระดับการบันทึก"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"เปลี่ยนโหมดปฏิบัติการของเครือข่าย"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ประเภทเครือข่ายที่ต้องการ"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"ผู้ให้บริการ"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"เวอร์ชันการตั้งค่า"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"เวอร์ชันการตั้งค่าของผู้ให้บริการ"</string>
     <string name="call_category" msgid="641461844504128789">"การโทร"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"วิดีโอคอลผ่านผู้ให้บริการ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"การเลือกระบบ"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ถอดซิมออกแล้วใส่กลับเข้าไปอีกครั้ง หากยังพบปัญหาอยู่ ให้รีสตาร์ทอุปกรณ์"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ลองเปิดใช้ซิมอีกครั้ง หากยังพบปัญหาอยู่ ให้รีสตาร์ทอุปกรณ์"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"การเปิดใช้งานเครือข่าย"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"การเปลี่ยนผู้ให้บริการ"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ใช้งานอยู่"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"แตะเพื่ออัปเดตการตั้งค่าซิม"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"เปลี่ยนไปใช้ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> แล้ว"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"ปิด"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"อินเทอร์เน็ต"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"ซิม"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"แสดงเครือข่ายที่ใช้งานได้ในโหมดบนเครื่องบิน"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"ค้นหาและเชื่อมต่อเครือข่ายในโหมดบนเครื่องบิน"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"ค้นหาและเชื่อมต่อกับเครือข่าย Wi-Fi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"เครื่องบิน, ใช้บนเครื่องบินได้อย่างปลอดภัย"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"การโทรและ SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"การโทรผ่าน Wi‑Fi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ไม่ว่าง"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"ไม่พร้อมใช้งานชั่วคราว"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"ไม่มีซิม"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ค่ากำหนด"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"การตั้งค่าเครือข่าย"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"เชื่อมต่อเครือข่ายสาธารณะ"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"การเชื่อมต่อเครือข่าย, อินเทอร์เน็ต, ไร้สาย, อินเทอร์เน็ตมือถือ, wifi, wi-fi, wi fi, เครือข่ายมือถือ, อุปกรณ์เคลื่อนที่, ผู้ให้บริการเครือข่ายมือถือ, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ดูเครือข่ายที่ใช้โหมดบนเครื่องบินได้"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"กำลังดูเครือข่ายที่ใช้ได้ในโหมดบนเครื่องบิน"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"เปิดเครือข่าย"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"ปิดเครือข่าย"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"รีเซ็ตอินเทอร์เน็ตไหม"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"การดำเนินการนี้จะเป็นการสิ้นสุดการโทร"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"การดำเนินการนี้จะเป็นการสิ้นสุดการโทร"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"กำลังรีเซ็ตอินเทอร์เน็ต…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"แก้ไขการเชื่อมต่อ"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"มีเครือข่ายที่ใช้งานได้ในโหมดบนเครื่องบิน"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"ตัดการเชื่อมต่ออีเทอร์เน็ตเพื่อสลับเครือข่าย"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"สลับเครือข่ายขณะที่เชื่อมต่ออยู่ไม่ได้"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"เครือข่ายสำหรับโหมดบนเครื่องบิน"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"เชื่อมต่อแล้ว"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"จะไม่มีการเชื่อมต่ออินเทอร์เน็ตโดยอัตโนมัติ"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"สี"</string>
     <string name="category_name_others" msgid="2366006298768550310">"อื่นๆ"</string>
     <string name="category_name_general" msgid="7737273712848115886">"ทั่วไป"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"ดูแอปทั้งหมด"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"การโอนสายอัจฉริยะ"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"การโอนสายอัจฉริยะเปิดอยู่"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"ป้อนหมายเลขโทรศัพท์"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"ไม่มีหมายเลขโทรศัพท์"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ตกลง"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"อนุญาตให้ใช้ 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"ใช้การเชื่อมต่อเครือข่ายมือถือ 2G โดยจะเปิดอยู่ตลอดเวลาสำหรับหมายเลขฉุกเฉิน"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5c09c1c..48e30bb 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Paliitin"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Palakihin"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Gumamit ng Auto-Rotate"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Ginagamit ng Autorotate na batay sa mukha ang camera sa harap para makita kung may nakatingin sa screen at kung paano siya nakatingin. Nagbibigay-daan ito sa pagbabasa habang nakahiga at hindi kailanman sino-store o ipinapadala sa Google ang mga larawan.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Matuto pa&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Sample na text"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"The Wonderful Wizard of Oz"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"Kabanata 11: The Wonderful Emerald City of Oz"</string>
@@ -403,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> na fingerprint ang naka-set up</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"I-unlock ng fingerprint"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"I-set up ang fingerprint mo"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Gamitin ang iyong fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Pindutin lang ang sensor para sa fingerprint para i-unlock ang iyong telepono, pahintulutan ang mga pagbili, o mag-sign in sa mga app Maging maingat sa kung kaninong mga fingerprint ang idaragdag mo. Kahit isang fingerprint lang ang idagdag, magagawa ang alinman sa mga bagay na ito."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Posibleng hindi gaanong secure ang iyong fingerprint kaysa sa malakas na pattern o PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Ikaw ang may kontrol"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Tandaan"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Secure na sino-store ang data na na-record ng Fingerprint at hindi ito kailanman lalabas sa iyong telepono. Puwede mong i-delete ang iyong data anumang oras sa Mga Setting."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Posibleng hindi gaanong secure ang iyong fingerprint kumpara sa malakas na pattern o PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Kung minsan, gagamitin ng iyong telepono ang kamakailan mong larawan ng fingerprint para gumawa ng mga mas pinahusay na modelo ng fingerprint."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Gamitin ang iyong fingerprint upang i-unlock ang telepono mo o aprubahan ang mga pagbili.\n\nTandaan: Hindi mo maaaring gamitin ang iyong fingerprint upang i-unlock ang device na ito. Para sa higit pang impormasyon, makipag-ugnayan sa admin ng iyong organisasyon."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Gamitin ang iyong fingerprint para i-unlock ang telepono mo o aprubahan ang mga pagbili.\n\nTandaan: Posibleng hindi gaanong secure ang iyong fingerprint kaysa sa mahirap hulaang pattern o PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Kanselahin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Huwag na lang"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Laktawan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Magpatuloy"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Sumang-ayon"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Laktawan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Susunod"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Laktawan ang fingerprint?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Laktawan"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Kanselahin"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Pindutin ang sensor"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Pindutin nang matagal ang icon ng fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Nasa likod ito ng iyong telepono. Gamitin ang hintuturo mo."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Nasa screen ito. Hanapin ang fingerprint na may umiilaw na bilog."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Nasa iyong screen ang sensor ng fingerprint. Galawin ang iyong daliri sa screen para mahanap ito."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Larawan kung saan ipinapakita ang lokasyon ng device at fingerprint sensor"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Pangalan"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"I-delete"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Pindutin ang sensor"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Ilagay ang iyong daliri sa sensor at iangat ito pagkatapos mong makaramdam ng pag-vibrate"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Iangat, pindutin ulit"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Iangat nang iangat ang iyong daliri para idagdag ang iba\'t ibang bahagi ng fingerprint mo"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Naidagdag na ang fingerprint"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Kapag nakita mo ang icon na ito, gamitin ang iyong fingerprint para sa pagkakakilanlan o para aprubahan ang mga pagbili"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Gawin ito sa ibang pagkakataon"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Naka-on / Hindi mag-o-off ang screen kung tinitingnan mo ito"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Naka-off"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Kailangan ng access sa camera"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"I-tap para pamahalaan ang mga pahintulot para sa Mga Serbisyo sa Pag-personalize ng Device"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Pinipigilang mag-off ang iyong screen kung tinitingnan mo ito"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Ginagamit ng atensyon sa screen ang camera sa harap para makita kung may taong tumitingin sa screen. Gumagana ito sa device, at hindi kailanman sino-store o ipinapadala sa Google ang mga larawan."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"I-on ang atensyon sa screen"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kapag naka-off ang screen, mag-o-on ito para sa mga bagong notification"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Palaging ipakita ang oras at impormasyon"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Mas malakas na paggamit ng baterya"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Bold na Text"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Bold na text"</string>
     <string name="title_font_size" msgid="570613010306330622">"Laki ng font"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Palakihin o paliitin ang text"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Setting ng lock ng SIM card"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Iba pang mga user"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Storage ng device"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Portable na storage"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Mga alarm at paalala"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Payagang magtakda ng mga alarm o paalala"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Mga alarm at paalala"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Payagan ang app na ito na mag-iskedyul ng mga alarm o iba pang event na batay sa timing. Magbibigay-daan ito sa app na mag-wake at gumana kahit na hindi mo ginagamit ang device. Tandaang kapag binawi ang pahintulot na ito, posibleng hindi gumana nang maayos ang app, partikular dito, hindi na gagana ang anumang alarm na naiskedyul ng app."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"iskedyul, alarm, paalala, event"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> ang nagamit sa <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Nagamit sa <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Mga serbisyo sa lokasyon"</string>
     <string name="location_title" msgid="5819154746934945021">"Aking Lokasyon"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Lokayon ng profile sa trabaho"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Access ng app sa lokasyon"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Naka-off ang lokasyon"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> sa <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> (na) app ang may access sa lokasyon</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> sa <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> (na) app ang may access sa lokasyon</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Kamakailang pag-access sa lokasyon"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Tingnan ang mga detalye"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Walang app na humiling ng lokasyon kamakailan"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Walang app na nag-access ng lokasyon kamakailan"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Mataas na paggamit ng baterya"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Mababang paggamit ng baterya"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Pag-scan ng Wi‑Fi at Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Pag-scan ng Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Payagan ang mga app at serbisyo na mag-scan ng mga Wi-Fi network anumang oras, kahit na naka-off ang Wi-Fi. Magagamit ito, halimbawa, para pahusayin ang mga feature at serbisyong batay sa lokasyon."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Pag-scan ng Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Payagan ang mga app at serbisyo na mag-scan ng mga kalapit na device anumang oras, kahit na naka-off ang Bluetooth. Magagamit ito, halimbawa, para pahusayin ang mga feature at serbisyong batay sa lokasyon."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Mga Serbisyo ng Lokasyon"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Mga serbisyo ng lokasyon para sa trabaho"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Pag-detect ng time zone gamit ang lokasyon"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Pag-detect ng time zone gamit ang lokasyon"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Nagbibigay-daan sa paggamit ng lokasyon ng device para sa pag-detect ng kasalukuyang time zone. Puwedeng makaapekto ang iba pang setting ng lokasyon gaya ng pag-scan ng Wi‑Fi sa katumpakan ng pag-detect ng time zone."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Naka-on"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Naka-off"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Naka-disable ang awtomatikong pag-detect ng time zone"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Naka-off ang awtomatikong time zone"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Naka-disable ang pag-detect ng time zone gamit ang lokasyon"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Hindi sinusuportahan ang pag-detect ng time zone gamit ang lokasyon"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Hindi pinapayagan ang mga pagbabago sa pag-detect ng time zone gamit ang lokasyon"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Paganahin"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"I-clear ang storage"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"I-uninstall ang mga pag-update"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Pinili mong ilunsad ang app na ito bilang default para sa ilang mga pagkilos."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Nagbubukas sa app na ito bilang default ang ilan sa mga napili mong aktibidad."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Pinili mong payagan ang app na ito na lumikha ng mga widget at i-access ang data ng mga ito."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Walang nakatakdang mga default."</string>
-    <string name="clear_activities" msgid="341345438786077236">"I-clear ang mga default"</string>
+    <string name="clear_activities" msgid="488089228657585700">"I-clear ang mga default na kagustuhan"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Maaaring hindi nakadisenyo ang app na ito para sa iyong screen. Makokontrol mo dito kung paano ito umaakma sa iyong screen."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Magtanong kapag nailunsad"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"I-scale ang app"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Maaari mong i-customize ang device na ito upang maging angkop sa iyong mga pangangailangan. Maaaring baguhin ang mga feature sa accessibility na ito sa ibang pagkakataon sa Mga Setting."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Baguhin ang laki ng font"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Mga screen reader"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio at text sa screen"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Mga Caption"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Pangkalahatan"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Display"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Text at display"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Gawing mas madilim ang screen"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Pula-berde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Pula-berde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Asul-dilaw"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Bawasan ang Liwanag"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Bawasan ang liwanag"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Gawing mas madilim ang screen kaysa sa minimum na liwanag ng iyong telepono"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Gawing mas madilim ang screen kaysa sa minimum na liwanag ng iyong tablet"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Gawing mas madilim ang iyong screen para maging mas kumportableng magbasa.&lt;br/&gt;&lt;br/&gt; Puwede itong makatulong kapag: &lt;ol&gt; &lt;li&gt; Masyado pa ring maliwanag ang default na minimum na liwanag ng iyong telepono&lt;/li&gt; &lt;li&gt; Ginagamit mo ang iyong telepono sa madidilim na sitwasyon, gaya ng kapag gabi o sa madilim na kuwarto bago matulog&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"mukha"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"fingerprint, magdagdag ng fingerprint"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"i-dim ang screen, touchscreen, baterya, smart na liwanag, dynamic na liwanag, Awtomatikong liwanag"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"i-dim ang screen, mag-sleep, baterya, pag-timeout, atensyon, display, screen, kawalan ng aktibidad"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"i-rotate, i-flip, pag-rotate, portrait, landscape, oryentasyon, patayo, pahalang"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"i-upgrade, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, iskedyul, mga notification, i-block, katahimikan, mag-vibrate, sleep, trabaho, i-focus, tunog, i-mute, araw, weekday, weekend, weeknight, event"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"screen, oras ng pag-lock, timeout, lockscreen"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Mga Ringtone"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Iba pang tunog at pag-vibrate"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Mga Notification"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Pag-uusap"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Naipadala kamakailan"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Tingnan lahat mula sa nakalipas na 7 araw"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Advanced"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Pangkalahatan"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Mga notification sa trabaho"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Mga adaptive na notification"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Priyoridad ng adaptive na notification"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Ipakita sa pull-down na shade, status bar, at lock screen"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Itago ang mga silent na notification sa status bar"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Patay-sinding ilaw"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Notification sa lock screen"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Privacy"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Laktawan ang lock screen"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Pagka-face unlock, dumiretso sa huling ginamit na screen"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Lock screen, Lockscreen, Laktawan, I-bypass"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> na notification bawat linggo</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Huwag Kailanman"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Access sa notification"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Mga notification sa device at app"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Kontrolin kung aling mga notification ang nagpapakita sa iyong mga app at device"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Naka-block ang access sa mga notification ng profile sa trabaho"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Hindi makakapagbasa ng mga notification ang mga app"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"I-off"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Kanselahin"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Mga pinapayagang uri ng notification"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Mahahalagang kasalukuyang notification"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Mga notification sa pag-uusap"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Mga nag-aalertong notification"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Mga silent na notification"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Real-time"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Real-time na pakikipag-ugnayan mula sa mga app na ginagamit, navigation, tawag sa telepono, at higit pa"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Mga Pag-uusap"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS at iba pang pakikipag-ugnayan"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Default"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Mga notification na puwedeng mag-ring o mag-vibrate batay sa mga setting"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Naka-silent"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Mga notification na hindi kailanman gagawa ng tunog o pag-vibrate"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Tingnan ang lahat ng app"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Baguhin ang mga setting ng notification para sa bawat app na nakakapagpadala ng mga notification"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Mga app na ipinapakita sa device"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Mga serbisyong pantulong sa VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Walang mga naka-install na app ang humiling na mapagana bilang mga serbisyong pantulong sa VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Payagan ang access sa serbisyo ng VR para sa <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Buksan bilang default"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Pagbubukas ng mga link"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Buksan ang mga sinusuportahang link"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Bubukas sa app na ito ang mga sinusuportahang link"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Mga link na bubuksan sa app na ito"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Buksan nang hindi nagtatanong"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Mga sinusuportahang link"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Iba pang mga default"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Iba pang default na kagustuhan"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Magdagdag ng link"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Puwedeng ma-verify ng isang app ang mga link para awtomatiko itong buksan sa app. "<annotation id="url">"Matuto pa"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> na-verify na link</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na na-verify na link</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Na-verify ang mga link na ito at awtomatiko itong nagbubukas sa app na ito.</item>
+      <item quantity="other">Na-verify ang mga link na ito at awtomatiko itong nagbubukas sa app na ito.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Tinitingnan ang iba pang sinusuportahang link…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Kanselahin"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> sinusuportahang link</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na sinusuportahang link</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Magdagdag"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Bubukas sa <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> ang nagamit sa <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"internal storage"</string>
     <string name="storage_type_external" msgid="125078274000280821">"external storage"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Hindi pinapayagan ang camera"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Hindi pinapayagan ang pag-screenshot"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Hindi mabubuksan ang app na ito"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Kung mayroon kang mga tanong, makipag-ugnayan sa iyong IT admin"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Higit pang mga detalye"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Masusubaybayan at mapamamahalaan ng iyong admin ang mga app at data na nauugnay sa iyong profile sa trabaho, kabilang ang mga setting, pahintulot, access ng kumpanya, aktibidad ng network, at impormasyon ng lokasyon ng device."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Masusubaybayan at mapamamahalaan ng iyong admin ang mga app at data na nauugnay sa user na ito, kabilang ang mga setting, pahintulot, access ng kumpanya, aktibidad ng network, at impormasyon ng lokasyon ng device."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> na paghihigpit</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Maaaring iba ang accounting ng data ng carrier kumpara sa accounting ng device"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Hindi kasama ang data na ginagamit ng mga carrier network"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Hindi kasama ang data na ginagamit ng mga carrier network"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ang nagamit"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Magtakda ng babala sa data"</string>
     <string name="data_warning" msgid="2925054658166062884">"Babala sa paggamit ng data"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(na-uninstall para kay user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(na-disable para kay user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Serbisyo ng autofill"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"awtomatiko, punan, autofill"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Mga Password"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"auto, punan, autofill, password"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Tiyaking pinagkakatiwalaan mo ang app na ito&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; Ginagamit ng &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ang nasa iyong screen para matukoy kung ano ang pwedeng i-autofill."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"I-autofill"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Antas ng pag-log"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Baguhin ang network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Mas gustong network type"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Carrier"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Bersyon ng mga setting"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Bersyon ng mga setting ng carrier"</string>
     <string name="call_category" msgid="641461844504128789">"Pagtawag"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Pakikipag-video call gamit ang carrier"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Pagpili ng system"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Alisin ang SIM at ilagay ito ulit. Kung magpapatuloy ang problema, i-restart ang iyong device."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Subukang i-on ulit ang SIM. Kung magpapatuloy ang problema, i-restart ang iyong device."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Pag-activate ng network"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Pagpapalit ng carrier"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Aktibo ang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"I-tap para i-update ang mga setting ng SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Lumipat sa <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Naka-off"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Mga SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Ipakita ang mga network sa airplane mode"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Maghanap ng at kumonekta sa mga network sa airplane mode."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Maghanap ng at kumonekta sa mga Wi‑Fi network"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"eroplano, ligtas gamitin sa eroplano"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Mga Taawag at SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Pagtawag sa Wi‑Fi"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"hindi available"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Pansamantalang hindi available"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Walang SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Mga Kagustuhan"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Mga kagustuhan sa network"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Kumonekta sa mga pampublikong network"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"koneksyon ng network, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Tingnan ang mga network sa airplane mode"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Tinitingnan ang mga network sa airplane mode"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"I-on ang mga network"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"I-off ang mga network"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"I-reset ang iyong internet?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Tatapusin nito ang iyong tawag sa telepono"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Tatapusin nito ang iyong tawag sa telepono"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Nire-reset ang iyong internet…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Ayusin ang pagkakonekta"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"May mga available na network sa airplane mode"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Para lumipat ng network, idiskonekta ang ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Hindi makakalipat ng network habang nakakonekta"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mga network sa airplane mode"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Nakakonekta"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Hindi awtomatikong kokonekta ang Internet"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Kulay"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Iba pa"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Pangkalahatan"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Tingnan ang lahat ng app"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart na Pag-forward"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Naka-enable ang Smart na Pag-forward"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Ilagay ang Numero ng telepono"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Walang numero ng telepono."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Payagan ang 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Gumamit ng mga 2G na cellular na koneksyon. Para sa mga emergency na tawag, palaging naka-on ang 2G."</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0c68d4f..e561471 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -53,7 +53,8 @@
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Küçült"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Büyüt"</string>
     <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Otomatik Döndürmeyi Kullan"</string>
-    <string name="smart_rotate_text_headline" msgid="9147653205505671866">"Yüze göre Otomatik döndürme, ekrana birinin bakıp bakmadığını ve nasıl baktığını görmek için ön kamerayı kullanır. Bu özellik, yatar pozisyondayken okumaya olanak tanır. Resimler hiçbir zaman saklanmaz veya Google\'a gönderilmez.&lt;br&gt;&lt;br&gt; &lt;a href=<xliff:g id="URL">http://support.google.com/mobile?p=telephony_rtt</xliff:g>&gt;Daha fazla bilgi&lt;/a&gt;"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
+    <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Örnek metin"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Muhteşem Oz Büyücüsü"</string>
     <string name="font_size_preview_text_subtitle" msgid="5806349524325544614">"11. Bölüm: Oz\'un Muhteşem Zümrüt Kenti"</string>
@@ -403,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> parmak izi ayarlandı</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Parmak iziyle kilit açma"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Parmak izinizi kurun"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Parmak izinizi kullanma"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Telefonunuzun kilidini açmak, satın alma işlemlerini yetkilendirmek veya uygulamalarda oturum açmak için parmak izi sensörüne dokunmanız yeterli. Kimin parmak izini eklediğinize dikkat edin. Eklenen tek bir parmak izi bile tüm bu işlemleri yapabilir."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Parmak iziniz, güçlü bir desen veya PIN\'e oranla daha az güvenli olabilir."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Kontrol sizde"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Unutmayın"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Parmak izi tarafından kaydedilen veriler güvenli şekilde depolanır ve her zaman telefonunuzda tutulur. Verilerinizi istediğiniz zaman Ayarlar\'a girerek silebilirsiniz."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Parmak iziniz, güçlü bir desen veya PIN\'e oranla daha az güvenli olabilir."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Telefonunuz, iyileştirilmiş parmak izi modelleri oluşturmak için ara sıra son parmak izi resimlerinizi kullanacaktır."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Telefonunuzun kilidini açmak veya bir satın alma işlemini onaylamak için parmak izinizi kullanın.\n\nNot: Bu cihazın kilidini açmak için parmak izinizi kullanamazsınız. Daha fazla bilgi için kuruluşunuzun yöneticisine başvurun."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Telefonunuzun kilidini açmak veya bir satın alma işlemini onaylamak için parmak izinizi kullanın.\n\nNot: Parmak iziniz, güçlü bir desen veya PIN\'e oranla daha az güvenli olabilir."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"İptal"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Hayır, teşekkürler"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Atla"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Devam"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Kabul Ediyorum"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Atla"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"İleri"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Parmak izi atlansın mı?"</string>
@@ -428,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Atla"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"İptal"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Sensöre dokunun"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Parmak izi simgesine dokunup basılı tutun"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Telefonunuzun arkasındadır. İşaret parmağınızı kullanın."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Sensör ekranınızın üzerindedir. Parlayan daire içindeki parmak izini bulun."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Parmak izi sensörü ekranınızın üzerindedir. Bulmak için parmağınızı ekran yüzeyinde hareket ettirin."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Cihaz ve parmak izi sensörünün yerini gösteren çizim"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Ad"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"Tamam"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Sil"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Sensöre dokunun"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Parmağınızı sensörün üzerine koyun ve bir titreşim hissettiğinizde kaldırın"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Kaldırın, tekrar dokunun"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Parmak izinizin tüm farklı noktalarını eklemek için parmağınızı kaldırıp dokundurmaya devam edin"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Parmak izi eklendi"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Bu simgeyi gördüğünüzde, kimlik belirlemek veya bir satın alma işlemine onay vermek için parmak izinizi kullanın"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Daha sonra yap"</string>
@@ -1222,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Açık / Bakıyorsanız ekran kapanmaz"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Kapat"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Kamera erişimi gerekiyor"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Cihaz Kişiselleştirme Hizmetleri izinlerini yönetmek için dokunun"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Baktığınız sürece ekranın kapanmasını engeller"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Ekrana dikkat verme seçeneğinde, ekrana bakan birisi olup olmadığını görmek için ön kamera kullanılır. Tüm işlemler cihazda gerçekleşir ve görüntüler hiçbir zaman saklanmaz ya da Google\'a gönderilmez."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Ekrana dikkat vermeyi açın"</string>
@@ -1303,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Ekran karanlıkken yeni bildirimler için açılır"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Saati ve bilgiyi daima göster"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Daha fazla pil kullanımı"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Kalın Metin"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Kalın metin"</string>
     <string name="title_font_size" msgid="570613010306330622">"Yazı tipi boyutu"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Metni daha büyük veya daha küçük yapın"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM kart kilit ayarları"</string>
@@ -1472,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Diğer kullanıcılar"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Cihazdaki depolama birimleri"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Taşınabilir depolama birimi"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Alarmlar ve hatırlatıcılar"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Alarm veya hatırlatıcı kurmaya izin ver"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Alarmlar ve hatırlatıcılar"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Bu uygulamanın alarm veya başka zaman bazlı etkinlikleri kurmasına izin verin. Bu, cihazı kullanmadığınız zamanlarda bile uygulamanın uyanmasına ve çalışmasına izin verir. Bu iznin iptal edilmesinin uygulamanın düzgün çalışmasına engel olabileceğini ve özellikle uygulamanın kurmuş olduğu alarmların artık çalışmayacağını unutmayın."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"program, alarm, hatırlatıcı, etkinlik"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g>\'lık alanın <xliff:g id="USED">%1$s</xliff:g>\'ı kullanılıyor"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"kullanılıyor (Toplam: <xliff:g id="TOTAL">%1$s</xliff:g>)"</string>
@@ -1721,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Konum hizmetleri"</string>
     <string name="location_title" msgid="5819154746934945021">"Konumum"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"İş profili konumu"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Uygulamaların konum erişimi"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Konum özelliği kapalı"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> uygulamadan <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> tanesinin konuma erişimi var</item>
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> uygulamadan <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> tanesinin konuma erişimi var</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Son konum erişimi"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Ayrıntıları göster"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Yakın zamanda hiçbir uygulama konum bilgisi isteğinde bulunmadı"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Yakın zamanda konum bilgilerine herhangi bir uygulama erişmedi"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Yüksek pil kullanımı"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Düşük pil kullanımı"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Kablosuz ağ ve Bluetooth taraması"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Kablosuz ağ taraması"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Uygulamaların ve hizmetlerin kablosuz ağları Kablosuz özelliği kapalıyken bile her zaman taramasına izin verin. Bu özellik, örneğin, konuma dayalı özellikleri ve hizmetleri iyileştirmek için kullanılabilir."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth taraması"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Uygulamaların ve hizmetlerin etrafınızdaki cihazları Bluetooth kapalıyken bile her zaman taramasına izin verin. Bu özellik, örneğin, konuma dayalı özellikleri ve hizmetleri iyileştirmek için kullanılabilir."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Konum Hizmetleri"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"İş için konum hizmetleri"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Konum saat dilimini algılama"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Konum saat dilimini algılama"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Mevcut saat dilimini algılamak için cihazın konumunun kullanılmasına izin verir. Kablosuz ağ taraması gibi diğer konum ayarları, saat dilimi algılamanın doğruluğunu etkileyebilir."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Açık"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Kapalı"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Otomatik saat dilimi algılama özelliği devre dışı"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Otomatik saat dilimi algılama kapalı"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Konum saat dilimini algılama devre dışı bırakıldı"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Konum saat dilimini algılama desteklenmiyor"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Konum saat dilimini algılama değişikliğine izin verilmez"</string>
@@ -1923,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Etkinleştir"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Depolama alanını temizle"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Güncellemeleri kaldır"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Bu uygulamayı bazı işlemler için varsayılan olarak başlatmayı seçtiniz."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Seçtiğiniz bazı etkinlikler varsayılan olarak bu uygulamada açılır."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Bu uygulamanın widget oluşturmasına ve oluşturulan widget\'ların verilerine erişmesine izin vermeyi seçtiniz."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Hiçbir varsayılan ayarlanmadı."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Varsayılanları temizle"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Varsayılan tercihleri temizle"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Bu uygulama, ekranınıza göre tasarlanmamış olabilir; ekranınızda nasıl duracağını buradan kontrol edebilirsiniz."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Başlarken sor"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Uygulamayı ölçeklendir"</string>
@@ -2138,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Bu cihazı gereksinimlerinize uygun şekilde özelleştirebilirsiniz. Bu erişilebilirlik özellikleri daha sonra Ayarlar\'dan değiştirilebilir."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Yazı tipi boyutunu değiştir"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekran okuyucular"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Ses ve ekran metni"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Altyazılar"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Ses"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Genel"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekran"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Metin ve görüntülü"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekranı koyulaştır"</string>
@@ -2291,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Kırmızı-yeşil"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Kırmızı-yeşil"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Mavi-sarı"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Parlaklığı Azalt"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Parlaklığı azalt"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Ekranı, telefonunuzun minimum parlaklığından daha koyu yapın"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Ekranı, tabletinizin minimum parlaklığından daha koyu yapın"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Daha rahat okuyabilmek için ekranınızı koyulaştırın.&lt;br/&gt;&lt;br/&gt; Bu özelliğin kullanışlı olacağı durumlar: &lt;ol&gt; &lt;li&gt; Telefonunuzun varsayılan minimum parlaklığı çok açık&lt;/li&gt; &lt;li&gt; Telefonunuzu gece veya uyumadan önce, karanlık bir oda gibi ışıksız ortamda kullanıyorsunuz&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3328,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"yüz"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"parmak izi, parmak izi ekle"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"ekranı karartma, dokunmatik ekran, pil, akıllı parlaklık, dinamik parlaklık, Otomatik parlaklık"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"ekranı karartma, uyku, pil, zaman aşımı, dikkat verme, görüntü, ekran, etkin olmama"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"döndür, çevir, döndürme, portre, manzara, yön, dikey, yatay"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"yeni sürüme geçme, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, zamanlama, bildirimler, engelleme, sessiz, titreşim, uyku, çalışma, odak, ses, sesi kapatma, gün, hafta içi, hafta sonu, hafta içi gece, etkinlik"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ekran, kilitleme süresi, zaman aşımı, kilit ekranı"</string>
@@ -3498,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Zil sesleri"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Diğer sesler ve titreşimler"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Bildirimler"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Konuşma"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"En son gönderilenler"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Son 7 gün içinde kullanılan tüm uygulamaları göster"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Gelişmiş"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Genel"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"İş bildirimleri"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Uyarlanabilir bildirimler"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Uyarlamalı bildirim önceliği"</string>
@@ -3562,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Aşağı açılır gölgede, durum çubuğunda ve kilit ekranında gösterilir"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Durum çubuğunda sessiz bildirimleri gizle"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Işığı yakıp söndür"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Kilit ekranındaki bildirimler"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Gizlilik"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Kilit ekranını atla"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Yüz tanıma kilidinden sonra, doğrudan son kullanılan ekrana git"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Kilit ekranı, Kilitekranı, Atla, Geç"</string>
@@ -3651,7 +3681,8 @@
       <item quantity="one">Haftada yaklaşık <xliff:g id="NUMBER_0">%d</xliff:g> bildirim</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Hiçbir zaman"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Bildirim erişimi"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Cihaz ve uygulama bildirimleri"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Uygulama ve cihazlarınızda hangi bildirimlerin gösterileceğini kontrol edin"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"İş profili bildirimlerine erişim engellendi"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Uygulamalar bildirimleri okuyamaz"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3670,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Kapat"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"İptal"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"İzin verilen bildirim türleri"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Önemli devam eden bildirimler"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Görüşme bildirimleri"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Uyaran bildirimler"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Sessiz bildirimler"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Gerçek zamanlı"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Kullanımdaki uygulamalardan, navigasyon, telefon aramaları ve başka işlemlerden gelen gerçek zamanlı iletişimler"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Görüşmeler"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS ve diğer iletişimler"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Varsayılan"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Ayarlara bağlı olarak zili çaldırabilen veya titreşimi etkinleştiren bildirimler"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Sessiz"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Hiçbir zaman ses çıkarmayan veya titreşmeyen bildirimler"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Tüm uygulamaları göster"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Bildirim gönderebilen uygulamaların her biri için bildirim ayarlarını değiştirin"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Cihazda gösterilen uygulamalar"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR yardımcı hizmetleri"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Yüklü hiçbir uygulamanın VR yardımcı hizmetleri olarak çalışması istenmedi."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"<xliff:g id="SERVICE">%1$s</xliff:g> için VR hizmetine erişim izni verilsin mi?"</string>
@@ -3968,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Varsayılan olarak aç"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Bağlantıları açma"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Desteklenen bağlantıları aç"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Desteklenen bağlantıları bu uygulamada aç"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Bu uygulamada açılacak bağlantılar"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Sormadan aç"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Desteklenen bağlantılar"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Diğer varsayılanlar"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Diğer varsayılan tercihler"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Bağlantı ekle"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Uygulama, bağlantıları doğrulayıp otomatik olarak uygulama içinde açabilir. "<annotation id="url">"Daha fazla bilgi"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> doğrulanmış bağlantı</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> doğrulanmış bağlantı</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Bağlantılar doğrulanmıştır ve bu uygulamada otomatik olarak açılır.</item>
+      <item quantity="one">Bağlantı doğrulanmıştır ve bu uygulamada otomatik olarak açılır.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"Tamam"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Diğer desteklenen bağlantılar kontrol ediliyor…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"İptal"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> desteklenen bağlantı</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> desteklenen bağlantı</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Ekle"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g>, uygulamasında açılır"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> kullanılıyor (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"dahili depolama"</string>
     <string name="storage_type_external" msgid="125078274000280821">"harici depolama"</string>
@@ -4265,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Kameraya izin verilmiyor"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Ekran görüntüsüne izin verilmiyor"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Bu uygulama açılamaz"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Sorularınız olursa BT yöneticinizle iletişime geçin"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Diğer ayrıntılar"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Yöneticiniz ayarlar, izinler, kurumsal erişim, ağ etkinliği ve cihazın konum bilgileri dahil iş profilinizle ilişkilendirilen uygulamaları ve verileri izleyip yönetebilir."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Yöneticiniz ayarlar, izinler, kurumsal erişim, ağ etkinliği ve cihazın konum bilgileri dahil bu kullanıcıyla ilişkilendirilen uygulamaları ve verileri izleyip yönetebilir."</string>
@@ -4342,7 +4395,7 @@
       <item quantity="one">1 kısıtlama</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operatörünüzün veri kullanımı hesaplaması, cihazdaki hesaplamadan farklı olabilir"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Operatör ağları tarafından kullanılan verileri hariç tutar"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Operatör ağları tarafından kullanılan verileri hariç tut"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> kullanıldı"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Veri uyarısı oluştur"</string>
     <string name="data_warning" msgid="2925054658166062884">"Veri uyarısı"</string>
@@ -4679,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g> için yükleme kaldırıldı)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g> için devre dışı bırakıldı)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Otomatik doldurma hizmeti"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"otomatik, doldur, otomatik doldur"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Şifreler"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"otomatik, doldurma, otomatik doldurma, şifre"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Bu uygulamaya güvendiğinizden emin olun&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Otomatik Doldurma&gt;%1$s&lt;/xliff:g&gt; otomatik doldurulabilecek öğeleri belirlemek için ekranınızdaki bilgileri kullanır."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Otomatik doldur"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Günlük kaydı düzeyi"</string>
@@ -4886,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Ağın çalışma modunu değiştir"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tercih edilen ağ türü"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Operatör"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Ayarlar sürümü"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operatör ayarları sürümü"</string>
     <string name="call_category" msgid="641461844504128789">"Çağrı"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operatör görüntülü görüşmesi"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Sistem seç"</string>
@@ -4910,7 +4964,7 @@
     <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM açılsın mı?"</string>
     <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatörüne geçilsin mi?"</string>
     <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM kart kullanmaya geçilsin mi?"</string>
-    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Aynı anda yalnızca indirilmiş tek bir SIM etkin olabilir.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> operatörüne geçtiğinizde <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> hizmetiniz iptal edilmez."</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Aynı anda yalnızca tek bir SIM etkin olabilir.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> operatörüne geçtiğinizde <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> hizmetiniz iptal edilmez."</string>
     <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Aynı anda yalnızca bir indirilmiş SIM etkin olabilir.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> operatörüne geçtiğinizde <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> hizmetiniz iptal edilmez."</string>
     <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Aynı anda yalnızca tek bir SIM etkin olabilir.\n\nGeçiş yaptığınızda <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> hizmetiniz iptal edilmez."</string>
     <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatörüne geç"</string>
@@ -4935,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM\'i çıkarıp tekrar yerleştirmeyi deneyin. Sorun devam ederse cihazınızı yeniden başlatın."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM\'i tekrar açmayı deneyin. Sorun devam ederse cihazınızı yeniden başlatın."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ağ etkinleştirme"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Operatör değiştirme"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> etkin durumda"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ayarlarını güncellemek için dokunun"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ağ türüne geçildi"</string>
@@ -5095,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Kapalı"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"İnternet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM\'ler"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Uçak modunda kullanılabilen ağları göster"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Uçak modunda kullanılabilen ağları bulup bağlanır."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Kablosuz ağları bulun ve bağlanın"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"uçak, uçakta kullanımı güvenli"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Aramalar ve SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Kablosuz Çağrı"</string>
@@ -5110,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"kullanılamıyor"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Geçici olarak kullanılamıyor"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM kart yok"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Tercihler"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Ağ tercihleri"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Herkese açık ağlara bağlan"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"ağ bağlantısı, internet, kablosuz, veri, wifi, wi-fi, wi fi, hücresel, mobil, hücresel operatör, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Uçak modu ağlarını göster"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Uçak modu ağlarını göster"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Ağları açma"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Ağları kapatma"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"İnternet bağlantınız sıfırlansın mı?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Bu, telefon aramanızı sonlandırır"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Bu, telefon aramanızı sonlandırır"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"İnternet bağlantınız sıfırlanıyor…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Sabit bağlantı"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Kullanılabilir uçak modu ağları"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Ağ değiştirmek için ethernet bağlantısını kesin"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Bağlı durumdayken ağ değiştirilemez"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Uçak modu ağları"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Bağlı"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"İnternet otomatik olarak bağlanmaz"</string>
@@ -5146,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Renk"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Diğer"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Genel"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Tüm uygulamaları göster"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Akıllı Yönlendirme"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Akıllı Yönlendirme Etkin"</string>
@@ -5159,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefon numarası girin"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefon numarası eksik."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Tamam"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G\'ye izin ver"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G hücresel bağlantıları kullan. 2G, acil durum aramaları için her zaman açıktır."</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d225b4e..ed14e31 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -54,9 +54,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Збільшуйте або зменшуйте текст на екрані."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Зменшити"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Збільшити"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Застосувати автообертання"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Зразок тексту"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Чарівник країни Оз"</string>
@@ -413,15 +412,21 @@
       <item quantity="other">Налаштовано <xliff:g id="COUNT_1">%1$d</xliff:g> відбитка пальця</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Розблокування відбитком"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Налаштуйте \"Відбиток пальця\""</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Відбиток пальця"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Щоб розблокувати телефон, дозволити покупку або ввійти в додаток, просто торкніться сканера відбитків пальців. Додавайте відбитки лише тих, кому довіряєте. Навіть одного доданого відбитка пальця досить, щоб авторизувати перелічені дії."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Відбиток пальця може бути менш безпечним, ніж надійний ключ чи PIN-код."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Своїми налаштуваннями керуєте лише ви"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Важливо"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Дані, записані функцією \"Відбиток пальця\", надійно зберігаються на телефоні й нікуди не надсилаються. Ви можете будь-коли видалити їх у налаштуваннях."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Відбиток пальця може бути менш безпечним, ніж надійний ключ або PIN-код."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Ваш телефон час від часу буде використовувати нещодавні зображення відбитків пальця, щоб створювати кращі моделі відбитків."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Розблоковуйте телефон або схвалюйте покупки відбитком пальця.\n\nПримітка. Цей пристрій не можна розблоковувати відбитком пальця. Щоб дізнатися більше, зв’яжіться з адміністратором своєї організації."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Розблоковуйте телефон або схвалюйте покупки відбитком пальця.\n\nПримітка. Відбиток пальця може бути менш надійним, ніж ключ чи PIN-код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Скасувати"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ні, дякую"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Пропустити"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Далі"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Прийняти"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Пропустити"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Далі"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Пропустити?"</string>
@@ -438,16 +443,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Пропустити"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Скасувати"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Торкніться сканера"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Натисніть і втримуйте значок відбитка пальця"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Сканер розташовано на задній панелі телефона. Прикладіть вказівний палець."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Він на екрані. Знайдіть значок відбитка пальця в колі, що світиться."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Сканер відбитків пальців розташовано на екрані. Щоб знайти його, проведіть пальцем по екрану."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Розташування сканера відбитків пальців на пристрої"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Назва"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ОК"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Видалити"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Торкніться сканера"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Покладіть палець на датчик і заберіть його, коли відчуєте вібрацію"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Підніміть і знову торкніться"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Піднімайте палець, щоб додати різні частини відбитка"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Відбиток додано"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Коли ви бачите цей значок, підтвердьте свою особу або покупку за допомогою відбитка пальця"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Пізніше"</string>
@@ -1216,14 +1230,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Пошук"</string>
     <string name="display_settings" msgid="7197750639709493852">"Екран"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Автообертання екрана"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Вимкнути"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Увімкнути"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Увімкнути (за обличчям)"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Увімкнути розпізнавання облич"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Кольори"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Природні"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Яскраві"</string>
@@ -1268,7 +1278,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ввімкнено: екран не вимикатиметься, доки ви на нього дивитесь"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Вимкнено"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Потрібен доступ до камери"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Торкніться, щоб керувати дозволами для служб персоналізації пристрою"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Не дає екрану вимикатись, якщо ви на нього дивитесь"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Адаптивний сплячий режим за допомогою передньої камери визначає, чи дивиться користувач на екран. Ця функція працює лише на пристрої, не зберігає зображень і не надсилає їх у Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Увімкнути адаптивний сплячий режим"</string>
@@ -1349,7 +1362,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Коли екран темний, він вмикається, щоб показати нові сповіщення"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Завжди показувати час і дані"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Підвищене використання заряду акумулятора"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Текст жирним шрифтом"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Жирний шрифт"</string>
     <string name="title_font_size" msgid="570613010306330622">"Розмір шрифту"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Збільшуйте або зменшуйте текст"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Налаштування блокування SIM-карти"</string>
@@ -1520,6 +1533,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Інші користувачі"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Пам’ять пристрою"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Портативний пристрій пам’яті"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Будильники й нагадування"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Дозволити створювати будильники або нагадування"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Будильники й нагадування"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Цей додаток зможе планувати будильники або нагадування про інші події. Він зможе виходити з режиму сну й запускатися, навіть якщо ви не користуєтеся пристроєм. Звернуть увагу: якщо відкликати цей дозвіл, додаток може не працювати належним чином, зокрема це стосується всіх запланованих у додатку будильників."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"запланувати, будильник, нагадування, подія"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Використовується <xliff:g id="USED">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Використовується з <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1769,7 +1787,8 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Служби локації"</string>
     <string name="location_title" msgid="5819154746934945021">"Моє місцезнах."</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Геодані для робочого профілю"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Доступ додатка до геоданих"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Передавання геоданих вимкнено"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> Кількість додатків із доступом до геоданих: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> з <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
@@ -1777,24 +1796,24 @@
       <item quantity="many"> Кількість додатків із доступом до геоданих: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> з <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
       <item quantity="other"> Кількість додатків із доступом до геоданих: <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> з <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g></item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Доступ до останніх геоданих"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Переглянути деталі"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Останнім часом додатки не запитували доступ до геоданих"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Немає додатків, які нещодавно отримували доступ до геоданих"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Значне використання заряду"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Низьке використання заряду"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Пошук Wi‑Fi та Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Шукати мережі Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Дозволити додаткам і сервісам будь-коли шукати мережі Wi-Fi, навіть якщо Wi-Fi вимкнено. Це може покращити роботу функцій і сервісів, які використовують геодані."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Шукати пристрої Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дозволити додаткам і сервісам будь-коли шукати пристрої поруч, навіть якщо Bluetooth вимкнено. Це може покращити роботу функцій і сервісів, які використовують геодані."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Служби локації"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Служби локації для роботи"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Визначення часового поясу за допомогою геолокації"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Визначення часового поясу за допомогою геолокації"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Дає змогу визначати часовий пояс за геоданими пристрою. На точність можуть впливати інші налаштування геоданих (наприклад, пошук мереж Wi-Fi)."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Увімкнено"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Вимкнено"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Автоматичне визначення часового поясу вимкнено"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Автоматичне визначення часового поясу вимкнено"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Визначення часового поясу за допомогою геолокації вимкнено"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Визначення часового поясу за допомогою геолокації не підтримується"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Ви не можете змінити налаштування визначення часового поясу за допомогою геолокації"</string>
@@ -1977,10 +1996,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Увімкнути"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Очистити пам’ять"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Видалити оновлення"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Ви вибрали запуск цієї програми за умовчанням для деяких дій."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Деякі вибрані дії запускаються в цьому додатку за умовчанням."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Ви вирішили дозволити цій програмі створювати віджети й отримувати доступ до їх даних."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Значення не встановлені."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Видалити значення за умовчанням"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Очистити стандартні налаштування"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Можливо, ця програма не призначена для вашого екрана. Тут можна контролювати, як вона налаштовується для вашого екрана."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Запитувати під час запуску"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Масштабувати програму"</string>
@@ -2192,7 +2211,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Ви можете налаштувати цей пристрій для своїх потреб. Ці спеціальні можливості можна пізніше змінити в налаштуваннях."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Змінити розмір шрифту"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Програми зчитування з екрана"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Аудіо й текст на екрані"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Cубтитри"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Аудіо"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Загальні"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Екран"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Текст і відображення"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Затемняти екран"</string>
@@ -2347,7 +2368,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Червоний – зелений"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Червоний – зелений"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Синій – жовтий"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Зменшувати яскравість"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Зменшення яскравості"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Робити екран телефона темнішим, ніж передбачає мінімальний рівень яскравості"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Робити екран планшета темнішим, ніж передбачає мінімальний рівень яскравості"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Зменште яскравість екрана, щоб читати комфортніше.&lt;br/&gt;&lt;br/&gt; Ця функція корисна, коли: &lt;ol&gt; &lt;li&gt; встановлено мінімальне стандартне значення яскравості, але екран телефона все одно засвітлий;t&lt;/li&gt; &lt;li&gt; ви користуєтеся телефоном у темряві, наприклад уночі чи перед сном.&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -2988,7 +3009,7 @@
     <string name="data_usage_tab_3g" msgid="6111070409752123049">"2G–3G"</string>
     <string name="data_usage_list_mobile" msgid="3738130489722964291">"Мобільні"</string>
     <string name="data_usage_list_none" msgid="2091924522549134855">"Немає"</string>
-    <string name="data_usage_enable_mobile" msgid="1996943748103310201">"Мобільне передавання даних"</string>
+    <string name="data_usage_enable_mobile" msgid="1996943748103310201">"Мобільний трафік"</string>
     <string name="data_usage_enable_3g" msgid="2818189799905446932">"Дані 2G–3G"</string>
     <string name="data_usage_enable_4g" msgid="1526584080251993023">"Дані 4G"</string>
     <string name="data_roaming_enable_mobile" msgid="5745287603577995977">"Роумінг"</string>
@@ -3263,7 +3284,7 @@
     <string name="preferred_network_type_title" msgid="812509938714590857">"Тип мережі"</string>
     <string name="preferred_network_type_summary" msgid="8786291927331323061">"LTE (рекомендовано)"</string>
     <string name="mms_message_title" msgid="6624505196063391964">"MMS-повідомлення"</string>
-    <string name="mms_message_summary" msgid="2855847140141698341">"Надсилайте й отримуйте сповіщення, коли вимкнено мобільне передавання даних"</string>
+    <string name="mms_message_summary" msgid="2855847140141698341">"Надсилати й отримувати, коли вимкнено мобільний трафік"</string>
     <string name="data_during_calls_title" msgid="3940276893360429144">"Передавання даних під час викликів"</string>
     <string name="data_during_calls_summary" msgid="2289050189544214759">"Використовувати цю SIM-карту для мобільного передавання даних лише під час викликів"</string>
     <string name="work_sim_title" msgid="8999872928646924429">"Робоча SIM-карта"</string>
@@ -3422,8 +3443,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"обличчя"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"відбиток пальця, додати відбиток пальця"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"затемнений екран, сенсорний екран, акумулятор, розумна яскравість, динамічна яскравість, автояскравість"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"затемнений екран, режим сну, акумулятор, час вимкнення, адаптивний сплячий режим, дисплей, екран, бездіяльність"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"обернути, перевернути, обертання, книжкова орієнтація, альбомна орієнтація, орієнтація, вертикально, горизонтально"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"оновлення, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"не турбувати, графік, сповіщення, блокувати, без звуку, вібрація, сон, робота, зосередитися, звук, вимкнути звук, день, будній день, вихідні, будній вечір, подія"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"екран, час блокування, час вимкнення, заблокований екран"</string>
@@ -3592,9 +3615,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Сигнали дзвінка"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Інші звуки та вібросигнали"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Сповіщення"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Розмова"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Нещодавні сповіщення"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Переглянути всі за останні 7 днів"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Розширені налаштування"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Загальні"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Робочі сповіщення"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Адаптивні сповіщення"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Пріоритет адаптивних сповіщень"</string>
@@ -3656,7 +3680,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Показувати на розкривній панелі, у рядку стану й на заблокованому екрані"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Сховати беззвучні сповіщення в рядку стану"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Блимання"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"На заблокованому екрані"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Конфіденційність"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Пропускати заблокований екран"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Після розпізнавання обличчя переходити на останній відкритий екран"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Заблокований екран, екран блокування, пропустити, обходити"</string>
@@ -3751,7 +3775,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> сповіщення на тиждень</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Ніколи"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Доступ до сповіщень"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Сповіщення додатків і пристроїв"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Визначайте, які сповіщення від своїх додатків і пристроїв ви хочете бачити"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Доступ до сповіщень робочого профілю заблоковано"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Додатки не можуть читати сповіщення"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3772,17 +3797,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Вимкнути"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Скасувати"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Дозволені типи сповіщень"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Важливі постійні сповіщення"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Сповіщення про повідомлення"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Сповіщення зі звуком чи вібрацією"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Беззвучні сповіщення"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"У реальному часі"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Повідомлення в реальному часі від активних додатків або системи навігації, телефонні дзвінки тощо"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Розмови"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS та інші повідомлення"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"За умовчанням"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Сповіщення, які можуть супроводжуватися звуком або вібрацією залежно від налаштувань"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Без звуку"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Сповіщення, які ніколи не супроводжуються звуком або вібрацією"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Показати всі додатки"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Змінюйте налаштування сповіщень для кожного додатка, який може їх надсилати"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Додатки, показані на пристрої"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Допоміжні VR-сервіси"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Установлені додатки не запитували доступу для роботи в режимі допоміжних служб VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Надати VR-сервісу доступ до сервісу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -4082,9 +4107,36 @@
     <string name="launch_by_default" msgid="892824422067985734">"Відкривати за умовчанням"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Відкривання посилань"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Відкривати підтримувані посилання"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Підтримувані посилання відкриваються в цьому додатку"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Посилання, що мають відкриватися в цьому додатку"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Відкривати, не запитуючи"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Підтримувані посилання"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Інші значення за умовчанням"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Інші стандартні налаштування"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Додати посилання"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Додаток може підтверджувати посилання, які автоматично відкриватимуться в ньому. "<annotation id="url">"Докладніше"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> підтверджене посилання</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> підтверджені посилання</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> підтверджених посилань</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> підтвердженого посилання</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Це підтверджені посилання, які автоматично відкриваються в додатку.</item>
+      <item quantity="few">Це підтверджені посилання, які автоматично відкриваються в додатку.</item>
+      <item quantity="many">Це підтверджені посилання, які автоматично відкриваються в додатку.</item>
+      <item quantity="other">Це підтверджені посилання, які автоматично відкриваються в додатку.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Пошук інших підтримуваних посилань…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Скасувати"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> підтримуване посилання</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> підтримувані посилання</item>
+      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> підтримуваних посилань</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> підтримуваного посилання</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Додати"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Відкривається в додатку <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"Зайнято <xliff:g id="SIZE">%1$s</xliff:g> (<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>)"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"внутрішня пам\'ять"</string>
     <string name="storage_type_external" msgid="125078274000280821">"зовнішня пам\'ять"</string>
@@ -4399,7 +4451,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Користуватися камерою заборонено"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Робити знімки екрана заборонено"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Цей додаток не можна відкрити"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Якщо у вас є запитання, зв’яжіться з ІТ-адміністратором"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Докладніше"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Адміністратор може відстежувати та контролювати додатки й дані, пов’язані з вашим робочим профілем, зокрема налаштування, дозволи, корпоративний доступ, активність у мережі чи інформацію про місцезнаходження пристрою."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Адміністратор може відстежувати та контролювати додатки й дані, пов’язані з цим користувачем, зокрема налаштування, дозволи, корпоративний доступ, активність у мережі чи інформацію про місцезнаходження пристрою."</string>
@@ -4482,7 +4535,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> обмеження</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Оператор може по-іншому вимірювати статистику використання трафіку"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Не включає дані, що використовуються в мережах операторів мобільного зв\'язку"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Не включає дані, що використовуються в мережах операторів мобільного зв\'язку"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Використано <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Сповіщення щодо трафіку"</string>
     <string name="data_warning" msgid="2925054658166062884">"Застереження про трафік"</string>
@@ -4845,7 +4898,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(видалено для користувача <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(вимкнено для користувача <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Автозаповнення"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"автоматично, заповнювати, автозаповнення"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Паролі"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"автоматичний, заповнення, автозаповнення, пароль"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Переконайтеся, що додаток надійний&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Функція Автозаповнення Google&gt;%1$s&lt;/xliff:g&gt; використовує інформацію на екрані, щоб визначати поля для автозаповнення."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Автоматично заповнити"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Рівень реєстрації"</string>
@@ -5008,7 +5062,7 @@
     <string name="select_automatically" msgid="2419752566747259155">"Вибирати мережу автоматично"</string>
     <string name="carrier_settings_title" msgid="6959295328730560529">"Налаштування оператора"</string>
     <string name="cdma_lte_data_service" msgid="6937443423651347345">"Налаштувати мобільний Інтернет"</string>
-    <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобільне передавання даних"</string>
+    <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобільний трафік"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Доступ до Інтернету через мобільну мережу"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефон автоматично перемикатиметься на цього оператора в зоні його покриття"</string>
     <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Немає SIM-карти"</string>
@@ -5054,7 +5108,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Змінити режим роботи мережі"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Рекомендований тип мережі"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Оператор"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Версія налаштувань"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Версія налаштувань оператора"</string>
     <string name="call_category" msgid="641461844504128789">"Виклики"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Відеовиклики в мережі оператора"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Вибір системи"</string>
@@ -5103,6 +5157,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Вийміть SIM-карту та вставте її знову. Якщо проблема не зникне, перезапустіть пристрій."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Спробуйте знову ввімкнути SIM-карту. Якщо проблема не зникне, перезапустіть пристрій."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Активація мережі"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Змінення оператора"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> активовано"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Натисніть, щоб оновити налаштування SIM-карти"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Ви перейшли в мережу оператора <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5267,8 +5322,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Вимкнено"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Інтернет"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-карти"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Показати мережі, доступні в режимі польоту"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Знаходьте мережі, доступні в режимі польоту, і підключайтеся до них."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Знаходьте мережі Wi‑Fi і підключайтеся до них"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"літак, безпечний у літаку"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Дзвінки та SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Дзвінки через Wi‑Fi"</string>
@@ -5282,22 +5336,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"недоступно"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Тимчасово недоступно"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Немає SIM-карти"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Параметри"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Налаштування мережі"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Підключатися до загальнодоступних мереж"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"з\'єднання з мережею, Інтернет, бездротове, дані, Wi-Fi, wi-fi, wi fi, мобільний, стільниковий, оператор мобільного зв\'язку, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Мережі, доступні в режимі польоту"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Мережі, доступні в режимі польоту"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Увімкнути мережі"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Вимкнути мережі"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Скинути інтернет-з\'єднання?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Ваш дзвінок буде завершено"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Ваш дзвінок буде завершено"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Скидання інтернет-з\'єднання…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Вирішити проблеми зі з\'єднанням"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Мережі, доступні в режимі польоту"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Щоб вибрати іншу мережу, від\'єднайте кабель Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Якщо встановлено з\'єднання, змінити мережу не можна"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Мережі в режимі польоту"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Підключено"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Автоматичне інтернет-з\'єднання вимкнено"</string>
@@ -5318,6 +5371,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Колір"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Інші"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Загальні"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Показати всі додатки"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Розумна переадресація"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Розумну переадресацію ввімкнено"</string>
@@ -5331,4 +5388,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Ввести номер телефону"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Номер телефону відсутній."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Дозволити 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Увімкнути мобільний зв\'язок 2G. Мобільний зв\'язок 2G завжди ввімкнено."</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 4bda711..4d88d9f 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"اسکرین پر موجود متن کو چھوٹا یا بڑا کریں۔"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"چھوٹا کریں"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"بڑا کریں"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"خود کار طور پر گھمائیں کا استعمال کریں"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"نمونہ متن"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"اوز کا شاندار جادوگر"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> فنگر پرنٹ ترتیب دیا گیا</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"فنگر پرنٹ کے ساتھ غیر مقفل کریں"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"اپنا فنگر پرنٹ سیٹ اپ کریں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"اپنا فنگر پرنٹ استعمال کریں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"اپنا فون غیر مقفل کرنے، خریداریوں کی اجازت دینے یا ایپس میں سائن ان کرنے کیلئے بس فنگر پرنٹ سینسر کو ٹچ کریں۔ کسی کے فنگر پرنٹس شامل کرتے وقت محتاط رہیں۔ بس ایک شامل کردہ فنگر پرنٹ سے یہ سارے کام کئے جا سکتے ہیں۔"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"‏ایک طاقتور پیٹرن یا PIN کی بنسبت آپ کا فنگر پرنٹ شاید کم محفوظ ہو۔"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"سب کچھ آپ کے اختیار میں ہے"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"یاد رکھیں"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"فنگر پرنٹ کے ذریعے ریکارڈ کردہ ڈیٹا محفوظ طریقے سے اسٹور کیا جاتا ہے اور کبھی بھی آپ کے فون سے باہر نہیں جاتا۔ آپ کسی بھی وقت ترتیبات میں اپنا ڈیٹا حذف کر سکتے ہیں۔"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"‏ایک طاقتور پیٹرن یا PIN کی بنسبت آپ کا فنگر پرنٹ شاید کم محفوظ ہو۔"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"کبھی کبھار آپ کا فون بہتر کردہ فنگر پرنٹ کے ماڈلز تخلیق کرنے کے لئے آپ کی حالیہ فنگر پرنٹ کی تصاویر کا استعمال کرے گا۔"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"اپنا فون غیرمقفل کرنے یا خریداریاں منظور کرنے کے لیے اپنے فنگر پرنٹ کا استعمال کریں۔\n\nنوٹ: آپ اس آلہ کو غیرمقفل کرنے کے لیے اپنا فنگر پرنٹ استعمال نہیں کر سکتے۔ مزید معلومات کے لیے، اپنی تنظیم کے منتظم سے رابطہ کریں۔"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"‏اپنا فون غیرمقفل کرنے یا خریداریاں منظور کرنے کے لیے اپنے فنگر پرنٹ کا استعمال کریں۔\n\nنوٹ: ایک طاقتور پیٹرن یا PIN کی بنسبت آپ کا فنگر پرنٹ شاید کم محفوظ ہو۔"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"منسوخ کریں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"نہیں شکریہ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"نظر انداز کریں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"جاری رکھیں"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"متفق"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"نظر انداز کریں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"آگے جائیں"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"فنگر پرنٹ کو نظر انداز کریں؟"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"نظر انداز کریں"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"منسوخ کریں"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"سینسر کو ٹچ کریں"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"فنگر پرنٹ آئیکن کو ٹچ کریں اور دبائے رکھیں"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"یہ آپ کے فون کے پشت پر ہے۔ اپنی انڈیکس فنگر کا استعمال کریں۔"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"یہ اسکرین پر ہے۔ چمکتے دائرے کے ساتھ فنگر پرنٹ تلاش کریں۔"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"فنگر پرنٹ سینسر آپ کی اسکرین پر ہے۔ اسے تلاش کرنے کے لئے اپنی انگلی کو اسکرین پر گھمائیں۔"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"آلہ اور فنگر پرنٹ سینسر کے مقام کا خاکہ"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"نام"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"ٹھیک ہے"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"حذف کریں"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"سینسر کو ٹچ کریں"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"اپنی انگلی سینسر پر رکھیں اور ارتعاش محسوس ہونے کے بعد اٹھا لیں"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"اٹھائیں، پھر دوبارہ ٹچ کریں"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"اپنے فنگر پرنٹ کے مختلف حصوں کو شامل کرنے کے لیے اپنی انگلی کو اٹھاتے رہیں"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"فنگر پرنٹ شامل ہو گیا"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"جب آپ کو یہ آئیکن دکھائی دے تو آپ شناخت کرنے یا خریداریوں کی منظوری کے لیے اپنے فنگر پرنٹ کا استعمال کریں"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"اسے بعد میں کریں"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"تلاش کریں"</string>
     <string name="display_settings" msgid="7197750639709493852">"ڈسپلے"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"اسکرین کو خود کار طور پر گھمائیں"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"آف"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"آن"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"آن - چہرے پر مبنی"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"چہرے کی شناخت کو فعال کریں"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"رنگ"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"قدرتی"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"بڑھایا گیا"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"اگر آپ آن اسکرین دیکھ رہے ہیں تو یہ آف نہیں ہوگی"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"آف"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"کیمرے تک رسائی درکار ہے"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"ڈیوائس پرسنلائزیشن سروسز کی خاطر اجازتوں کو نظم کرنے کے لیے تھپتھپائیں"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"اگر آپ اپنی اسکرین دیکھ رہے ہیں تو اسے آف ہونے سے بچاتی ہے"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"‏اسکرین پر توجہ کی خصوصیت یہ دیکھنے کے لیے سامنے والے کیمرے کا استعمال کرتی ہے کہ آیا کوئی اسکرین کو دیکھ تو نہیں رہا ہے۔ یہ آلہ پر کام کرتی ہے اور تصاویر کبھی بھی اسٹور نہیں کی جاتی ہیں اور نہ ہی Google کو بھیجی جاتی ہیں۔"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"اسکرین پر توجہ آن کریں"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"اسکرین گہری ہونے پر، یہ نئی اطلاعات کے لیے آن ہو جاتی ہے"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"ہمیشہ وقت اور معلومات دکھائیں"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"اضافی بیٹری کا استعمال"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"بولڈ ٹیکسٹ"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"بولڈ ٹیکسٹ"</string>
     <string name="title_font_size" msgid="570613010306330622">"فونٹ سائز"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"متن کو چھوٹا یا بڑا کریں"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"‏SIM کارڈ لاک کی ترتیبات"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"دوسرے صارفین"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"آلہ کا اسٹوریج"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"پورٹیبل اسٹوریج"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"الارمز اور یاد دہانیاں"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"الارمز یا یاد دہانیاں سیٹ کرنے کی اجازت دیں"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"الارمز اور یاد دہانیاں"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"اس ایپ کو الارمز یا وقت پر مبنی دیگر ایونٹس کو شیڈول کرنے کی اجازت دیں۔ اس سے ایپ کو تب بھی کام کرنے اور چلنے کی اجازت ہوگی جب آپ آلے کا استعمال نہیں کر رہے ہوں گے۔ نوٹ کریں کہ اس اجازت کی منسوخی سے، ہو سکتا ہے کہ ایپ مناسب طریقے سے کام نہ کر سکے خاص طور پر ایپ میں شیڈول کردہ کوئی بھی الارم مزید کام نہیں کرے گا۔"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"شیڈول، الارم، یاد دہانی، ایونٹ"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="TOTAL">%2$s</xliff:g> میں سے <xliff:g id="USED">%1$s</xliff:g> استعمال ہو گئی"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small></string>
     <string name="storage_volume_used" msgid="5031288167242496837">"<xliff:g id="TOTAL">%1$s</xliff:g> میں سے استعمال ہو گئی"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"مقام کی سروسز"</string>
     <string name="location_title" msgid="5819154746934945021">"میرا مقام"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"دفتری پروفائل کیلئے مقام"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"مقام تک ایپ کی رسائی"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"مقام آف ہے"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> میں سے <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> ایپس کو مقام تک رسائی حاصل ہے</item>
       <item quantity="one"> <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> میں سے <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> ایپس کو مقام تک رسائی حاصل ہے</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"مقام تک حالیہ رسائی"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"تفصیلات دیکھیں"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"حال میں کسی ایپس نے مقام کی درخواست نہیں کی ہے"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"حال میں کسی ایپ نے مقام تک رسائی حاصل نہیں کی ہے"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"بیٹری کا زیادہ استعمال"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"بیٹری کا کم استعمال"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"‏Wi-Fi اور بلوٹوتھ اسکیننگ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"‏Wi‑Fi اسکیننگ"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"‏Wi‑Fi کے آف ہونے پر بھی ایپس اور سروسز کو کسی بھی وقت Wi‑Fi نیٹ ورکس اسکین کرنے کی اجازت دیں۔ مثال کے طور، اسے مقام پر مبنی خصوصیات اور سروسز کو بہتر بنانے کے لیے استعمال کیا جا سکتا ہے۔"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"بلوٹوتھ اسکیننگ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"بلوٹوتھ کے آف ہونے پر بھی ایپس اور سروسز کو کسی بھی وقت قریبی آلات اسکین کرنے کی اجازت دیں۔ مثال کے طور، اسے مقام پر مبنی خصوصیات اور سروسز کو بہتر بنانے کے لیے استعمال کیا جا سکتا ہے۔"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"مقام کی سروسز"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"دفتر کے لیے مقام کی سروسز"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"مقام کے ٹائم زون کی شناخت"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"مقام کے ٹائم زون کی شناخت"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"‏موجودہ ٹائم زون کا پتہ لگانے کے لئے آلے کے مقام کو استعمال کرنے کی اجازت دیتا ہے۔ Wi‑Fi اسکیننگ جیسی دیگر مقام کی ترتیبات ٹائم زون کی شناخت کی درستگی کو متاثر کر سکتی ہیں۔"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"آن"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"آف"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"خودکار ٹائم زون کی شناخت غیر فعال ہے"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"خودکار ٹائم زون آف ہے"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"مقام کے ٹائم زون کی شناخت غیر فعال ہے"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"مقام کے ٹائم زون کی شناخت تعاون یافتہ نہیں ہے"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"مقام کے ٹائم زون کی شناخت کی تبدیلیوں کی اجازت نہیں ہے"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"فعال کریں"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"اسٹوریج صاف کریں"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"اپ ڈیٹس اَن انسٹال کریں"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"آپ نے کچھ کارروائیوں کیلئے بطور ڈیفالٹ اس ایپ کو شروع کرنے کا انتخاب کیا ہے۔"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"آپ کی منتخب کردہ کچھ سرگرمیاں اس ایپ میں بطور ڈیفالٹ کھلتی ہیں۔"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"ویجیٹس بنانے اور ان کے ڈیٹا تک رسائی حاصل کرنے کیلئے آپ نے اس ایپ کو اجازت دینے کو منتخب کیا ہے۔"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"کوئی ڈیفالٹس سیٹ نہیں ہیں۔"</string>
-    <string name="clear_activities" msgid="341345438786077236">"ڈیفالٹس صاف کریں"</string>
+    <string name="clear_activities" msgid="488089228657585700">"ڈیفالٹ ترجیحات صاف کریں"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"ہو سکتا ہے یہ ایپ آپ کی اسکرین کیلئے ڈیزائن نہ کی گئی ہو۔ آپ یہاں کنٹرول کر سکتے ہیں کہ یہ کیسے آپ کی اسکرین پر ایڈجسٹ کرتی ہے۔"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"شروع ہونے پر پوچھیں"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"اسکیل ایپ"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"آپ اس آلہ کو اپنی ضروریات کے مطابق حسب ضرورت بنا سکتے ہیں۔ یہ ایکسیسبیلٹی خصوصیات بعد میں ترتیبات میں تبدیل ہو سکتی ہیں۔"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"فونٹ سائز تبدیل کریں"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"اسکرین ریڈرز"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"آڈیو اور اسکرین پر موجود ٹیکسٹ"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"کیپشنز"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"آڈیو"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"عام"</string>
     <string name="display_category_title" msgid="6638191682294461408">"ڈسپلے"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"متن اور ڈسپلے"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"اسکرین کو مزید گہرا کریں"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"سرخ-سبز"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"سرخ-سبز"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"نیلا-پیلا"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"چمک کم کریں"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"چمک کم کریں"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"اپنے فون کی کم سے کم چمک کے مقابلے میں اپنی اسکرین کو مزید گہرا کریں"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"اپنے ٹیبلیٹ کی کم سے کم چمک کے مقابلے میں اپنی اسکرین کو مزید گہرا کریں"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"‏اپنی اسکرین کو زیادہ گہرا کریں تاکہ اس کو پڑھنے میں مزید سہولت ہو۔;lt;br/&gt;&lt;br/&amp;gt&amp; یہ مددگار ثابت ہو سکتی ہے اس صورت میں جب: ;lt;ol&gt; &lt;li&amp;gt&amp; آپ کے فون کی ڈیفالٹ کم سے کم چمک ابھی بھی بہت روشن ہو;lt;/li&gt; &lt;li&amp;gt&amp; آپ اپنا فون تاریک ماحول میں استعمال کر رہے ہیں جیسے رات میں یا سونے سے پہلے کسی تاریک کمرے میں;lt;/li&gt; &lt;/ol&amp;gt&amp;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"چہرہ"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"فنگر پرنٹ، فنگر پرنٹ شامل کریں"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"مدھم اسکرین، ٹچ اسکرین، بیٹری، اسمارٹ چمک، ڈائنیمک چمک، خودکار چمک"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"مدھم اسکرین، سلیپ وضع، بیٹری، ٹائم آؤٹ، توجہ، ڈسپلے، اسکرین، غیر فعالیت"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"گھمانا، پلٹنا، گردش، پورٹریٹ، لینڈ اسکیپ، سمت بندی، عمودی، افقی"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"‏اپ گریڈ کریں، Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"ڈسٹرب نہ کریں، شیڈول، اطلاعات، انسداد، سکوت، وائبریٹ، سلیپ، کام، توجہ، آواز، خاموش، دن، ہفتہ کا دن، ویک اینڈ، ہفتہ کی رات، ایونٹ"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"اسکرین، لاک ٹائم، ٹائم آؤٹ، لاک اسکرین"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"رنگ ٹونز"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"دیگر آوازیں اور وائبریشنز"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"اطلاعات"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"گفتگو"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"حال ہی میں اطلاعات بھیجنے والی ایپس"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"گزشتہ 7 دنوں کی تمام ملاحظہ کریں"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"جدید ترین"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"عام"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"دفتری اطلاعات"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"تغیر پذیر اطلاعات"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"تغیر پذیر اطلاع کی ترجیح"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"نیچے کی طرف کھینچیں شیڈ، اسٹیٹس بار اور مقفل اسکرین پر ڈسپلے کرتا ہے"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"اسٹیٹس بار میں خاموش اطلاعات کو چھپائیں"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"بلنک لائٹ"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"لاک اسکرین پر اطلاعات"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"رازداری"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"مقفل اسکرین کو نظرانداز کرنے کیلئے"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"چہرے کے ذریعے غیر مقفل کرنے کے بعد، آخری استعمال کردہ اسکرین پر جائیں"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"مقفل اسکرین، لاک اسکرین، نظر انداز کریں، بائی پاس کریں"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> اطلاع فی ہفتہ</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"کبھی نہیں"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"اطلاع تک رسائی"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"آلے اور ایپ کی اطلاعات"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"کنٹرول کریں کہ آپ کی ایپس اور آلات پر کون سی اطلاعات دکھائی دیں"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"دفتری پروفائل کی اطلاعات تک رسائی مسدود ہے"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"ایپس اطلاعات نہیں پڑھ سکتی ہیں"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"آف کریں"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"منسوخ کریں"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"اجازت یافتہ اطلاع کی اقسام"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"اہم جاری اطلاعات"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"بات چیت کی اطلاعات"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"متنبہ کرنے کی اطلاعات"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"خاموش اطلاعات"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"ریئل-ٹائم"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"زیر استعمال ایپس کی مدد سے ریئل-ٹائم مواصلات، نیویگیشن، فون کالز اور بہت کچھ"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"گفتگوئیں"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"‏SMS اور دیگر مواصلات"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"ڈیفالٹ"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"ترتیبات کی بنیاد پر بجنے والی یا وائبریٹ ہونے والی اطلاعات"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"خاموش"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"کبھی بھی نہ بجنے یا وائبریٹ ہونے والی اطلاعات"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"سبھی ایپس دیکھیں"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"اطلاعات بھیجنے والی ہر ایپ کے لئے اطلاع کی ترتیبات تبدیل کریں"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"آلے پر دکھائی دینے والی ایپس"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"‏VR مددگار سروسز"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"‏کسی انسٹال کردہ ایپ نے VR مددگار سروسز کے طور پر چلائے جانے کی درخواست نہیں کی ہے۔"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"‏<xliff:g id="SERVICE">%1$s</xliff:g> کیلئے VR سروس کی رسائی کی اجازت دیں؟"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"بطور ڈیفالٹ کھولیں"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"شروعاتی لنکس"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"تعاون یافتہ لنکس کھولیں"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"تعاون یافتہ لنکس اس ایپ میں کھلتے ہیں"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"اس ایپ میں کھلنے والے لنکس"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"پوچھے بغیر کھولیں"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"تعاون یافتہ لنکس"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"دیگر ڈیفالٹس"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"دیگر ڈیفالٹ ترجیحات"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"لنک شامل کریں"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"ایک ایپ لنکس کی توثیق کر سکتی ہے تاکہ وہ اس ایپ میں خودکار طور پر کھل سکیں۔ "<annotation id="url">"مزید جانیں"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> تصدیق شدہ لنکس</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> تصدیق شدہ لنک</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">یہ لنکس تصدیق شدہ ہیں اور خودکار طور پر اس ایپ میں کھلتے ہیں۔</item>
+      <item quantity="one">یہ لنک تصدیق شدہ ہے اور خودکار طور پر اس ایپ میں کھلتا ہے۔</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"ٹھیک ہے"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"دیگر تعاون یافتہ لنکس چیک کئے جا رہے ہیں…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"منسوخ کریں"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> تعاون یافتہ لنکس</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> تعاون یافتہ لنک</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"شامل کریں"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> میں کھلتا ہے"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> میں <xliff:g id="SIZE">%1$s</xliff:g> استعمال کیا گیا"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"داخلی اسٹوریج"</string>
     <string name="storage_type_external" msgid="125078274000280821">"خارجی اسٹوریج"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"کیمرے کی اجازت نہیں ہے"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"اسکرین شاٹ کی اجازت نہیں ہے"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"اس ایپ کو نہیں کھولا جا سکتا"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"‏اگر آپ کے پاس سوالات ہیں تو اپنے IT منتظم سے رابطہ کریں"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"مزید تفصیلات"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"آپ کا منتظم آپ کے دفتری پروفائل سے وابستہ ایپس اور ڈیٹا، بشمول ترتیبات، اجازتیں، کارپوریٹ رسائی، نیٹ ورک کی سرگرمی اور آلہ کے مقام کی معلومات مانیٹر اور منظم کر سکتا ہے۔"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"آپ کا منتظم اس صارف سے وابستہ ایپس اور ڈیٹا، بشمول ترتیبات، اجازتیں، کارپوریٹ رسائی، نیٹ ورک کی سرگرمی اور آلہ کے مقام کی معلومات مانیٹر اور منظم کر سکتا ہے۔"</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 پابندی</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"کیریئر ڈیٹا کا حساب آپ کے آلہ کے حساب سے مختلف ہو سکتا ہے"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"کیریئر نیٹ ورکس کے ذریعے استعمال کردہ ڈیٹا کو خارج کرتا ہے"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"کیریئر نیٹ ورکس کے ذریعے استعمال کردہ ڈیٹا کو خارج کرتا ہے"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> استعمال ہوا"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ڈیٹا وارننگ سیٹ کریں"</string>
     <string name="data_warning" msgid="2925054658166062884">"ڈیٹا وارننگ"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(صارف کیلیے اَن انسٹال ہوگیا <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(صارف کے لیے غیر فعال ہوگیا <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"آٹو فل سروس"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"آٹو، فل، آٹو فل"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"پاس ورڈز"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"خودکار، فل، آٹو فل، پاس ورڈ"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"‏&lt;b&gt;یہ یقینی بنائیں کہ آپ کو اس ایپ پر اعتماد ہے&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt;  آٹو فل کی جانے والی چیزوں کی تعیین کرنے کیلئے آپ کی اسکرین پر موجود چیزوں کو استعمال کرتا ہے۔"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"آٹو فل"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"لاگنگ کی سطح"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"نیٹ ورک آپریٹ کرنے کی وضع تبدیل کریں"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"ترجیحی نیٹ ورک کی قسم"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"کیریئر"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"ترتیبات کا ورژن"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"کیریئر کی ترتیبات کا ورژن"</string>
     <string name="call_category" msgid="641461844504128789">"کالنگ"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"کیرئیر ویڈیو کالنگ"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"سسٹم کا انتخاب"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‏SIM نکال کر دوبارہ داخل کریں۔ مسئلے کے برقرار رہنے پر اپنا آلہ ری اسٹارٹ کریں۔"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"‏SIM کو دوبارہ آن کرنے کی کوشش کریں۔ مسئلے کے برقرار رہنے پر اپنا آلہ ری اسٹارٹ کریں۔"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"نیٹ ورک کی فعالیت"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"کیریئر سوئچنگ"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> فعال ہے"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"‏SIM کی ترتیبات کو اپ ڈیٹ کرنے کے ليے تھپتھپائیں"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> پر سوئچ ہو گیا"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"آف"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"انٹرنیٹ"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"ہوائی جہاز وضع کے نیٹ ورکس دکھائیں"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"ہوائی جہاز وضع میں نیٹ ورکس کو تلاش کریں اور ان سے منسلک ہوں۔"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"‏Wi-Fi نیٹ ورکس تلاش کریں اور اس سے منسلک کریں"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ہوائی جہاز، ہوائی جہاز کیلئے محفوظ"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"‏کالز اور SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"‏Wi‑Fi کالنگ"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"دستیاب نہیں"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"عارضی طور پر دستیاب نہیں ہے"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"‏کوئی SIM نہیں ہے"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ترجیحات"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"نیٹ ورک کی ترجیحات"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"عوامی نیٹ ورکس سے منسلک ہوں"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"‏نیٹ ورک کنکشن، انٹرنیٹ، وائرلیس، ڈیٹا، wifi، wi-fi، wi fi، سیلولر، موبائل، سیل کیریئر، 4g، 3g، 2g، ‏lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"ہوائی جہاز وضع کے نیٹ ورکس دیکھیں"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"ہوائی جہاز وضع کے نیٹ ورکس دیکھ رہے ہیں"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"نیٹ ورکس آن کریں"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"نیٹ ورکس آف کریں"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"اپنا انٹرنیٹ ری سیٹ کریں؟"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"اس سے آپ کی فون کال ختم ہو جائے گی"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"اس سے آپ کی فون کال ختم ہو جائے گی"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"آپ کا انٹرنیٹ ری سیٹ کیا جا رہا ہے…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"کنیکٹوٹی درست کریں"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"ہوائی جہاز وضع کے نیٹ ورکس دستیاب ہیں"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"نیٹ ورکس پر سوئچ کرنے کیلئے، ایتھرنیٹ غیر منسلک کریں"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"منسلک ہونے کے دوران نیٹ ورکس کو سوئچ نہیں کر سکتے"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"ہوائی جہاز وضع کے نیٹ ورکس"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"منسلک ہے"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"انٹرنیٹ خود کار طور پر منسلک نہیں ہوگا"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"رنگ"</string>
     <string name="category_name_others" msgid="2366006298768550310">"دیگر"</string>
     <string name="category_name_general" msgid="7737273712848115886">"عام"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"سبھی ایپس دیکھیں"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"اسمارٹ فارورڈنگ"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"اسمارٹ فارورڈنگ فعال ہے"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"فون نمبر درج کریں"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"فون نمبر موجود نہیں ہے۔"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"ٹھیک ہے"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"‏2G کو اجازت دیں"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"‏2G سیلولر کنکشنز کا استعمال کریں ہنگامی کالز کے لئے 2G ہمیشہ آن رہتا ہے۔"</string>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 04623dd..9c245e9 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Ekrandagi matnni kattalashtirish yoki kichiklashtirish."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Kichiklashtirish"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Kattalashtirish"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Avtomatik burishdan foydalanish"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Namunaviy matn"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Oz mamlakati sehrgari"</string>
@@ -405,15 +404,21 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta barmoq izi qo‘shilgan</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Barmoq izi skaneri"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Barmoq izingizni sozlang"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Barmoq izidan foydalanish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Telefon qulfini ochish, xaridlarni amalga oshirish yoki ilovalarga kirish uchun shunchaki barmoq izi skaneriga tegining. Telefoningizga kiritilgan har qanday barmoq izi yordamida bularni bajarish mumkin. Shuning uchun undan ehtiyot boʻlib foydalaning."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Barmoq izingiz himoya darajasi grafik kalit yoki PIN kod kabi mustahkam emas."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Boshqaruv oʻz qoʻlingizda"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Yodda tuting"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Barmoq izi bilan ochish funksiyasi tomonidan yozib olingan axborot xavfsiz va faqat telefonda saqlanadi. Axborotni istalgan vaqtda Sozlamalar orqali oʻchirib tashlash mumkin."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Barmoq izingiz himoya darajasi grafik kalit yoki PIN kod kabi mustahkam emas."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Barmoq izi bilan ochish funksiyasi orqali olingan oxirgi rasmlar vaqti-vaqti bilan barmoq izi modellarini yaxshilash maqsadida ishlatadi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Telefonni qulfdan chiqarish yoki xaridlarni tasdiqlash uchun barmoq izingizdan foydalaning.\n\nEslatma: barmoq izi orqali bu qurilmani qulfdan chiqara olmaysiz. Batafsil axborot olish uchun tashkilot administratori bilan bog‘laning."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Telefonni qulfdan chiqarish yoki xaridlarni tasdiqlash uchun barmoq izingizdan foydalaning.\n\nEslatma: Barmoq izining himoya darajasi grafik kalit yoki PIN kodnikidek emas."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Bekor qilish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Kerak emas"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Tashlab ketish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Davom etish"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Roziman"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Tashlab ketish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Keyingisi"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Barmoq izi sozlanmasinmi?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Tashlab ketish"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Bekor qilish"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Sensorga tegining"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Barmoq izi belgisini bosib turing"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Sensor telefonning orqasida joylashgan. Ko‘rsatkich barmog‘ingizdan foydalaning."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Sensor ekranda. Atrofi yorqin barmoq izi doirasini toping."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Barmoq izi sensori ekraningizda joylashgan. Uni topish uchun barmoqni ekran boʻylab suring."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ushbu rasmda barmoq izi skaneri qayerda joylashgani ko‘rsatilgan"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Nomi"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"O‘chirish"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Sensorga tegining"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Barmoqni skanerga tekkizib, tebranishni his qilguncha bosib turing"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Bir necha marta tekkizing"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Barmoq izingizni butunlay skanerlash uchun uni biroz suring"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Barmoq izi qo‘shildi"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Agar shu belgi ko‘rinsa, identifikatsiya yoki xaridlarni tasdiqlash uchun barmoq izingizdan foydalaning"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Keyinroq bajarish"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Qidiruv"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ekran"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Ekranning avtomatik burilishi"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Oʻchirish"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Yoqish"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Yoqish - Yuz asosida"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Yuzni tanishni yoqish"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Ranglar"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Tabiiy"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Yorqin"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Yoniq / Ekranga qarab turganingizda u yoniq holatda qoladi"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Yoqilmagan"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Kamera ruxsati zarur"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Qurilmani moslashtirish xizmatlari uchun zarur ruxsatlarni bering"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Ekranga qarab turganingizda u yoniq holatda qoladi"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Moslashuvchan kutish rejimi kimdir old kameraga qaraganini aniqlashda ishlatiladi U faqat qurilmada ishlatiladi va rasmlar hech qachon Google serverlariga yuborilmaydi."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Moslashuvchan kutish rejimini yoqish"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Yangi bildirishnomalar kelganda ekran yonadi"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Vaqt va axborot doim chiqsin"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Batareya sarfi oshadi"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Qalin matn"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Qalin matn"</string>
     <string name="title_font_size" msgid="570613010306330622">"Shrift o‘lchami"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Matnni kattalashtirish yoki kichiklashtirish"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM karta qulfi sozlamalari"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Boshqa foydalanuvchilar"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Qurilma xotirasi"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Tashqi xotira"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Signal va eslatmalar"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Signal va eslatmalar belgilashga ruxsat berish"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Signal va eslatmalar"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Bu ilovaga signallarni va boshqa vaqtga asoslangan tadbirlarni rejalashtirishga ruxsat berish. Qurilmadan foydalanmasangiz ham ilova uyqu rejimidan chiqadi va ishga tushadi. Bu ruxsatni bekor qilsangiz, ilova ishlamaydi va u oʻrnatgan barcha signallar oʻchiriladi."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"reja, signal, eslatma, tadbir"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> ishlatilgan, jami: <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Jami: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Joylashuv axboroti xizmatlari"</string>
     <string name="location_title" msgid="5819154746934945021">"Mening joylashuvim"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Ish profili uchun geolokatsiya"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Ilovalar uchun joylashuv ruxsati"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Joylashuv xizmati yoqilmagan"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>/<xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ta ilova joylashuvdan foydalanmoqda</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g>/<xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> ta ilova joylashuvdan foydalanmoqda</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Oxirgi joylashuv axboroti"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Tafsilotlar"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Yaqin-orada hech qanday ilova joylashuv axborotini talab qilmadi"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Hech qanday ilova yaqinda joylashuv axborotidan foydalanmagan"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Yuqori batareya sarfi"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Batareya sarfi kam"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi va Bluetooth qidirish"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi tarmoqlarni qidirish"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Wi-Fi yoniq emasligida ham ilovalar va xizmatlarga Wi-Fi tarmoqlarni qidirish uchun ruxsat. Shunda joylashuv axborotiga asoslangan funksiya va xizmatlarning ishlashi yanada yaxshilanadi."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth qurilmalarni qidirish"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth yoniq emasligida ham ilovalar va xizmatlarga yaqin-atrofdagi qurilmalarni qidirish uchun ruxsat. Shunda joylashuv axborotiga asoslangan funksiya va xizmatlarning ishlashi yanada yaxshilanadi."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Joylashuvni aniqlash xizmati"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Ish uchun joylashuv xizmatlari"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Vaqt mintaqasini joylashuv asosida aniqlash"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Vaqt mintaqasini joylashuv asosida aniqlash"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Vaqt mintaqasini qurilma joylashuvi yordamida avtomatik aniqlashga ruxsat beradi. Wi‑Fi tarmoqni skanerlash kabi boshqa joylashuv sozlamalari vaqt mintaqasini aniqlash sifatiga taʼsir qiladi."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Yoniq"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Yoqilmagan"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Vaqt mintaqasini avtomatik aniqlash yoqilmagan"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Avtomatik vaqt mintaqasi yoqilmagan"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Vaqt mintaqasini joylashuv asosida aniqlash yoqilmagan"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Vaqt mintaqasini joylashuv asosida aniqlash imkonsiz"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Vaqt mintaqasini joylashuv asosida aniqlash mumkin emas"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Yoqish"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Xotirani tozalash"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Yangilanishlarni o‘chirish"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Ushbu ilovaning ba’zi andoza harakatlarini tanladingiz."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Tanlangan ayrim harakatlar bu ilovada standart ochiladi"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Ushbu ilova vidjetlar yaratish va ularning ma‘lumotlariga kirishiga ruxsat berishni tanladingiz."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Birlamchi sozlamalar belgilanmagan."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Birlamchilarni tozalash"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Birlamchi parametrlarni tozalash"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Ushbu ilova siznikidaqa ekranlar uchun mos qilib chiqarilmagan. Ekraningiz moslamalarini mana bu yerda o‘zgartirishingiz mumkin."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Ishga tushirilganda so‘rash"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Hajm ilovasi"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Qurilmangizdan qulay foydalanish uchun maxsus imkoniyatlardan foydalaning. Bu parametrlarni keyinroq sozlamalar orqali o‘zgartirish mumkin."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Shrift o‘lchamini o‘zgartiring"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Ekrandan o‘qish vositalari"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Audio va ekrandagi matn"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Taglavhalar"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Audio"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Umumiy"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Ekran"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Matn va displey"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Ekranni xiralashtirish"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Qizil va yashil"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Qizil va yashil"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Koʻk va sariq"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Yorqinlikni pasaytirish"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Yorqinlikni pasaytirish"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Telefon ekranidagi minimal yorqinlikni yanada xiralashtirish"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Planshet ekranidagi minimal yorqinlikni yanada xiralashtirish"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Qulayroq oʻqish uchun ekranni xiralashtiring.&lt;br&gt;&lt;br&gt;Qachon foydali:&lt;ol&gt;&lt;li&gt;Telefondagi standart minimal yorqinlik juda baland&lt;/li&gt;&lt;li&gt;Telefon tunda va uxlashdan oldin kabi qorongʻi muhitda ishlatilganda&lt;/li&gt;&lt;/ol&gt;"</string>
@@ -3101,8 +3122,8 @@
     <string name="user_delete_user_description" msgid="7764153465503821011">"Foydalanuvchini o‘chirib tashlash"</string>
     <string name="user_delete_button" msgid="3833498650182594653">"O‘chirib tashlash"</string>
     <string name="user_guest" msgid="4545590092001460388">"Mehmon"</string>
-    <string name="user_exit_guest_title" msgid="2653103120908427236">"Mehmon hisobini o‘chirish"</string>
-    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Mehmon hisobi o‘chirib tashlansinmi?"</string>
+    <string name="user_exit_guest_title" msgid="2653103120908427236">"Mehmonni olib tashlash"</string>
+    <string name="user_exit_guest_confirm_title" msgid="1284823459630164754">"Mehmon olib tashlansinmi?"</string>
     <string name="user_exit_guest_confirm_message" msgid="8995296853928816554">"Ushbu seansdagi barcha ilovalar va ma’lumotlar o‘chirib tashlanadi."</string>
     <string name="user_exit_guest_dialog_remove" msgid="7067727314172605181">"Olib tashlash"</string>
     <string name="user_enable_calling" msgid="264875360626905535">"Telefon chaqiruvlari"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"yuz"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"barmoq izi, barmoq izi kiritish"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"xira ekran, sensorli ekran, batareya, smart yorqinlik, dinamik yorqinlik, avtomatik yorqinlik"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"ekranni xiralashtirish, uyqu, batareya, ekranning kutish vaqti, qurilmadan foydalanish, monitor, ekran, harakatsizlik"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"burish, aylantirish, burilish, tik, yoqish, holat, portret, peyzaj"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"yangilash, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"bezovta qilinmasin, jadval, bildirishnomalar, bloklash, ovozsiz rejim, tebranish, uyqu, ish, konsentratsiya, tovush, kun, ish kuni, dam olish kuni, ish kuni kechasi, tadbir"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"ekran, qulflash vaqti, kutish vaqti, ekran qulfi"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Ringtonlar"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Boshqa tovush va tebranishlar"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Bildirishnomalar"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Suhbat"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Yaqinda yuborilgan"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Hammasi (oxirgi 7 kun)"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Kengaytirilgan sozlamalar"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Umumiy"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Ishga oid bildirishnomalar"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Moslashuvchan bildirishnomalar"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Moslashuvchan bildirishnomalar muhimligi"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Bildirishnomalar paneli, holat qatori va ekran qulfida chiqarish"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Holat qatorida ovozsiz bildirishnomalarni tozalash"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Indikator"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Ekran qulfida bildirishnomalar"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Maxfiylik"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Ekran qulfini tashlab ketish"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Yuz bilan ochilgandan keyin oxirgi ishlatilgan ekran ochilsin"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Ekran qulfi, qulflash, tashlab ketish, aylanib oʻtish"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> ta bildirishnoma (haftasiga)</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Hech qachon"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Bildirishnomalarga kirish"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Qurilma va ilova bildirishnomalari"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Ilova va qurilmalarda chiqadigan bildirishnomalarni boshqarish"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Ish profili bildirishnomalariga kirish taqiqlangan"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Ilovalar bildirishnomalarni ko‘ra olmaydi"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Faolsizlantirish"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Bekor qilish"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Ruxsat etilgan bildirishnoma turlari"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Muhim davomiy bildirishnomalar"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Suhbat bildirishnomalari"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Ogohlantirishlar"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Sokin bildirishnomalar"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Real vaqt"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Ilovalardagi real vaqt aloqa vositalari yoniq, navigatsiya, telefon chaqiruvlari va hokazo"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Suhbatlar"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS va boshqa aloqa vositalari"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Asosiy"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Sozlamalar asosida jiringlaydigan yoki tebranadigan bildirishnomalar"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Sokin"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Hech qachon jiringlamaydigan yoki tebranmaydigan bildirishnomalar"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Barcha ilovalar"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Bildirishnoma yubora oladigan ilovalar uchun bildirishnoma sozlamalarini alohida oʻzgartirish"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Qurilmada chiqadigan ilovalar"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Yordamchi VR xizmatlar"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Hech qanday ilova yordamchi VR xizmatlar sifatida ishga tushirilishiga ruxsat so‘ramagan."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"VR xizmatiga “<xliff:g id="SERVICE">%1$s</xliff:g>” xizmatidan foydalanishga ruxsat berilsinmi?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Birlamchi sifatida ochish"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Havolalarni ochish"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Mos havolalarni ochish"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Bu ilovada ochiladigan mos havolalar"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Bu ilovada ochiladigan havolalar"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Avtomatik ochilsin"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Mos havolalar"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Boshqa birlamchi sozlamalar"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Boshqa birlamchi parametrlar"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Havola kiritish"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Ilovada havolalarning avtomatik ochilishini tasdiqlaydigan ilova. "<annotation id="url">"Batafsil"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ta tasdiqlangan havola</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ta tasdiqlangan havola</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Bu havolalar tasdiqlangan va bu ilovada avtomatik ochiladi.</item>
+      <item quantity="one">Bu havola tasdiqlangan va bu ilovada avtomatik ochiladi.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Boshqa mos havolalar tekshirilmoqda…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Bekor qilish"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ta mos havola</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ta mos havola</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Kiritish"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"<xliff:g id="APP_LABEL">%s</xliff:g> ilovasida ochiladi"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> – <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"ichki xotira"</string>
     <string name="storage_type_external" msgid="125078274000280821">"tashqi xotira"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Kameraga ruxsat berilmagan"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Skrinshot olishga ruxsat berilmagan"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Bu ilovani ochish imkonsiz"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Savollaringizga javob olish uchun AT administratoringizga murojaat qiling"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Qo‘shimcha tafsilotlar"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Administratoringiz ishchi profilingiz bilan bog‘liq ilova va ma’lumotlarni, jumladan, sozlamalar, ruxsatnomalar, korporativ kirish huquqi, tarmoqdagi faollik va qurilmaning joylashuvi haqidagi ma’lumotlarni kuzatishi va boshqarishi mumkin."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Administratoringiz bu foydalanuvchi bilan bog‘liq ilova va ma’lumotlarni, jumladan, sozlamalar, ruxsatnomalar, korporativ kirish huquqi, tarmoqdagi faollik va qurilmaning joylashuvi haqidagi ma’lumotlarni kuzatishi va boshqarishi mumkin."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 ta cheklov</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Aloqa operatorining hisob-kitobi qurilmanikidan farq qilishi mumkin"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Mobil tarmoq trafik sarfidan boshqa"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Mobil tarmoq trafigi faolsizlantirildi"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> sarflandi"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Trafik sarfiga oid ogohlantirish"</string>
     <string name="data_warning" msgid="2925054658166062884">"Ogohlantirish"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(<xliff:g id="USER">%s</xliff:g> uchun o‘chirilgan)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(<xliff:g id="USER">%s</xliff:g> uchun o‘chirib qo‘yilgan)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Avtomatik kiritish"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"avtomatik, to‘ldirish, avtomatik to‘ldirish"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Parollar"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"avto, toʻldirish, avtotoʻldirish, parol"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Bu ilova ishonchli ekanini tekshiring&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ekraningizda nimani avtomatik to‘ldirish kerakligini aniqlaydi."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Avtomatik kiritish"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Jurnal yuritish darajasi"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Tarmoq rejimini almashtiring"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Tarmoq turi"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Aloqa operatori"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Sozlamalar versiyasi"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Operator sozlamalari versiyasi"</string>
     <string name="call_category" msgid="641461844504128789">"Chaqiruvlar"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Operator orqali videomuloqot"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Tizimni tanlang"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM kartani chiqarib olib, qaytadan soling. Agar muammo davom etsa, qurilmangizni qayta ishga tushiring."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM kartani qaytadan yoqing. Agar muammo davom etsa, qurilmangizni qayta ishga tushiring."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Tarmoqni faollashtirish"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Aloqa operatorlarini oʻzaro almashtirish"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> faol"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM karta sozlamalarini yangilash uchun bosing"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Bunga almashdi: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Oʻchiq"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM kartalar"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Parvoz rejimi tarmoqlarini ochish"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Parvoz rejimidagi tarmoqlarni topish va ulaning."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Wi-Fi tarmoqlarni topish va ularga ulanish"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"samolyot, samolyot uchun xavfsiz"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Chaqiruvlar va SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi chaqiruv"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"mavjud emas"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Vaqtinchalik mavjud emas"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM kartasiz"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Sozlamalar"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Tarmoq parametrlari"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Ochiq tarmoqlarga ulanish"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"tarmoq aloqasi, internet, simsiz, aloqa, wifi, wi-fi, wi fi, mobil, mobile, mobil tarmoq operatori, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Parvoz rejimi tarmoqlarini ochish"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Parvoz rejimidagi tarmoqlar"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Tarmoqlarni yoqish"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Tarmoqlarni faolsizlantirish"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Internet qayta tiklansinmi?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Bunda telefon chaqiruvingiz tugatiladi"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Bunda telefon chaqiruvingiz tugatiladi"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Internet qayta tiklanmoqda…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Aloqani tiklash"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Parvoz rejimi tarmoqlari mavjud"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Boshqa tarmoqqa almashish uchun Ethernet tarmogʻini uzing"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ulangan tarmoqlarni almashtirish imkonsiz"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Parvoz rejimi tarmoqlari"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ulandi"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Internet avtomatik ravishda ulanmaydi"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Rang"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Boshqalar"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Umumiy"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Barcha ilovalar"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Smart uzatish"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Smart uzatish yoniq"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Telefon raqamini kiriting"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Telefon raqami kiritilmagan."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"OK"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"2G tarmoqqa ruxsat bering"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"2G mobil internetidan foydalaning. Favqulodda chaqiruvlar uchun 2G doim yoniq turadi."</string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 31e4179..ad319ac 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -258,8 +258,8 @@
     <item msgid="4760681822601767255">"máy ảnh"</item>
     <item msgid="2172823594140104317">"ghi âm"</item>
     <item msgid="5612873260709742213">"phát âm thanh"</item>
-    <item msgid="2027206403725749996">"đọc khay nhớ tạm"</item>
-    <item msgid="5643742956725663156">"sửa đổi khay nhớ tạm"</item>
+    <item msgid="2027206403725749996">"đọc bảng nhớ tạm"</item>
+    <item msgid="5643742956725663156">"sửa đổi bảng nhớ tạm"</item>
     <item msgid="7362845549479684378">"các nút phương tiện truyền thông"</item>
     <item msgid="3843484466100107397">"tập trung âm thanh"</item>
     <item msgid="617344340943430125">"âm lượng chính"</item>
@@ -325,8 +325,8 @@
     <item msgid="3180676986290096851">"Máy ảnh"</item>
     <item msgid="9174072114281872917">"Ghi âm"</item>
     <item msgid="1444183972646890539">"Phát âm thanh"</item>
-    <item msgid="4337542044275236638">"Đọc khay nhớ tạm"</item>
-    <item msgid="2681224211796661809">"Sửa đổi khay nhớ tạm"</item>
+    <item msgid="4337542044275236638">"Đọc bảng nhớ tạm"</item>
+    <item msgid="2681224211796661809">"Sửa đổi bảng nhớ tạm"</item>
     <item msgid="4479361062226474111">"Các nút phương tiện"</item>
     <item msgid="5651140069431283570">"Tập trung âm thanh"</item>
     <item msgid="745291221457314879">"Âm lượng chính"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a6f5420..ef54ede 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Thu nhỏ hoặc phóng to văn bản trên màn hình."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Thu nhỏ"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Phóng to"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Dùng tính năng Tự động xoay"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Văn bản mẫu"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"Phù thủy xứ Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="one">Đã thiết lập <xliff:g id="COUNT_0">%1$d</xliff:g> vân tay</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Mở khóa bằng vân tay"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Thiết lập vân tay"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Sử dụng vân tay của bạn"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Chỉ cần chạm vào cảm biến vân tay để mở khóa điện thoại của bạn, ủy quyền mua hàng hoặc đăng nhập vào ứng dụng. Hãy cẩn trọng khi thêm vân tay. Ngay cả một vân tay bạn thêm cũng có thể dùng để thực hiện bất kỳ việc nào trong số này."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Vân tay có thể kém an toàn hơn mã PIN hoặc hình mở khóa có độ bảo mật mạnh."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Bạn nắm quyền kiểm soát"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Lưu ý"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Dữ liệu do vân tay ghi lại được lưu trữ an toàn và chỉ có trên chiếc điện thoại của bạn. Bạn có thể xóa dữ liệu của mình bất cứ lúc nào trong phần Cài đặt."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Vân tay có thể kém an toàn hơn mã PIN hoặc hình mở khóa có độ bảo mật mạnh."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Đôi khi, điện thoại sẽ dùng hình ảnh vân tay gần đây để tạo mẫu vân tay có chất lượng cao hơn."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Dùng vân tay để mở khóa điện thoại hoặc phê duyệt các giao dịch mua.\n\nLưu ý: Bạn không thể sử dụng vân tay để mở khóa thiết bị này. Để biết thêm thông tin, hãy liên hệ với quản trị viên của tổ chức bạn."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Dùng vân tay để mở khóa điện thoại hoặc phê duyệt các giao dịch mua.\n\nLưu ý: Vân tay có thể kém an toàn hơn hình mở khóa hoặc mã PIN mạnh."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Hủy"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Không, cảm ơn"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Bỏ qua"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Tiếp tục"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Đồng ý"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Bỏ qua"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Tiếp theo"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Bạn muốn bỏ qua vân tay?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Bỏ qua"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Hủy"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Chạm vào cảm biến"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Chạm và giữ biểu tượng vân tay"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Cảm biến nằm ở mặt sau của điện thoại. Hãy dùng ngón tay trỏ của bạn."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Vị trí đăng ký vân tay sẽ hiển thị trên màn hình. Hãy tìm vân tay có vòng tròn phát sáng."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Cảm biến vân tay ở trên màn hình. Hãy di chuyển ngón tay trên màn hình để tìm cảm biến."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Hình minh họa với vị trí cảm biến vân tay và thiết bị"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Tên"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"OK"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Xóa"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Chạm vào cảm biến"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Đặt ngón tay lên cảm biến và nhấc lên sau khi cảm thấy rung"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Nhấc ngón tay lên rồi chạm lại"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Chạm liên tục trên cảm biến để thêm các phần khác của ngón tay"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Đã thêm vân tay"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Khi bạn nhìn thấy biểu tượng này, hãy sử dụng vân tay của mình để nhận dạng hoặc phê duyệt hoạt động mua hàng"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Thực hiện sau"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Tìm kiếm"</string>
     <string name="display_settings" msgid="7197750639709493852">"Hiển thị"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Tự động xoay màn hình"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Đang tắt"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Đang bật"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Đang bật – Dựa trên khuôn mặt"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Bật tính năng Phát hiện khuôn mặt"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Màu"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Tự nhiên"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"Tăng độ nét"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Bật / Màn hình sẽ không tắt nếu bạn đang nhìn vào màn hình"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Tắt"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Cần quyền truy cập vào máy ảnh"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Nhấn để quản lý các quyền cho Dịch vụ cá nhân hóa thiết bị"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Ngăn không cho màn hình tắt khi bạn đang nhìn vào đó"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Tính năng chú ý đến màn hình sử dụng máy ảnh trước để xem liệu có ai đang nhìn vào màn hình hay không. Tính năng này hoạt động trên thiết bị nên sẽ không bao giờ lưu trữ hoặc gửi hình ảnh cho Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Bật tính năng chú ý đến màn hình"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Khi có thông báo mới, màn hình tối sẽ bật sáng"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Luôn hiển thị giờ và thông tin"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Làm tăng mức sử dụng pin"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Văn bản in đậm"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Văn bản in đậm"</string>
     <string name="title_font_size" msgid="570613010306330622">"Kích thước phông chữ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Phóng to hoặc thu nhỏ văn bản"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Cài đặt khóa thẻ SIM"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Người dùng khác"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Bộ nhớ của thiết bị"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Bộ nhớ di động"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Chuông báo và lời nhắc"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Cho phép đặt chuông báo hoặc lời nhắc"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Chuông báo và lời nhắc"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Cho phép ứng dụng này lên lịch chuông báo hoặc các sự kiện khác theo thời gian. Nhờ vậy, ứng dụng có thể bật và chạy ngay cả khi bạn không dùng thiết bị. Xin lưu ý rằng việc thu hồi quyền này có thể khiến ứng dụng hoạt động không bình thường, cụ thể là mọi chuông báo mà ứng dụng đã lên lịch sẽ không hoạt động nữa."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"lịch biểu, chuông báo, lời nhắc, sự kiện"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"Đã sử dụng <xliff:g id="USED">%1$s</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Đã dùng trong tổng số <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Dịch vụ vị trí"</string>
     <string name="location_title" msgid="5819154746934945021">"Vị trí của tôi"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Vị trí của hồ sơ công việc"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Quyền truy cập của ứng dụng vào vị trí"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Vị trí đang tắt"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g>/<xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ứng dụng có quyền truy cập vào vị trí</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g>/<xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> ứng dụng có quyền truy cập vào vị trí</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Quyền truy cập vị trí gần đây"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Xem chi tiết"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Không có ứng dụng nào gần đây yêu cầu vị trí"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Gần đây, không có ứng dụng nào truy cập vào vị trí"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Mức sử dụng pin cao"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Mức sử dụng pin thấp"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Quét tìm Wi‑Fi và Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Quét tìm Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Cho phép các ứng dụng và dịch vụ quét tìm mạng Wi‑Fi bất kỳ lúc nào, ngay cả khi Wi-Fi tắt. Bạn có thể sử dụng tùy chọn cài đặt này để cải thiện các tính năng và dịch vụ dựa trên vị trí."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Quét tìm Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Cho phép các ứng dụng và dịch vụ quét tìm thiết bị lân cận bất kỳ lúc nào, ngay cả khi Bluetooth đang tắt. Chẳng hạn như bạn có thể sử dụng tùy chọn cài đặt này để cải thiện các tính năng và dịch vụ dựa trên vị trí."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Dịch vụ vị trí"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Dịch vụ vị trí cho công việc"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Phát hiện múi giờ theo vị trí"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Phát hiện múi giờ theo vị trí"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Cho phép sử dụng thông tin vị trí của thiết bị để phát hiện múi giờ hiện tại. Các tùy chọn cài đặt vị trí khác như quét tìm Wi-Fi có thể ảnh hưởng đến độ chính xác của tùy chọn phát hiện múi giờ."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Đang bật"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Đang tắt"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Tùy chọn Tự động phát hiện múi giờ bị tắt"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Tính năng Tự động phát hiện múi giờ đang tắt"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Tùy chọn Phát hiện múi giờ theo vị trí bị tắt"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Tùy chọn Phát hiện múi giờ theo vị trí không được hỗ trợ"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Không được phép thay đổi tùy chọn Phát hiện múi giờ theo vị trí"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Bật"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Xóa bộ nhớ"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Gỡ cài đặt bản cập nhật"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Bạn đã chọn chạy ứng dụng này theo mặc định cho một số tác vụ."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Theo mặc định, một số hoạt động mà bạn đã chọn sẽ mở trong ứng dụng này."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Bạn đã chọn cho phép ứng dụng này tạo các tiện ích và truy cập dữ liệu của chúng."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Chưa đặt mặc định."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Xóa mặc định"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Xóa các tùy chọn mặc định"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Có thể ứng dụng này không được thiết kế cho màn hình của bạn. Bạn có thể kiểm soát cách ứng dụng điều chỉnh phù hợp với màn hình của mình tại đây."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Hỏi khi chạy"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Chia tỷ lệ ứng dụng"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Bạn có thể tùy chỉnh thiết bị này cho phù hợp với nhu cầu của mình. Bạn có thể thay đổi các tính năng hỗ trợ tiếp cận này trong phần Cài đặt."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Thay đổi cỡ chữ"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Trình đọc màn hình"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Âm thanh và văn bản trên màn hình"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Phụ đề"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Âm thanh"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Chung"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Hiển thị"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Văn bản và hiển thị"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Giảm bớt độ sáng màn hình"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Đỏ – xanh lục"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Đỏ – xanh lục"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Xanh lam – vàng"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Giảm độ sáng"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Giảm độ sáng"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Giảm bớt độ sáng của màn hình xuống dưới mức sáng tối thiểu của điện thoại"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Giảm bớt độ sáng của màn hình xuống dưới mức sáng tối thiểu của máy tính bảng"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Giảm bớt độ sáng màn hình để đọc thoải mái hơn.&lt;br/&gt;&lt;br/&gt; Chế độ cài đặt này có thể hữu ích khi: &lt;ol&gt; &lt;li&gt; Độ sáng tối thiểu mặc định của điện thoại vẫn ở mức quá cao&lt;/li&gt; &lt;li&gt; Bạn đang dùng điện thoại trong điều kiện thiếu ánh sáng, chẳng hạn như khi trời tối hoặc trong phòng tối trước khi đi ngủ&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -2723,7 +2744,7 @@
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
     <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Kết nối thích ứng"</string>
     <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Tăng thời lượng pin và cải thiện hiệu suất thiết bị bằng cách tự động quản lý các kết nối mạng"</string>
-    <string name="credentials_title" msgid="7535942196886123656">"Lưu thông tin xác thực"</string>
+    <string name="credentials_title" msgid="7535942196886123656">"Vùng lưu trữ thông tin xác thực"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Cài đặt chứng chỉ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Cài đặt chứng chỉ từ bộ nhớ"</string>
     <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"Cài đặt chứng chỉ từ thẻ SD"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"khuôn mặt"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"vân tay số, thêm vân tay số"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"giảm độ sáng màn hình, màn hình cảm ứng, pin, độ sáng thông minh, độ sáng động, Độ sáng tự động"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"màn hình mờ, ngủ, pin, hết thời gian, chú ý, hiển thị, màn hình, không hoạt động"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"xoay vòng, lật, xoay, dọc, ngang, hướng, chiều dọc, chiều ngang"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"nâng cấp, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"dnd, không làm phiền, lịch biểu, thông báo, chặn, im lặng, rung, ngủ, làm việc, tập trung, âm thanh, tắt tiếng, ngày, ngày trong tuần, ngày cuối tuần, đêm trong tuần, sự kiện"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"màn hình, thời gian khóa, thời gian chờ, màn hình khóa"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Nhạc chuông"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Âm thanh khác và rung"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Thông báo"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Cuộc trò chuyện"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Đã gửi gần đây"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Xem tất cả ứng dụng trong 7 ngày qua"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Nâng cao"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Chung"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Thông báo công việc"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Thông báo thích ứng"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Mức độ ưu tiên của thông báo thích ứng"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Hiển thị trong ngăn kéo xuống, thanh trạng thái và trên màn hình khóa"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Ẩn các thông báo im lặng trong thanh trạng thái"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Nhấp nháy đèn"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Thông báo trên màn hình khóa"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Quyền riêng tư"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Bỏ qua màn hình khóa"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Sau khi mở khóa bằng khuôn mặt, chuyển thẳng tới màn hình dùng gần đây nhất"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Khóa màn hình, Màn hình khóa, Bỏ qua"</string>
@@ -3638,7 +3662,7 @@
     <string name="allow_interruption" msgid="5237201780159482716">"Cho phép gián đoạn"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"Cho phép ứng dụng phát ra âm thanh, rung và/hoặc hiển thị thông báo trên màn hình"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"Ưu tiên"</string>
-    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Hiển thị cuộc trò chuyện ở đầu phần cuộc trò chuyện và dưới dạng bong bóng nổi, hiển thị ảnh hồ sơ trên màn hình khóa"</string>
+    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"Hiển thị ở đầu phần cuộc trò chuyện, dưới dạng bong bóng nổi và hiển thị ảnh hồ sơ trên màn hình khóa"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"<xliff:g id="APP_NAME">%1$s</xliff:g> không hỗ trợ hầu hết các tính năng trò chuyện. Bạn không thể đặt một cuộc trò chuyện là ưu tiên. Các cuộc trò chuyện sẽ không xuất hiện dưới dạng bong bóng nổi."</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"Thu gọn thông báo thành một dòng trong danh sách kéo xuống"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"Không phát âm thanh hoặc rung"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">~<xliff:g id="NUMBER_0">%d</xliff:g> thông báo mỗi tuần</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Không bao giờ"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Truy cập thông báo"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Thông báo về thiết bị và ứng dụng"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Kiểm soát các thông báo sẽ hiển thị trên ứng dụng và thiết bị của bạn"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Quyền truy cập vào thông báo hồ sơ công việc bị chặn"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Ứng dụng không thể đọc thông báo"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Tắt"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Hủy"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Các loại thông báo được phép"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Thông báo liên tục quan trọng"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Thông báo về cuộc trò chuyện"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Thông báo cảnh báo"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Thông báo im lặng"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Thời gian thực"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Phương thức liên lạc theo thời gian thực từ các ứng dụng đang dùng, cách di chuyển, cuộc gọi điện thoại và nhiều phương thức khác"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Cuộc trò chuyện"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"SMS và các phương thức liên lạc khác"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Mặc định"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Thông báo có thể đổ chuông hoặc rung tùy theo chế độ cài đặt"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Im lặng"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Thông báo không phát ra âm thanh hoặc rung"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Xem tất cả các ứng dụng"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Thay đổi chế độ cài đặt thông báo cho từng ứng dụng có thể gửi thông báo"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Ứng dụng hiển thị trên thiết bị"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Các dịch vụ của trình trợ giúp thực tế ảo"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Không có ứng dụng đã cài đặt nào yêu cầu được chạy dưới dạng dịch vụ trình trợ giúp VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Cho phép quyền truy cập dịch vụ VR đối với <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Mở theo mặc định"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Mở đường liên kết"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Mở các liên kết được hỗ trợ"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Các đường liên kết được hỗ trợ sẽ mở trong ứng dụng này"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Các đường liên kết để mở trong ứng dụng này"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Mở không cần hỏi"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Các liên kết được hỗ trợ"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Cài đặt mặc định khác"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Các tùy chọn mặc định khác"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Thêm đường liên kết"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"Một ứng dụng có thể xác minh các đường liên kết để tự động mở trong ứng dụng này. "<annotation id="url">"Tìm hiểu thêm"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> đường liên kết đã xác minh</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> đường liên kết đã xác minh</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">Các đường liên kết này đã được xác minh và sẽ tự động mở trong ứng dụng này.</item>
+      <item quantity="one">Đường liên kết này đã được xác minh và sẽ tự động mở trong ứng dụng này.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"OK"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Đang kiểm tra các đường liên kết được hỗ trợ khác…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Hủy"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> đường liên kết được hỗ trợ</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> đường liên kết được hỗ trợ</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Thêm"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Mở trong <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"Đã dùng <xliff:g id="SIZE">%1$s</xliff:g> trong <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"bộ nhớ trong"</string>
     <string name="storage_type_external" msgid="125078274000280821">"bộ nhớ ngoài"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Không cho phép máy ảnh"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Không cho phép ảnh chụp màn hình"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Không thể mở ứng dụng này"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Nếu bạn có câu hỏi, hãy liên hệ với quản trị viên CNTT của bạn"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Thông tin chi tiết khác"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Quản trị viên của bạn có thể giám sát và quản lý các ứng dụng cũng như dữ liệu được liên kết với hồ sơ công việc của bạn, bao gồm cài đặt, quyền, quyền truy cập vào dữ liệu công ty, hoạt động mạng và thông tin vị trí của thiết bị."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Quản trị viên của bạn có thể giám sát và quản lý các ứng dụng cũng như dữ liệu được liên kết với người dùng này, bao gồm cài đặt, quyền, quyền truy cập vào dữ liệu công ty, hoạt động mạng và thông tin vị trí của thiết bị."</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 hạn chế</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Cách tính dữ liệu của nhà mạng có thể khác với thiết bị của bạn."</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ngoại trừ dữ liệu được dùng trong mạng của nhà mạng"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Loại trừ dữ liệu được dùng trong mạng của nhà mạng"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Đã sử dụng <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Đặt cảnh báo dữ liệu"</string>
     <string name="data_warning" msgid="2925054658166062884">"Cảnh báo dữ liệu"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(gỡ cài đặt cho người dùng <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(đã tắt cho người dùng <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Dịch vụ tự động điền"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"tự động, điền, tự động điền"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Mật khẩu"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"tự động, điền, tự động điền, mật khẩu"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Hãy đảm bảo bạn tin tưởng ứng dụng này&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; sử dụng thông tin trên màn hình để xác định nội dung nào có thể được tự động điền."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Tự động điền"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Mức ghi nhật ký"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Thay đổi chế độ hoạt động của mạng"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Loại mạng ưa thích"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Nhà mạng"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Phiên bản cài đặt"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Phiên bản cài đặt nhà mạng"</string>
     <string name="call_category" msgid="641461844504128789">"Gọi điện"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Tính năng gọi video của nhà mạng"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Chọn hệ thống"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Hãy tháo SIM rồi lắp lại. Nếu vấn đề vẫn xảy ra, vui lòng khởi động lại thiết bị."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Hãy thử bật lại SIM. Nếu vấn đề vẫn xảy ra, vui lòng khởi động lại thiết bị."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Kích hoạt mạng"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Chuyển nhà mạng"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> đang hoạt động"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Nhấn để cập nhật tùy chọn cài đặt SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Đã chuyển sang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -4958,7 +5007,7 @@
     <string name="switch_sim_dialog_no_switch_title" msgid="809763410787744247">"Không có SIM nào đang hoạt động"</string>
     <string name="switch_sim_dialog_no_switch_text" msgid="7053939850026876088">"Để sử dụng dữ liệu di động, các tính năng gọi điện và SMS vào lúc khác, hãy chuyển đến phần cài đặt mạng của bạn"</string>
     <string name="sim_card_label" msgid="5632157635124050923">"Thẻ SIM"</string>
-    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Xóa SIM đã tải xuống này?"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Xóa SIM đã tải xuống?"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"Khi bạn xóa SIM, dịch vụ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> sẽ bị xóa khỏi thiết bị này.\n\nDịch vụ của <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> sẽ không bị hủy."</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Xóa"</string>
     <string name="erasing_sim" msgid="7877703231075699139">"Đang xóa SIM…"</string>
@@ -4999,7 +5048,7 @@
     <string name="low_storage_summary" msgid="1979492757417779718">"Sắp hết bộ nhớ. Đã 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>
     <string name="contextual_card_feedback_send" msgid="7409408664417908922">"Gửi phản hồi"</string>
     <string name="contextual_card_feedback_confirm_message" msgid="3186334562157665381">"Bạn có muốn cung cấp phản hồi về nội dung đề xuất này cho chúng tôi không?"</string>
-    <string name="copyable_slice_toast" msgid="1008251852798990606">"Đã sao chép <xliff:g id="COPY_CONTENT">%1$s</xliff:g>vào khay nhớ tạm."</string>
+    <string name="copyable_slice_toast" msgid="1008251852798990606">"Đã sao chép <xliff:g id="COPY_CONTENT">%1$s</xliff:g>vào bảng nhớ tạm."</string>
     <string name="search_bar_account_avatar_content_description" msgid="880523277036898350"></string>
     <string name="permission_bar_chart_empty_text" msgid="4856719891991325077">"0 ứng dụng đã sử dụng quyền"</string>
     <string name="permission_bar_chart_title" msgid="2493212904955611441">"Mức sử dụng quyền truy cập trong 24 giờ qua"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Đang tắt"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Hiển thị các mạng ở chế độ trên máy bay"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Tìm và kết nối với các mạng ở chế độ trên máy bay."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Tìm và kết nối với mạng Wi-Fi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"máy bay, an toàn trên máy bay"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Cuộc gọi và tin nhắn SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Gọi qua Wi-Fi"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"không có sẵn"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Tạm thời không sử dụng được"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Không có SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Lựa chọn ưu tiên"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Lựa chọn ưu tiên về mạng"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Kết nối với mạng công cộng"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"kết nối mạng, Internet, không dây, dữ liệu, wifi, wi-fi, wi fi, di động, nhà mạng di động, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Xem các mạng khi ở chế độ trên máy bay"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Xem các mạng có ở chế độ trên máy bay"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Bật mạng"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Tắt mạng"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Đặt lại Internet của bạn?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Hành động này sẽ kết thúc cuộc gọi điện thoại của bạn"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Hành động này sẽ kết thúc cuộc gọi điện thoại của bạn"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Đang đặt lại Internet của bạn…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Khắc phục sự cố về kết nối"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Các mạng dùng được khi ở chế độ trên máy bay"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Để chuyển mạng, hãy rút cáp Ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Bạn không thể chuyển đổi mạng khi đã kết nối"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Mạng ở chế độ trên máy bay"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Đã kết nối"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"Sẽ không tự động kết nối Internet"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Màu"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Khác"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Chung"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Xem tất cả ứng dụng"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Chuyển tiếp thông minh"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Đã bật tính năng chuyển tiếp thông minh"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Nhập số điện thoại"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Thiếu số điện thoại."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"Đã hiểu"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Cho phép 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Dùng kết nối di động 2G. Trong cuộc gọi khẩn cấp, mạng 2G luôn bật."</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a4ec4f0..5d47968 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"缩小或放大屏幕上的文字。"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"缩小"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"放大"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"使用自动屏幕旋转"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"示例文本"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"绿野仙踪"</string>
@@ -405,15 +404,21 @@
       <item quantity="one">已设置 <xliff:g id="COUNT_0">%1$d</xliff:g> 个指纹</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"使用指纹解锁"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"设置指纹"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"使用指纹"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"只需轻触指纹传感器即可解锁您的手机、对购买交易进行授权或登录应用。请务必谨慎添加指纹，因为添加的任一指纹都能够用来执行这些操作。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"指纹的安全性可能不及安全系数高的图案或 PIN 码。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"一切由您掌控"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"注意事项"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"指纹功能所记录的数据会安全地存储在您的手机上，绝不会外泄。您可以随时在“设置”中删除您的数据。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"指纹的安全性可能不及安全系数高的图案或 PIN 码。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"您的手机将不时使用您最近的指纹图像来创建改进的指纹模型。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"使用指纹解锁手机或批准购买交易。\n\n请注意：您无法使用指纹来解锁此设备。要了解详情，请与贵单位的管理员联系。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"使用指纹解锁手机或批准购买交易。\n\n请注意：指纹的安全性可能不及安全系数高的图案或 PIN 码。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"取消"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"不用了"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"跳过"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"继续"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"同意"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"跳过"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"下一步"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"要跳过指纹设置？"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"跳过"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"取消"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"触摸传感器"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"轻触并按住指纹图标"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"指纹传感器位于您手机的背面。请用食指触摸传感器。"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"传感器在屏幕上。请寻找带有发光圆圈的指纹图形。"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"指纹传感器位于屏幕上。在屏幕上移动手指即可找到传感器。"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"关于设备和指纹传感器位置的图示说明"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"名称"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"确定"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"删除"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"触摸传感器"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"将您的手指放在指纹传感器上，感觉到振动后移开手指"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"移开手指，然后再次触摸传感器"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"不时地移开手指，以便传感器更完整地记录下您的指纹"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"指纹已添加"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"当您看见此图标时，请使用您的指纹进行身份验证或批准购买交易"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"以后再说"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"搜索"</string>
     <string name="display_settings" msgid="7197750639709493852">"显示"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"自动旋转屏幕"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"关闭"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"开启"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"开启 - 基于人脸"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"启用人脸检测"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"颜色"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"自然色"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"增强色"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"开启 / 您看着屏幕时，它将不会关闭"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"关闭"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"需要相机访问权限"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"点按即可管理“设备个性化服务”的权限"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"在您看着屏幕时，它将不会关闭。"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"屏幕感知功能会通过前置摄像头来确定是否有人正在看屏幕。这个功能只会在设备上运行，系统绝对不会存储图片或将图片发送给 Google。"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"开启屏幕感知功能"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"收到新通知时，变暗的屏幕会自动亮起"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"始终显示时间和信息"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"这会增加耗电量"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"粗体文字"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"粗体文字"</string>
     <string name="title_font_size" msgid="570613010306330622">"字体大小"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"放大或缩小文字"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM 卡锁定设置"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"其他用户"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"内部存储设备"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"便携式存储设备"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"闹钟和提醒"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"允许设置闹钟或提醒"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"闹钟和提醒"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"允许该应用设定闹钟或其他基于时间的活动。这样一来，即使您并未在使用设备，该应用仍可启动和运行。请注意，撤消此权限可能会导致该应用出现故障，特别是该应用设定的所有闹钟都将不会响铃。"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"时间表, 闹钟, 提醒, 活动, schedule, alarm, reminder, event"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"已使用 <xliff:g id="USED">%1$s</xliff:g>（共 <xliff:g id="TOTAL">%2$s</xliff:g>）"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"（共 <xliff:g id="TOTAL">%1$s</xliff:g>）"</string>
@@ -1621,7 +1639,7 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"应用可以重置"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"重置 WLAN、移动数据网络和蓝牙设置"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"此操作会重置所有网络设置，包括：\n\n"<li>"WLAN"</li>\n<li>"移动数据网络"</li>\n<li>"蓝牙"</li></string>
-    <string name="erase_euicc_data_button" msgid="728078969563311737">"清空"</string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"清除"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"清除已下载的 SIM 卡"</string>
     <string name="reset_esim_desc" msgid="3662444090563399131">"此操作并不会取消任何移动服务套餐。如要下载备用 SIM 卡，请与您的运营商联系。"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"重置设置"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"位置信息服务"</string>
     <string name="location_title" msgid="5819154746934945021">"我的位置"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"工作资料位置信息"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"应用的位置信息使用权"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"位置信息服务已关闭"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> 个应用（共 <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> 个应用）有权使用位置信息</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> 个应用（共 <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> 个应用）有权使用位置信息</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"最近的位置信息访问记录"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"查看详情"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"最近没有任何应用申请使用位置信息"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"最近没有任何应用访问位置信息"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"高电耗"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"低电耗"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"WLAN 和蓝牙扫描"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"WLAN 扫描"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"允许应用和服务随时扫描 WLAN 网络（即使 WLAN 已关闭）。这可用于改进基于位置的功能和服务。"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"蓝牙扫描"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"允许应用和服务随时扫描附近的设备（即使蓝牙已关闭）。这可用于改进基于位置的功能和服务。"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"位置信息服务"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"工作用位置信息服务"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"位置信息时区检测"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"位置信息时区检测"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"允许使用设备的位置信息检测当前时区。WLAN 扫描等其他位置信息设置可能会影响时区检测的准确性。"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"开启"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"关闭"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"已停用自动检测时区的功能"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"自动检测时区功能已关闭"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"位置信息时区检测已停用"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"不支持位置信息时区检测"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"不允许更改位置信息时区检测"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"启用"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"清除存储空间"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"卸载更新"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"您已选择默认使用此应用处理某些操作。"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"您已选择的一些活动默认会在此应用中打开。"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"您已选择允许该应用创建微件并查看其数据。"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"无默认设置。"</string>
-    <string name="clear_activities" msgid="341345438786077236">"清除默认操作"</string>
+    <string name="clear_activities" msgid="488089228657585700">"清除默认偏好设置"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"此应用可能不是针对您的屏幕设计的。您可以在此处调整其显示尺寸/比例，让它适合您的屏幕。"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"启动时确认"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"调整应用的显示尺寸/比例"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"您可以根据自己的需求对此设备进行自定义。以后，您可以在“设置”中更改这些辅助功能设置。"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"更改字体大小"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"屏幕阅读器"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"音频和屏幕上的文字"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"字幕"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"音频"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"常规"</string>
     <string name="display_category_title" msgid="6638191682294461408">"显示"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"文字和显示"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"调暗屏幕"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"红绿不分"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"红绿不分"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"蓝黄不分"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"调低亮度"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"调低亮度"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"将屏幕调得比手机最低亮度更暗"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"将屏幕调得比平板电脑最低亮度更暗"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"调暗屏幕可让您看手机时更舒适。&lt;br/&gt;&lt;br/&gt; 此设置适用于以下情况：&lt;ol&gt; &lt;li&gt; 手机的默认最低亮度依然太亮&lt;/li&gt; &lt;li&gt; 在夜间或睡前昏暗的房间等较暗环境中使用手机&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"面孔"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"指纹, 添加指纹"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"降低屏幕亮度, 触摸屏, 电池, 智能亮度, 动态亮度, 自动调节亮度"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"调暗屏幕, 休眠, 电池, 超时, 感知, 显示, 屏幕, 闲置"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"旋转, 翻转, 纵向, 横向, 屏幕方向, 垂直, 水平"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"升级, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"勿扰, 时间表, 通知, 屏蔽, 设为静音, 振动, 休眠, 工作, 焦点, 声音, 静音, 日, 工作日, 周末, 工作日晚上, 活动"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"屏幕, 锁定时间, 超时, 锁屏"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"铃声"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"其他提示音和振动"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"通知"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"对话"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"最近发送"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"查看过去 7 天的所有应用"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"高级"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"常规"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"工作通知"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"自动调节通知"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"自适应通知优先级"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"显示在下拉通知栏、状态栏以及锁定屏幕中"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"隐藏状态栏中的无声通知"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"闪烁指示灯"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"锁定屏幕上的通知"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"隐私设置"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"跳过锁定屏幕"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"进行人脸解锁后，直接转到上次离开时的画面"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"锁定屏幕, 锁屏, 跳过, 绕过"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">每周大约 <xliff:g id="NUMBER_0">%d</xliff:g> 条通知</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"永不"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"通知使用权"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"设备和应用通知"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"控制哪些通知会在您的应用和设备上显示"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"已禁止访问工作资料通知"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"应用无法读取通知"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3667,26 +3692,26 @@
     <string name="notification_assistant_title" msgid="6983941403582134437">"自动调节通知"</string>
     <string name="no_notification_assistant" msgid="2533323397091834096">"无"</string>
     <string name="no_notification_listeners" msgid="2839354157349636000">"没有任何已安装的应用请求通知访问权限。"</string>
-    <string name="notification_access_detail_switch" msgid="46386786409608330">"授予通知访问权限"</string>
-    <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"要允许<xliff:g id="SERVICE">%1$s</xliff:g>访问通知吗？"</string>
+    <string name="notification_access_detail_switch" msgid="46386786409608330">"授予通知使用权"</string>
+    <string name="notification_assistant_security_warning_title" msgid="2972346436050925276">"要向<xliff:g id="SERVICE">%1$s</xliff:g>授予通知使用权吗？"</string>
     <string name="notification_assistant_security_warning_summary" msgid="7362924206925040510">"<xliff:g id="NOTIFICATION_ASSISTANT_NAME">%1$s</xliff:g>将可读取所有通知（包括联系人姓名和您收到的消息内容等个人信息），而且还能关闭通知或触发通知中的按钮（包括接听来电）。\n\n此外，该应用将因此能够开启或关闭“勿扰”模式并更改相关设置。"</string>
-    <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"要允许<xliff:g id="SERVICE">%1$s</xliff:g>获取通知访问权限吗？"</string>
+    <string name="notification_listener_security_warning_title" msgid="5791700876622858363">"要向<xliff:g id="SERVICE">%1$s</xliff:g>授予通知使用权吗？"</string>
     <string name="notification_listener_security_warning_summary" msgid="1658213659262173405">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>将可读取所有通知（包括联系人姓名和您收到的消息内容等个人信息），而且还能关闭通知或触发通知中的按钮（包括接听来电）。\n\n此外，该应用将因此能够开启或关闭“勿扰”模式并更改相关设置。"</string>
     <string name="notification_listener_disable_warning_summary" msgid="8373396293802088961">"如果您停用<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>的通知访问权限，勿扰模式的访问权限可能也会遭到停用。"</string>
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"停用"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"取消"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"允许的通知类型"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"持续显示的重要通知"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"对话通知"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"提醒通知"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"无声通知"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"实时"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"来自使用中的应用、导航、通话等来源的实时通信内容"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"对话"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"短信和其他通信内容"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"默认"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"可能会根据设置让设备响铃或振动的通知"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"静音"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"绝不会让设备发出提示音或振动的通知"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"查看所有应用"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"为各个可发送通知的应用更改通知设置"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"在设备上显示的应用"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR 助手服务"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"没有任何已安装的应用请求以 VR 助手服务的形式运行。"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"允许<xliff:g id="SERVICE">%1$s</xliff:g>访问 VR 服务吗？"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"默认打开"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"打开链接"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"打开支持的链接"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"会在此应用中打开的支持链接"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"要在此应用中打开的链接"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"无需询问即可打开"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"支持的链接"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"其他默认设置"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"其他默认偏好设置"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"添加链接"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"应用可以验证要自动在本应用中打开的链接。"<annotation id="url">"了解详情"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 个已通过验证的链接</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 个已通过验证的链接</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">这些链接已通过验证，会自动在此应用中打开。</item>
+      <item quantity="one">此链接已通过验证，会自动在此应用中打开。</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"确定"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"正在检查是否有其他支持的链接…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"取消"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 个支持的链接</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 个支持的链接</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"添加"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"会在<xliff:g id="APP_LABEL">%s</xliff:g>中打开"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"已使用 <xliff:g id="SIZE">%1$s</xliff:g> <xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"内部存储空间"</string>
     <string name="storage_type_external" msgid="125078274000280821">"外部存储空间"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"不允许使用相机"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"不允许使用屏幕截图功能"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"无法打开此应用"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"如有任何问题，请与您的 IT 管理员联系"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"更多详情"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"您的管理员可以监控和管理与您的工作资料相关的应用和数据（其中包括设置、权限、企业权限、网络活动和设备的位置信息）。"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"您的管理员可以监控和管理与此用户相关的应用和数据（其中包括设置、权限、企业权限、网络活动和设备的位置信息）。"</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 项限制</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"运营商的流量计算方式可能与您设备的计算方式不同"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"不包括运营商网络的流量消耗"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"不包括运营商网络的流量消耗"</string>
     <string name="data_used_template" msgid="8229342096562327646">"已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"设置数据流量警告"</string>
     <string name="data_warning" msgid="2925054658166062884">"数据流量警告"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"（已为用户<xliff:g id="USER">%s</xliff:g>卸载）"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"（已为用户<xliff:g id="USER">%s</xliff:g>停用）"</string>
     <string name="autofill_app" msgid="7595308061826307921">"自动填充服务"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"自动, 填充, 自动填充, auto, fill, autofill"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"密码"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"自动, 填充, 自动填充, 密码, auto, fill, autofill, password"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;请确认这是您信任的应用&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt;会根据您的屏幕内容判断可自动填充哪些内容。"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"自动填充"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"日志记录级别"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"更改网络运行方式"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"首选网络类型"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"运营商"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"设置版本"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"运营商设置版本"</string>
     <string name="call_category" msgid="641461844504128789">"通话"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"运营商视频通话"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"系统选择"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"请取出 SIM 卡，然后重新插入。如果问题仍然存在，请重启您的设备。"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"请尝试重新启用 SIM 卡。如果问题仍然存在，请重启您的设备。"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"网络激活"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"正在切换运营商"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>已启用"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"点按即可更新 SIM 卡设置"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"已切换到<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -4958,9 +5007,9 @@
     <string name="switch_sim_dialog_no_switch_title" msgid="809763410787744247">"没有可用的已激活 SIM 卡"</string>
     <string name="switch_sim_dialog_no_switch_text" msgid="7053939850026876088">"如要在日后使用移动数据、通话和短信功能，请转到“网络设置”部分"</string>
     <string name="sim_card_label" msgid="5632157635124050923">"SIM 卡"</string>
-    <string name="erase_sim_dialog_title" msgid="881253002169177016">"要清空这个已下载的 SIM 卡吗？"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"要清除这个已下载的 SIM 卡吗？"</string>
     <string name="erase_sim_dialog_text" msgid="753031064269699885">"清空此 SIM 卡将从此设备中移除<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>服务。\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>的服务不会因此被取消。"</string>
-    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"清空"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"清除"</string>
     <string name="erasing_sim" msgid="7877703231075699139">"正在清空 SIM 卡…"</string>
     <string name="erase_sim_fail_title" msgid="2024446702985862427">"无法清空 SIM 卡"</string>
     <string name="erase_sim_fail_text" msgid="7870804401227483131">"发生错误，因此无法清空此 SIM 卡。\n\n请重启设备，然后重试。"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"关闭"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"互联网"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM 卡"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"显示飞行模式网络"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"查找并连接飞行模式网络。"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"查找并连接到 WLAN 网络"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"飞机，可在飞机上安全使用"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"通话和短信"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"WLAN 通话"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"不可用"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"暂时无法使用"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"没有 SIM 卡"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"偏好设置"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"网络偏好设置"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"连接到公共网络"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"网络连接, 互联网, 无线, 数据, WiFi, Wi-Fi, Wi Fi, WLAN, 移动网络, 移动, 手机运营商, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"查看飞行模式网络"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"查看飞行模式网络"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"开启网络"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"关闭网络"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"要重置互联网吗？"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"通话将因此结束"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"通话将因此结束"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"正在重置互联网…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"修复连接"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"有可用的飞行模式网络"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"如要切换网络，请拔出以太网网线"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"连接到以太网时无法切换网络"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"飞行模式网络"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"已连接"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"不会自动连接到互联网"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"颜色"</string>
     <string name="category_name_others" msgid="2366006298768550310">"其他"</string>
     <string name="category_name_general" msgid="7737273712848115886">"常规"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"查看所有应用"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"智能转接"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"智能转接功能已启用"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"输入电话号码"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"缺少电话号码。"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"确定"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"允许启用 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"使用 2G 移动网络连接。拨打紧急电话时，2G 网络将始终保持开启状态。"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 224be1f..9362829 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"縮小或放大畫面上的文字。"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"縮小"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"放大"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"啟用自動旋轉"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"範例文字"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"《綠野仙蹤》"</string>
@@ -405,15 +404,21 @@
       <item quantity="one">已設定 <xliff:g id="COUNT_0">%1$d</xliff:g> 個指紋</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"指紋解鎖"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"設定指紋"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"使用您的指紋"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"輕觸指紋感應器即可解鎖手機、授權購物或登入應用程式。請審慎選擇要加入的指紋，所有已加入的指紋都可執行這些操作。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"使用複雜的上鎖圖案或 PIN 會比指紋識別更安全。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"由您掌握"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"注意事項"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"「指紋」所記錄的資料會安全地儲存在您的手機上，絕不會外洩。您隨時可在「設定」刪除此資料。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"使用複雜的上鎖圖案或 PIN 會比指紋識別更安全。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"手機將不時使用您近期的指紋圖像來建立更準確的指紋模型。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"使用指紋解鎖手機或核准購物交易。\n\n請注意：您無法使用指紋解鎖此裝置。如需瞭解詳情，請聯絡您機構的管理員。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"使用指紋解鎖手機或核准購物交易。\n\n請注意：相對於複雜的上鎖圖案或 PIN，指紋識別的安全性較低。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"取消"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"不用了，謝謝"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"略過"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"繼續"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"同意"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"略過"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"繼續"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"要略過指紋設定程序嗎？"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"略過"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"取消"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"輕觸感應器"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"按住指紋圖示"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"指紋感應器在手機背面。請使用食指輕觸感應器。"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"感應器在裝置螢幕上。請尋找外圍有發亮圓圈的指紋圖形。"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"指紋感應器位於螢幕上。請在螢幕上移動手指，找出指紋感應器的所在位置。"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"裝置和指紋感應器位置圖示"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"名稱"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"確定"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"刪除"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"輕觸感應器"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"請將手指放在感應器上，並在感到震動時移開"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"移開手指，然後再次輕觸"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"手指重覆按壓，記錄指紋各個部分"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"已加入指紋"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"看到此圖示時，請使用您的指紋識別身份或核准購物交易"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"稍後再做"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"搜尋"</string>
     <string name="display_settings" msgid="7197750639709493852">"螢幕"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"自動旋轉螢幕"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"已關閉"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"已開啟"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"已開啟 - 根據臉孔偵測"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"啟用臉孔偵測"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"顏色"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"自然"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"強化"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"啟用 / 假如正您望向螢幕，螢幕將不會關閉"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"關閉"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"需要獲取相機權限"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"輕按以管理「裝置個人化服務」的權限"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"防止螢幕在您望著時關閉"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"「螢幕感知」功能利用前置鏡頭偵測使用者是否看著螢幕。此功能只會在裝置上運作，圖片亦不會被儲存或傳送至 Google。"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"開啟「保持螢幕亮起」"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"收到新通知時，關閉的螢幕會亮起"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"一律顯示時間和資料"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"此功能會增加耗電量"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"粗體文字"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"粗體文字"</string>
     <string name="title_font_size" msgid="570613010306330622">"字型大小"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"放大或縮小文字"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM 卡鎖定設定"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"其他使用者"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"儲存裝置"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"外置儲存空間"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"鬧鐘和提醒"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"允許設定鬧鐘或提醒"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"鬧鐘和提醒"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"允許此應用程式設定鬧鐘或其他定時活動。執行此操作後，即使您沒有使用裝置，應用程式仍可啟動並執行。請注意，撤消此權限可能會導致應用程式無法運作，尤其是應用程式設定的所有鬧鐘都將不會響鈴。"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"日程表, 鬧鐘, 提醒, 活動"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"已使用 <xliff:g id="USED">%1$s</xliff:g> (共 <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"(共 <xliff:g id="TOTAL">%1$s</xliff:g>)"</string>
@@ -1728,30 +1746,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"定位服務"</string>
     <string name="location_title" msgid="5819154746934945021">"我的位置"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"工作設定檔的位置"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"應用程式位置存取權"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"位置功能已關閉"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> 個應用程式 (共 <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> 個) 可存取位置資訊</item>
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> 個應用程式 (共 <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> 個) 可存取位置資訊</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"最近存取位置資訊"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"查看詳情"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"最近沒有應用程式要求存取位置資料"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"近期未有應用程式存取位置資訊"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"高耗電量"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"低耗電量"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi 和藍牙掃瞄"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Wi-Fi 掃瞄"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"允許應用程式和服務隨時掃瞄 Wi-Fi 網絡 (即使 Wi-Fi 已關閉)。此操作可用來改善適地性功能和服務。"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"藍牙掃瞄"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"允許應用程式和服務隨時掃瞄附近的裝置 (即使藍牙功能已關閉)。此操作可用來改善適地性功能和服務。"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"定位服務"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"工作用定位服務"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"位置時區偵測"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"位置時區偵測"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"允許使用裝置位置偵測目前時區。其他的位置設定 (例如掃瞄 Wi-Fi 功能) 可能會影響時區偵測結果準確性。"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"已開啟"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"已關閉"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"自動偵測時區功能已停用"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"自動設定時區功能已關閉"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"位置時區偵測已停用"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"不支援位置時區偵測"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"不允許變更位置時區偵測"</string>
@@ -1930,10 +1949,10 @@
     <string name="enable_text" msgid="8570798764647110430">"啟用"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"清除儲存空間"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"解除安裝更新"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"您已設定在某些操作下啟動這個應用程式。"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"根據預設，您選取的部分活動會在此應用程式中開啟。"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"您已選擇允許這應用程式建立小工具並存取其資料。"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"未設定預設值。"</string>
-    <string name="clear_activities" msgid="341345438786077236">"清除預設值"</string>
+    <string name="clear_activities" msgid="488089228657585700">"清除預設的偏好設定"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"這個應用程式的設計可能與您的螢幕不兼容；您可以在這裡進行設定，將應用程式調整成與您的螢幕兼容。"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"啓動時詢問"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"調整應用程式比例"</string>
@@ -2145,7 +2164,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"您可視乎個人需要自訂此裝置。這些無障礙功能可在 [設定] 中變更。"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"變更字型大小"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"螢幕閱讀器"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"音訊和螢幕上的文字"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"字幕"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"音訊"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"一般"</string>
     <string name="display_category_title" msgid="6638191682294461408">"螢幕"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"文字廣告同多媒體廣告"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"校暗螢幕"</string>
@@ -2298,7 +2319,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"紅綠不分"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"紅綠不分"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"藍黃不分"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"調低亮度"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"調低亮度"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"將螢幕亮度調整至低於手機的最低亮度"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"將螢幕亮度調整至低於平板電腦的最低亮度"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"將螢幕調暗可讓您看手機時更舒適。&lt;br/&gt;&lt;br/&gt; 此設定適用於以下情況：&lt;ol&gt; &lt;li&gt; 手機預設的最低亮度仍然太亮&lt;/li&gt; &lt;li&gt; 在夜間或睡前黑暗的房間等昏暗環境下使用手機&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3335,8 +3356,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"臉孔"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"指紋, 新增指紋"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"調暗螢幕, 觸控螢幕, 電池, 智能亮度, 動態亮度, 自動調整亮度"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"調暗螢幕, 休眠, 電池, 逾時, 注意, 顯示屏, 螢幕, 閒置"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"旋轉, 翻轉, 旋轉, 直向, 橫向, 屏幕定向, 垂直, 水平"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"升級, Android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"請勿騷擾, 時間表, 通知, 封鎖, 靜音, 震動, 休眠, 工作, 焦點, 音效, 忽略, 天, 平日, 週末, 平日晚上, 活動"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"螢幕, 鎖定時間, 逾時, 鎖定螢幕"</string>
@@ -3505,9 +3528,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"鈴聲"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"其他音效和震動"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"通知"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"對話"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"最近傳送通知的應用程式"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"查看過去 7 天的所有應用程式"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"進階"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"一般"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"工作通知"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"自動調節通知"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"自動調節通知優先次序"</string>
@@ -3569,7 +3593,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"在下拉式面板、狀態列和上鎖畫面中顯示"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"隱藏狀態列的靜音通知"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"閃燈"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"上鎖畫面上的通知"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"私隱"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"略過上鎖畫面"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"完成面孔解鎖後，直接前往上次使用的畫面"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"上鎖畫面, 鎖定螢幕, 略過, 繞過"</string>
@@ -3639,7 +3663,7 @@
     <string name="allow_interruption" msgid="5237201780159482716">"允許打擾"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"允許應用程式發出音效、震動以及/或在螢幕上彈出通知"</string>
     <string name="notification_priority_title" msgid="5554834239080425229">"優先次序"</string>
-    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"在對話部分的頂部以浮動對話氣泡顯示，並在上鎖畫面顯示個人檔案相片"</string>
+    <string name="notification_channel_summary_priority" msgid="7225362351439076913">"在對話部分頂部顯示浮動對話氣泡，並在上鎖畫面上顯示個人檔案相片"</string>
     <string name="convo_not_supported_summary" msgid="4285471045268268048">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」不支援大部分對話功能。對話無法設為優先，亦不會以浮動對話氣泡顯示。"</string>
     <string name="notification_channel_summary_min" msgid="8823399508450176842">"在下拉式面板中，將通知收合為一行"</string>
     <string name="notification_channel_summary_low" msgid="5549662596677692000">"無音效或震動"</string>
@@ -3658,7 +3682,8 @@
       <item quantity="one">~每星期 <xliff:g id="NUMBER_0">%d</xliff:g> 個通知</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"永不"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"通知權限"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"裝置和應用程式通知"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"決定應用程式和裝置可顯示哪些通知"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"管理員已禁止存取工作設定檔通知"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"應用程式無法讀取通知"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3677,17 +3702,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"關閉"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"取消"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"允許的通知類型"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"持續顯示的重要通知"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"對話通知"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"提醒通知"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"靜音通知"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"即時"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"應用程式處於導航、通話、使用狀態和其他情況時的即時通訊內容"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"對話"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"短訊及其他通訊"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"預設"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"可能會根據設定發出鈴聲或震動的通知"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"靜音"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"一律不發出鈴聲或震動的通知"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"查看所有應用程式"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"分別為每個可傳送通知的應用程式變更通知設定"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"裝置上顯示的應用程式"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR 助手服務"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"沒有已安裝的應用程式要求提供 VR 助手服務。"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"允許 VR 服務存取 <xliff:g id="SERVICE">%1$s</xliff:g> 嗎？"</string>
@@ -3975,9 +4000,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"預設開啟"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"開啟連結"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"開啟支援連結"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"在此應用程式中開啟的支援連結"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"在此應用程式中開啟的連結"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"直接開啟，不用再詢問"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"支援連結"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"其他預設值"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"其他預設偏好設定"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"新增連結"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"應用程式可驗證連結，通過驗證的連結就能自動在應用程式中開啟。"<annotation id="url">"瞭解詳情"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 個已驗證的連結</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 個已驗證的連結</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">這些連結已驗證，將自動在此應用程式中開啟。</item>
+      <item quantity="one">此連結已驗證，將自動在此應用程式中開啟。</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"確定"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"正在檢查是否有其他支援的連結…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"取消"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 個支援的連結</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 個支援的連結</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"新增"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"在「<xliff:g id="APP_LABEL">%s</xliff:g>」中打開"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>已使用 <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"內部儲存空間"</string>
     <string name="storage_type_external" msgid="125078274000280821">"外部儲存空間"</string>
@@ -4272,7 +4318,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"不允許使用相機"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"不允許擷取螢幕畫面"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"無法開啟此應用程式"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"如有任何問題，請與 IT 管理員聯絡"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"更多詳細資料"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"您的管理員可以監控及管理與工作設定檔相關的應用程式和資料，包括設定、權限、公司存取權、網絡活動，以及裝置的位置資料。"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"您的管理員可以監控及管理與此使用者相關的應用程式和資料，包括設定、權限、公司存取權、網絡活動，以及裝置的位置資料。"</string>
@@ -4349,7 +4396,7 @@
       <item quantity="one">1 個限制</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"流動網絡供應商的數據計算方式可能與裝置有所不同"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"不包括流動網絡供應商網絡使用的數據"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"不包括流動網絡供應商網絡使用的數據"</string>
     <string name="data_used_template" msgid="8229342096562327646">"已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"設定數據用量警告"</string>
     <string name="data_warning" msgid="2925054658166062884">"數據用量警告"</string>
@@ -4686,7 +4733,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(已為使用者 (<xliff:g id="USER">%s</xliff:g>) 解除安裝)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(已為使用者<xliff:g id="USER">%s</xliff:g>停用)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"自動填入服務"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"自動, 填入, 自動填入"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"密碼"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"自動, 填寫, 自動填入, 密碼"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;請確定您信任此應用程式&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; 應用程式會根據您畫面上的內容判斷可自動填入的資料。"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"自動填入"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"記錄等級"</string>
@@ -4893,7 +4941,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"更改網絡操作模式"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"首選網絡類型"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"流動網絡供應商"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"設定版本"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"流動網絡供應商設定版本"</string>
     <string name="call_category" msgid="641461844504128789">"通話"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"流動網絡供應商視像通話"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"系統選擇"</string>
@@ -4942,6 +4990,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"請移除 SIM 卡再重新插入。如果問題持續發生，請重新啟動裝置。"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"請嘗試再次啟用 SIM 卡。如果問題持續發生，請重新啟動裝置。"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"網絡啟用"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"轉用流動網絡供應商"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"已啟用<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"輕按以更新 SIM 卡設定"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"已切換至 <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -4960,7 +5009,7 @@
     <string name="switch_sim_dialog_no_switch_text" msgid="7053939850026876088">"日後如要使用流動數據、通話和短訊功能，請前往 [網絡設定] 調整設定內容"</string>
     <string name="sim_card_label" msgid="5632157635124050923">"SIM 卡"</string>
     <string name="erase_sim_dialog_title" msgid="881253002169177016">"要清除這張已下載的 SIM 卡嗎？"</string>
-    <string name="erase_sim_dialog_text" msgid="753031064269699885">"清除此 SIM 卡即會從此裝置中移除 <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> 服務。\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> 的服務將不會被取消。"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"清除此 SIM 卡即會從此裝置中移除 <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> 服務。\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> 的服務將不會取消。"</string>
     <string name="erase_sim_confirm_button" msgid="8309115684335320541">"清除"</string>
     <string name="erasing_sim" msgid="7877703231075699139">"正在清除 SIM 卡…"</string>
     <string name="erase_sim_fail_title" msgid="2024446702985862427">"無法清除 SIM 卡"</string>
@@ -5102,8 +5151,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"關閉"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"互聯網"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM 卡"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"顯示飛行模式網絡"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"尋找並連接飛行模式網絡。"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"尋找並連接 Wi-Fi 網絡"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"飛行, 飛行安全"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"通話和短訊"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi 通話"</string>
@@ -5117,22 +5165,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"無法使用"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"暫時無法使用"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"沒有 SIM 卡"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"偏好設定"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"網絡偏好設定"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"連線至公共網絡"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"網絡連線, 互聯網, 無線, 數據, Wi-Fi, 流動網絡, 流動裝置, 流動網絡供應商, 4G, 3G, 2G, LTE"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"查看飛行模式網絡"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"查看飛行模式網絡"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"開啟網絡"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"關閉網絡"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"要重設互聯網嗎？"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"通話將因此結束"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"通話將因此結束"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"正在重設互聯網…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"修正連線"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"有可用的飛行模式網絡"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"如要切換網絡，請中斷以太網連線"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"連接以太網絡後就無法切絡"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"飛行模式網絡"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"已連線"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"不會自動連線至互聯網"</string>
@@ -5153,6 +5200,10 @@
     <string name="category_name_color" msgid="937514550918977151">"顏色"</string>
     <string name="category_name_others" msgid="2366006298768550310">"其他"</string>
     <string name="category_name_general" msgid="7737273712848115886">"一般"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"查看所有應用程式"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"智能轉駁"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"智能轉駁功能已啟用"</string>
@@ -5166,4 +5217,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"輸入電話號碼"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"缺少電話號碼。"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"確定"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"允許啟用 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"使用 2G 數據連線。撥打緊急電話時，系統將一律啟用 2G。"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3162f01..b7793b0 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"縮小或放大畫面上的文字。"</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"縮小"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"放大"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"啟用自動旋轉"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"範例文字"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"綠野仙蹤"</string>
@@ -405,15 +404,21 @@
       <item quantity="one">已設定 <xliff:g id="COUNT_0">%1$d</xliff:g> 枚指紋</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"使用指紋解鎖"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"設定指紋"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"使用指紋"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"只要輕觸指紋感應器即可將手機解鎖、授權購物交易或登入應用程式。請慎選要加入的指紋，因為你加入的任何指紋都能用來執行前述操作。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"使用複雜的圖案或 PIN 碼會比感應指紋來得安全。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"一切由你掌控"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"注意事項"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"透過指紋功能記錄的資料會安全地儲存在你的手機上，絕不會外洩。你隨時可以前往「設定」刪除這項資料。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"使用複雜的圖案或 PIN 碼會比感應指紋來得安全。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"你的手機會不定期使用你的近期指紋圖片，建立更加精準的指紋模型。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"使用你的指紋將手機解鎖或核准購物交易。\n\n注意：你無法使用指紋將這個裝置解鎖，詳情請洽貴機構的管理員。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"使用你的指紋將手機解鎖或核准購物交易。\n\n注意：使用複雜的圖案或 PIN 碼會比感應指紋來得安全。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"取消"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"不用了，謝謝"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"略過"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"繼續"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"同意"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"略過"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"繼續"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"要略過指紋設定程序嗎？"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"略過"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"取消"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"輕觸感應器"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"按住指紋圖示"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"指紋感應器位於手機背面。請用食指輕觸感應器。"</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"感應器在裝置螢幕上。請尋找外圍有發亮圓圈的指紋圖形。"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"指紋感應器位在螢幕上。請在螢幕上移動手指，找出指紋感應器的所在位置。"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"裝置指紋感應器位置插圖"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"名稱"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"確定"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"刪除"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"輕觸感應器"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"將你的手指放在感應器上，感到震動即可移開"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"移開手指，然後再次輕觸感應器"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"重覆按壓指紋感應器，以建立完整的指紋檔案"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"指紋新增成功"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"當你看到這個圖示時，請使用你的指紋來驗證身分或核准購物交易"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"稍後再說"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"搜尋"</string>
     <string name="display_settings" msgid="7197750639709493852">"螢幕"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"自動旋轉螢幕"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"已關閉"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"已開啟"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"已開啟 - 臉部偵測"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"啟用臉部偵測"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"色彩"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"自然"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"增強"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"啟用/螢幕不會在你注視時關閉"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"關閉"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"需要相機存取權"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"輕觸即可管理「裝置個人化服務」權限"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"避免螢幕在你注視時關閉"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"螢幕感知功能會使用前置鏡頭判斷是否有人正在看著螢幕。這項功能只會在裝置上執行，系統不會儲存相關圖片或將其傳送給 Google。"</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"開啟螢幕感知功能"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"收到新通知時，關閉的螢幕就會亮起"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"一律顯示時間和資訊"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"開啟這項功能會增加電池用量"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"粗體文字"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"粗體文字"</string>
     <string name="title_font_size" msgid="570613010306330622">"字型大小"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"縮小或放大文字"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM 卡鎖定設定"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"其他使用者"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"裝置儲存空間"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"可攜式儲存空間"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"鬧鐘與提醒"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"允許設定鬧鐘或提醒"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"鬧鐘與提醒"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"允許這個應用程式安排鬧鐘或其他有時限的活動。如此一來，即使你並未使用裝置，應用程式仍可啟動並執行。請注意，如果撤銷這項權限，可能會導致應用程式無法運作，尤其是應用程式設定的所有鬧鐘都將不會響鈴。"</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"時間表, 鬧鐘, 提醒, 活動"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"已使用 <xliff:g id="USED">%1$s</xliff:g> (共 <xliff:g id="TOTAL">%2$s</xliff:g>)"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"(共 <xliff:g id="TOTAL">%1$s</xliff:g>)"</string>
@@ -1727,30 +1745,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"定位服務"</string>
     <string name="location_title" msgid="5819154746934945021">"我的位置"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"工作資料夾位置資訊"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"應用程式的位置資訊存取權"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"定位功能已關閉"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="other"> 在 <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> 個應用程式中，共有 <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> 個已取得位置資訊存取權</item>
       <item quantity="one"> 在 <xliff:g id="TOTAL_LOCATION_APP_COUNT_1">%2$d</xliff:g> 個應用程式中，共有 <xliff:g id="PERMITTED_LOCATION_APP_COUNT_0">%1$d</xliff:g> 個已取得位置資訊存取權</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"最近的位置資訊存取記錄"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"查看詳細資料"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"最近沒有應用程式要求存取位置資訊"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"最近沒有任何應用程式存取位置資訊"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"耗電量高"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"耗電量低"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"Wi‑Fi 和藍牙掃描"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"掃描 Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"允許應用程式和服務隨時掃描 Wi‑Fi 網路 (即使 Wi-Fi 功能處於關閉狀態)。這麼做可以改善適地性功能和服務等等。"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"藍牙掃描"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"允許應用程式和服務隨時掃描附近裝置 (即使藍牙功能處於關閉狀態)。這麼做可以改善適地性功能和服務等等。"</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"定位服務"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"工作用定位服務"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"位置時區偵測"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"位置時區偵測"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"允許使用裝置位置偵測目前時區。其他的位置資訊設定 (例如掃描 Wi-Fi 功能) 可能會影響時區偵測結果準確性。"</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"已開啟"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"已關閉"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"自動偵測時區功能已停用"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"自動偵測時區功能已關閉"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"位置時區偵測已停用"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"不支援位置時區偵測"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"不允許變更位置時區偵測"</string>
@@ -1929,10 +1948,10 @@
     <string name="enable_text" msgid="8570798764647110430">"啟用"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"清除儲存空間"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"解除安裝更新"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"你已預設在某些操作下啟動這個應用程式。"</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"你選取的某些活動預設會在這個應用程式中開啟。"</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"你已選擇允許這個應用程式建立小工具並存取其資料。"</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"沒有預設值。"</string>
-    <string name="clear_activities" msgid="341345438786077236">"清除預設值"</string>
+    <string name="clear_activities" msgid="488089228657585700">"清除預設的偏好設定"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"這個應用程式可能與你的螢幕不相容；你可以在這裡進行設定，將應用程式調整成與你的螢幕相容。"</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"啓動時詢問"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"應用程式比例"</string>
@@ -2144,7 +2163,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"你可以根據個人需求自訂這個裝置，日後，你可以前往 [設定] 變更這些無障礙功能。"</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"變更字型大小"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"螢幕閱讀器"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"音訊和畫面上的文字"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"字幕"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"音訊"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"一般"</string>
     <string name="display_category_title" msgid="6638191682294461408">"螢幕"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"文字和顯示"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"調暗螢幕"</string>
@@ -2297,7 +2318,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"紅 - 綠"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"紅 - 綠"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"藍 - 黃"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"調低亮度"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"調低亮度"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"將螢幕調得比手機最低亮度更暗"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"將螢幕調得比平板電腦最低亮度更暗"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"將螢幕調暗可讓你看手機時更舒適。&lt;br/&gt;&lt;br/&gt; 這項設定適用於以下情況：&lt;ol&gt; &lt;li&gt; 手機預設的最低亮度依然太亮&lt;/li&gt; &lt;li&gt; 在夜間或就寢前黑暗的房間等昏暗環境下使用手機&lt;/li&gt; &lt;/ol&gt;"</string>
@@ -3334,8 +3355,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"臉孔"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"指紋, 新增指紋"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"調暗螢幕, 觸控螢幕, 電池, 智慧型亮度, 動態亮度, 自動亮度"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"調暗螢幕, 休眠, 電池, 自動關閉, 感知, 顯示, 螢幕, 閒置"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"旋轉, 翻轉, 轉動, 直向, 橫向, 螢幕方向, 垂直, 水平"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"升級, android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"零打擾, 時間表, 通知, 封鎖, 靜音, 震動, 休眠, 工作, 焦點, 音效, 忽略, 天, 週間, 週末, 週間晚上, 活動"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"螢幕, 鎖定時間, 自動關閉, 鎖定螢幕"</string>
@@ -3504,9 +3527,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"鈴聲"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"其他音效與震動"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"通知"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"對話"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"最近傳送通知的應用程式"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"查看過去 7 天的所有相關內容"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"進階"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"一般"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Work 通知"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"自動調整通知"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"自動調整通知優先順序"</string>
@@ -3568,7 +3592,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"顯示在下拉式通知欄、狀態列和螢幕鎖定畫面中"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"隱藏狀態列中的靜音通知"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"閃爍燈光"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"螢幕鎖定畫面上的通知"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"隱私權"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"略過螢幕鎖定程序"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"使用臉孔將裝置解鎖後，直接前往上次使用的畫面"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"螢幕鎖定, 鎖定螢幕, 略過, 規避"</string>
@@ -3657,7 +3681,8 @@
       <item quantity="one">每週大約 <xliff:g id="NUMBER_0">%d</xliff:g> 則通知</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"永遠不要"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"通知存取權"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"裝置和應用程式通知"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"決定應用程式和裝置可顯示哪些通知"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"管理員已禁止存取工作資料夾通知"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"應用程式無法讀取通知"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3676,17 +3701,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"關閉"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"取消"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"允許的通知類型"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"重要的持續性通知"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"對話通知"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"警示通知"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"靜音通知"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"即時"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"應用程式處於導航、通話、使用狀態和其他情況時的即時通訊內容"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"對話"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"簡訊和其他通訊"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"預設"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"可能會讓裝置響鈴或震動的通知 (視設定而定)"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"靜音"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"絕不會讓裝置震動或發出音效的通知"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"查看所有應用程式"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"分別為每個可傳送通知的應用程式變更通知設定"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"裝置上顯示的應用程式"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"VR 小幫手服務"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"沒有任何已安裝的應用程式要求透過 VR 小幫手服務來執行。"</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"要允許 <xliff:g id="SERVICE">%1$s</xliff:g> 存取 VR 服務嗎？"</string>
@@ -3974,9 +3999,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"預設為開啟"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"開啟連結"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"開啟支援的連結"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"在這個應用程式中開啟的支援連結"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"要在這個應用程式中開啟的連結"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"不需詢問即可開啟"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"支援的連結"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"其他預設值"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"其他預設偏好設定"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"新增連結"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"應用程式可驗證連結，通過驗證的連結就能自動在應用程式中開啟。"<annotation id="url">"瞭解詳情"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 個已通過驗證的連結</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 個已通過驗證的連結</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="other">這些連結已通過驗證，將自動在這個應用程式中開啟。</item>
+      <item quantity="one">這個連結已通過驗證，將自動在這個應用程式中開啟。</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"確定"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"正在檢查是否有其他支援的連結…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"取消"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 個支援的連結</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 個支援的連結</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"新增"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"在「<xliff:g id="APP_LABEL">%s</xliff:g>」中開啟"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"已使用 <xliff:g id="SIZE">%1$s</xliff:g> 的<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"內部儲存空間"</string>
     <string name="storage_type_external" msgid="125078274000280821">"外部儲存空間"</string>
@@ -4271,7 +4317,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"不允許使用相機功能"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"不允許使用螢幕畫面擷取功能"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"無法開啟這個應用程式"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"如有任何問題，請與你的 IT 管理員聯絡"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"其他詳細資訊"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"你的管理員可以監控及管理與你的工作資料夾相關聯的應用程式和資料，包括設定、權限、公司系統權限、網路活動，以及裝置的位置資訊。"</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"你的管理員可以監控及管理與這位使用者相關聯的應用程式和資料，包括設定、權限、公司系統權限、網路活動，以及裝置的位置資訊。"</string>
@@ -4336,7 +4383,7 @@
     <string name="cell_data_template" msgid="6077963976103260821">"<xliff:g id="AMOUNT">^1</xliff:g> 行動數據"</string>
     <string name="wifi_data_template" msgid="935934798340307438">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi 數據"</string>
     <string name="ethernet_data_template" msgid="1429173767445201145">"<xliff:g id="AMOUNT">^1</xliff:g> 乙太網路數據"</string>
-    <string name="billing_cycle" msgid="6618424022653876279">"數據警告與限制"</string>
+    <string name="billing_cycle" msgid="6618424022653876279">"數據用量警告與限制"</string>
     <string name="app_usage_cycle" msgid="341009528778520583">"行動數據用量週期"</string>
     <string name="cell_data_warning" msgid="5664921950473359634">"<xliff:g id="ID_1">^1</xliff:g> 數據用量警告"</string>
     <string name="cell_data_limit" msgid="256855024790622112">"<xliff:g id="ID_1">^1</xliff:g> 數據用量上限"</string>
@@ -4348,7 +4395,7 @@
       <item quantity="one">1 項限制</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"電信業者與裝置的數據計算方式可能有所不同"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"排除電信業者網路的數據用量"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"排除電信業者網路的數據用量"</string>
     <string name="data_used_template" msgid="8229342096562327646">"已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"設定數據用量警告"</string>
     <string name="data_warning" msgid="2925054658166062884">"數據用量警告"</string>
@@ -4685,7 +4732,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(已為使用者<xliff:g id="USER">%s</xliff:g>解除安裝)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(已為使用者<xliff:g id="USER">%s</xliff:g>停用)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"自動填入服務"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"自動、填入、自動填入"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"密碼"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"自動, 填寫, 自動填入, 密碼"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;請確定這是你信任的應用程式&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt;應用程式會根據你的畫面內容判斷要自動填入的內容。"</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"自動填入"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"記錄層級"</string>
@@ -4892,7 +4940,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"變更網路操作模式"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"偏好的網路類型"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"電信業者"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"設定版本"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"電信業者設定版本"</string>
     <string name="call_category" msgid="641461844504128789">"通話"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"電信業者視訊通話"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"選取系統"</string>
@@ -4930,7 +4978,7 @@
     <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"無法停用電信業者"</string>
     <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"發生錯誤，無法停用你的電信業者。"</string>
     <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"要使用 2 張 SIM 卡嗎？"</string>
-    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"這部裝置可以同時啟用 2 張 SIM 卡。如要繼續使用 1 張 SIM 卡，請輕觸 [不用了，謝謝]。"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"這部裝置可以同時使用 2 張 SIM 卡。如要繼續一次只使用 1 張 SIM 卡，請輕觸 [不用了，謝謝]。"</string>
     <string name="sim_action_restart_title" msgid="7054617569121993825">"要重新啟動裝置嗎？"</string>
     <string name="sim_action_restart_text" msgid="8019300474703571013">"如要開始使用，請重新啟動你的裝置。重新啟動後即可新增其他 SIM 卡。"</string>
     <string name="sim_action_continue" msgid="1688813133152389943">"繼續"</string>
@@ -4941,6 +4989,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"請移除 SIM 卡再重新插入，如果問題持續發生，請重新啟動裝置。"</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"請試著再次啟用 SIM 卡，如果問題持續發生，請重新啟動裝置。"</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"啟用網路"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"正在切換電信業者"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」已啟用"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"輕觸即可更新 SIM 卡設定"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"已切換成「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」"</string>
@@ -5101,8 +5150,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"關閉"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"網際網路"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM 卡"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"顯示飛航模式網路"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"在飛航模式下尋找網路，並在找到後連線。"</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"尋找 Wi-Fi 網路並建立連線"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"飛航, 飛航安全"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"通話和簡訊"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi 通話"</string>
@@ -5116,22 +5164,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"無法使用"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"暫時無法使用"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"沒有 SIM 卡"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"偏好設定"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"網路偏好設定"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"連線至公用網路"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"網路連線, 網際網路, 無線, 行動數據, wifi, wi-fi, wi fi, 行動網路, 行動, 電信業者, 4g, 3g, 2g, lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"查看飛航模式網路"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"查看飛航模式網路"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"開啟網路"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"關閉網路"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"要重設網際網路嗎？"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"通話將因此結束"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"通話將因此結束"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"正在重設網際網路…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"修正連線"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"目前可以使用飛航模式網路"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"如要切換網路，請中斷乙太網路連線"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"連上乙太網路後就無法切換到其他網路"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"飛航模式網路"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"已連線"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"不會自動連上網際網路"</string>
@@ -5152,6 +5199,10 @@
     <string name="category_name_color" msgid="937514550918977151">"色彩"</string>
     <string name="category_name_others" msgid="2366006298768550310">"其他"</string>
     <string name="category_name_general" msgid="7737273712848115886">"一般"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"查看所有應用程式"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"智慧轉接"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"智慧轉接功能已啟用"</string>
@@ -5165,4 +5216,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"輸入手機號碼"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"缺少電話號碼。"</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"確定"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"允許啟用 2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"使用 2G 行動網路連線。撥打緊急電話時，2G 連線會一律保持啟用狀態。"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index ae6409e..29ee493 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -52,9 +52,8 @@
     <string name="font_size_summary" msgid="1296835853522566260">"Yenza umbhalo okusikrini ube mncane noma mkhulu."</string>
     <string name="font_size_make_smaller_desc" msgid="4978038055549590140">"Yenza kube kuncane"</string>
     <string name="font_size_make_larger_desc" msgid="5583046033381722247">"Yenza kube kukhulu"</string>
-    <!-- no translation found for auto_rotate_settings_primary_switch_title (1150797732067921015) -->
-    <skip />
-    <!-- no translation found for smart_rotate_text_headline (9147653205505671866) -->
+    <string name="auto_rotate_settings_primary_switch_title" msgid="1150797732067921015">"Sebenzisa ukuphenduka okuzenzakalelayo"</string>
+    <!-- no translation found for smart_rotate_text_headline (4775952278533715352) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="1173103737980511652">"Isampuli yombhalo"</string>
     <string name="font_size_preview_text_title" msgid="6363561029914452382">"I-The Wonderful Wizard of Oz"</string>
@@ -405,15 +404,21 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ukusethwa kwezigxivizo zeminwe</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="521797365974277693">"Vula ngezigxivizo zeminwe"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="7931650601996313070">"Setha isigxivizo sakho somunwe"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="1911710308293783998">"Sebenzisa izigxivizo zeminwe zakho"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="1467469714658873533">"Vese nje uthinte inzwa yezigxivizo zeminwe ukuvula ifoni yakho, ukugunyaza ukuthenga, noma ukungena kwizinhlelo zokusebenza. Qaphela ukuthi wengeza izigxivizo zeminwe zikabani. Ngisho nesigxivizo esisodwa esengeziwe singenza noma yikuphi kwalezi zinto."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message" msgid="6527850754691662946">"Izigxivizo zakho zeminwe zingase zingavikeleki kakhulu kunephethini enamandla noma Iphinikhodi."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1" msgid="6808124116419325722">"Uwena olawulayo"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2" msgid="5663733424583416266">"Cabanga njalo"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1" msgid="7817635368506064516">"Idatha erekhodwe Ngesigxivizo somunwe igcinwa iphephile futhi ayilokothi ishiye ifoni yakho. Ungasusa idatha yakho noma nini Kumasethingi."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2" msgid="3507618608004123384">"Izigxivizo zakho zeminwe zingase zingavikeleki kakhulu kunephethini enamandla noma Iphinikhodi."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default" msgid="4757472591076060066">"Ifoni yakho izolokhu isebenzisa izithombe zesigxivizo sakho somunwe sakamuva ukudala amamodeli wesigxivizo somunwe esithuthukile."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Sebenzisa isigxivizo zomunwe zakho ukuze uvule ifoni yakho noma uvume ukuthenga.\n\nInothi: Awukwazi ukusebenzisa isigxivizo somunwe ukuvula le divayisi. Ngolwazi olubanzi, xhumana nomlawuli wenhlangano yakho."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Sebenzisa izigxivizo zeminwe zakho ukuvula ifoni yakho noma uvume ukuthenga.\n\nInothi: Isigxivizo sakho somunwe singaphepha kancane kunephethini eqinile nomai-PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Khansela"</string>
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Cha ngiyabonga"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_skip" msgid="5872407576778683426">"Yeqa"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Qhubeka"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_agree" msgid="8794474744336329962">"Vuma"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Yeqa"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Okulandelayo"</string>
     <string name="setup_fingerprint_enroll_skip_title" msgid="2473807887676247264">"Yeqa izigxivizo zeminwe?"</string>
@@ -430,16 +435,25 @@
     <string name="skip_lock_screen_dialog_button_label" msgid="641984698150020591">"Yeqa"</string>
     <string name="cancel_lock_screen_dialog_button_label" msgid="1801132985957491690">"Khansela"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="886085239313346000">"Thinta inzwa"</string>
+    <string name="security_settings_udfps_enroll_find_sensor_title" msgid="3006622174004843183">"Thinta futhi ubambe isithonjana sesigxiviso somunwe"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="6160543980992596286">"Kusemuva kwefoni yakho. Sebenzisa umunwe wakho wokukhomba."</string>
-    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="1181700918690345832">"Isesikrinini. Funa izigxivizo zeminwe ezinomjikelezo okhanyayo."</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message" msgid="4465918668053824340">"Inzwa yesigxivizo seminwe isesikrinini sakho. Hambisa umunwe wakho esikrinini ukusithola."</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="3065850549419750523">"Ukuvezwa ngedivayisi ngendawo yenzwa yezigxivizo zeminwe"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7298812463228440333">"Igama"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4074335979239208021">"KULUNGILE"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Susa"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Thinta inzwa"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Beka umunwe wakho kunzwa uphinde uphakamise ngemuva kokuthi uzwe ukudlidliza"</string>
+    <!-- no translation found for security_settings_udfps_enroll_start_message (8857415507387969667) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Phakamisa, bese uthinte futhi"</string>
+    <!-- no translation found for security_settings_udfps_enroll_title_one_more_time (424937043843482410) -->
+    <skip />
+    <!-- no translation found for security_settings_udfps_enroll_repeat_title_touch_icon (3927493571554716278) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Qhubeka nokuphakamisa umunwe wakho ukuze ungeze izingxenye ezahlukahlukene zezigxiviso zeminwe zakho"</string>
+    <!-- no translation found for security_settings_udfps_enroll_repeat_message (5871443926818416176) -->
+    <skip />
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Izigxivizo zeminwe zingeziwe"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Uma ubona lesi sithonjana, sebenzisa izigxivizo zeminwe zakho ngokukhonjwa noma uvumele ukuthengwa"</string>
     <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3004786457919122854">"Yenza kamuva"</string>
@@ -1176,14 +1190,10 @@
     <string name="search_settings" msgid="7573686516434589771">"Sesha"</string>
     <string name="display_settings" msgid="7197750639709493852">"Ukubukeka"</string>
     <string name="accelerometer_title" msgid="7745991950833748909">"Phendula iskrini ngokuzenzakalela"</string>
-    <!-- no translation found for auto_rotate_option_off (2788096269396290731) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_on (5776678230808498171) -->
-    <skip />
-    <!-- no translation found for auto_rotate_option_face_based (3438645484087953174) -->
-    <skip />
-    <!-- no translation found for auto_rotate_switch_face_based (7824467067774120000) -->
-    <skip />
+    <string name="auto_rotate_option_off" msgid="2788096269396290731">"Valiwe"</string>
+    <string name="auto_rotate_option_on" msgid="5776678230808498171">"Vuliwe"</string>
+    <string name="auto_rotate_option_face_based" msgid="3438645484087953174">"Vuliwe - Kususelwe kubuso"</string>
+    <string name="auto_rotate_switch_face_based" msgid="7824467067774120000">"Nika amandla ukutholwa kobuso"</string>
     <string name="color_mode_title" msgid="8666690832113906028">"Imibala"</string>
     <string name="color_mode_option_natural" msgid="6192875655101283303">"Kwemvelo"</string>
     <string name="color_mode_option_boosted" msgid="4698797857766774289">"I-Boost"</string>
@@ -1228,7 +1238,10 @@
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Kuvuliwe / Isikrini ngeke size sivaleke uma usibhekile"</string>
     <string name="adaptive_sleep_summary_off" msgid="5272156339202897523">"Valiwe"</string>
     <string name="adaptive_sleep_title_no_permission" msgid="1719759921214237016">"Ukufinyelela kwekhamera kuyadingeka"</string>
-    <string name="adaptive_sleep_summary_no_permission" msgid="5107880175176848307">"Thepha ukuze uphathe izimvume Zemisebenzi Yokuqondanisa Insiza Nezidingo Zomsebenzisi"</string>
+    <!-- no translation found for adaptive_sleep_summary_no_permission (5822591289468803691) -->
+    <skip />
+    <!-- no translation found for adaptive_sleep_manage_permission_button (1404510197847664846) -->
+    <skip />
     <string name="adaptive_sleep_description" msgid="1835321775327187860">"Ivimbela isikrini sakho ekuvalweni uma usibhekile"</string>
     <string name="adaptive_sleep_privacy" msgid="7664570136417980556">"Ukunaka isikrini kusebenzisa ikhamera engaphambili ukuze kwazi uma umuntu othile abheka isikrini. Kusebenza kudivayisi, futhi izithombe azilokothi zilondolozwe noma zithunyelwe ku-Google."</string>
     <string name="adaptive_sleep_contextual_slice_title" msgid="7467588613212629758">"Vula ukunaka isikrini"</string>
@@ -1309,7 +1322,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Uma isikrini simnyama, sizokhanya ngokuqondene nesaziso ezintsha"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Bonisa njalo isikhathi nolwazi"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Ukusebenza kwebhethri kukhulisiwe"</string>
-    <string name="force_bold_text" msgid="3636373986786504634">"Umbhalo Ogqamile"</string>
+    <string name="force_bold_text" msgid="4620929631102086716">"Umbhalo ogqamile"</string>
     <string name="title_font_size" msgid="570613010306330622">"Usayizi wefonti"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Yenza umbhalo ube mkhulu noma ube mncane"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Izilungiselelo zokuvala ikhadi le-SIM"</string>
@@ -1478,6 +1491,11 @@
     <string name="storage_other_users" msgid="7017206190449510992">"Abanye abasebenzisi"</string>
     <string name="storage_internal_title" msgid="3265098802217660829">"Isitoreji sedivayisi"</string>
     <string name="storage_external_title" msgid="8984075540312137135">"Isitoreji esincane"</string>
+    <string name="alarms_and_reminders_label" msgid="8103111654170690088">"Ama-alamu nezikhumbuzi"</string>
+    <string name="alarms_and_reminders_switch_title" msgid="4462627719161866171">"Vumela ukusetha ama-alamu noma izikhumbuzi"</string>
+    <string name="alarms_and_reminders_title" msgid="5296823629394843360">"Ama-alamu nezikhumbuzi"</string>
+    <string name="alarms_and_reminders_footer_title" msgid="5527294963734043995">"Vumela lolu hlelo lokusebenza ukuthi luhlele ama-alamu noma eminye imicimbi esuselwe esikhathini. Lokhu kuzovumela uhlelo lokusebenza ukuthi livuke futhi lisebenze lapho ungasebenzisi idivayisi. Qaphela ukuthi ukuhoxisa le mvume kungase kubangele ukuthi uhlelo lokusebenza lungasebenzi kahle, ngokukhethekile noma yimaphi ama-alamu lawo uhlelo lokusebenza eliwahlelile ngeke esasebenza."</string>
+    <string name="keywords_alarms_and_reminders" msgid="3886835524865727135">"ishejuli, i-alamu, isikhumbuzi, umcimbi"</string>
     <string name="storage_volume_summary" msgid="7087627975196777994">"<xliff:g id="USED">%1$s</xliff:g> okusetshenzisiwe kokungu-<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="1155308277890194878">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="5031288167242496837">"Okusetshenzisiwe kokungu-<xliff:g id="TOTAL">%1$s</xliff:g>"</string>
@@ -1728,30 +1746,31 @@
     <string name="location_category_location_services" msgid="8163798686832434284">"Amasevisi wendawo"</string>
     <string name="location_title" msgid="5819154746934945021">"Indawo Yami"</string>
     <string name="managed_profile_location_switch_title" msgid="1265007506385460066">"Indawo yephrofayela yokusebenza"</string>
-    <string name="location_app_level_permissions" msgid="45436724900423656">"Ukufinyelela kohlelo lokusebenza endaweni"</string>
+    <!-- no translation found for location_app_level_permissions (2564952469115758172) -->
+    <skip />
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Indawo ivaliwe"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> kwezinhlelo zokusebenza ezingu-<xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ezinokufinyelela kundawo</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> kwezinhlelo zokusebenza ezingu-<xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ezinokufinyelela kundawo</item>
     </plurals>
-    <string name="location_category_recent_location_access" msgid="7880996987927703141">"Ukufinyelela kwendawo kwakamuva"</string>
+    <!-- no translation found for location_category_recent_location_access (5714810433940253725) -->
+    <skip />
+    <!-- no translation found for location_recent_location_access_see_all (4203102419355323325) -->
+    <skip />
     <string name="location_recent_location_access_view_details" msgid="5803264082558504544">"Buka imininingwane"</string>
     <string name="location_no_recent_apps" msgid="6814206631456177033">"Azikho izinhlelo zokusebenza ezicele indawo kamuva nje"</string>
     <string name="location_no_recent_accesses" msgid="6031735777805464247">"Ayikho indawo yezinhlelo zokusebenza ezifinyelelwe kamuva nje"</string>
     <string name="location_high_battery_use" msgid="4277318891200626524">"Ukusebenzisa ibhethri okuphezulu"</string>
     <string name="location_low_battery_use" msgid="5218950289737996431">"Ukusebenzisa ibhethri okuphansi"</string>
-    <string name="location_scanning_screen_title" msgid="2346125609614249968">"I-Wi-Fi nokuskena kwe-Bluetooth"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="5004781272733434794">"Ukuskena kwe-Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="6236055656376931306">"Vumela izinhlelo zokusebenza namasevisi ukuthi askenele amanethiwekhi e-Wi-Fi noma kunini, nanoma i-Wi-Fi ivaliwe. Lokhu kungasetshenziselwa, njengesibonelo, ukuthuthukisa izici ezisuselwa endaweni namasevisi."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Ukuskena kwe-Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Vumela izinhlelo zokusebenza namasevisi ukuthi askenele amadivayisi aseduze noma kunini, nanoma i-Bluetooth ivaliwe. Lokhu kungasetshenziselwa, njengesibonelo, ukuthuthukisa izici ezisuselwa endaweni namasevisi."</string>
+    <string name="location_services_screen_title" msgid="9204334551361202877">"Amasevisi endawo"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Amasevisi endawo omsebenzi"</string>
-    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Ukutholwa kwendawo yezoni yesikhathi"</string>
-    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Ukutholwa kwendawo yezoni yesikhathi"</string>
-    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Kuvumela indawo yedivayisi ukuba isetshenziselwe ukuthola izoni yesikhathi samanje. Amanye amasethingi endawo njengokuskena kwe-Wi-Fi angathinta ukunemba kokutholwa kwezoni yesikhathi."</string>
-    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Vuliwe"</string>
-    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Valiwe"</string>
-    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Ukutholwa okuzenzakalelayo kwendawo yesikhathi kukhutshaziwe"</string>
+    <!-- no translation found for location_time_zone_detection_toggle_title (6518338597250564260) -->
+    <skip />
+    <string name="location_time_zone_detection_auto_is_off" msgid="6264253990141650280">"Izoni yesikhathi ezenzekelayo ivaliwe"</string>
     <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Ukutholwa kwendawo yezoni yesikhathi kukhutshaziwe"</string>
     <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Ukutholwa kwendawo yezoni yesikhathi akusekelwe"</string>
     <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Izinguquko zokutholwa kwendayo yezoni yesikhathi azivunyelwe"</string>
@@ -1930,10 +1949,10 @@
     <string name="enable_text" msgid="8570798764647110430">"Vumela"</string>
     <string name="clear_user_data_text" msgid="6773186434260397947">"Sula isitoreji"</string>
     <string name="app_factory_reset" msgid="8974044931667015201">"Khipha izibuyekezo"</string>
-    <string name="auto_launch_enable_text" msgid="286244432074382294">"Ukhethe ukufaka lolu hlelo lokusebenza ngokuzenzekelayo kwezinye izinhlelo zokwenziwayo."</string>
+    <string name="auto_launch_enable_text" msgid="8912714475823807798">"Eminye imisebenzi oyikhethile ivuleka kule app ngokuzenzakalelayo."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="2069415023986858324">"Uvumele loluhlelo lokusebenza ukuthi lwenze amawijethi nokuthi kufinyelelwe kwidatha yawo."</string>
     <string name="auto_launch_disable_text" msgid="502648841250936209">"Akukho okuzenzakalelayo okusethiwe."</string>
-    <string name="clear_activities" msgid="341345438786077236">"Sula okuzenzakalelayo"</string>
+    <string name="clear_activities" msgid="488089228657585700">"Sula okuncanyelwayo okuzenzakalelayo"</string>
     <string name="screen_compatibility_text" msgid="5915767835411020274">"Lolu hlelo lokusebenza kungenzeka aludalelwanga isikrini sakho; ungaphatha ukuthi ima kanjani esikrinini sakho lana."</string>
     <string name="ask_compatibility" msgid="8388397595148476565">"Buza lapho isiqalisiwe"</string>
     <string name="enable_compatibility" msgid="1163387233622859712">"Lungisa uhlelo lokusebenza"</string>
@@ -2145,7 +2164,9 @@
     <string name="vision_settings_description" msgid="7614894785054441991">"Ungenza ngendlela oyifisayo le divayisi ukuze ihlangabezane nezidingo zakho. Lezi zici ezingafinyeleleka zingashintshwa ngemuva kwesikhathi kuzilungiselelo."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Shintsha usayizi wefonti"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Izifundi zesikrini"</string>
-    <string name="audio_and_captions_category_title" msgid="5049122378290004050">"Umsindo nombhalo okusikrini"</string>
+    <string name="captions_category_title" msgid="574490148949400274">"Amagama-ncazo"</string>
+    <string name="audio_category_title" msgid="5283853679967605826">"Umsindo"</string>
+    <string name="general_category_title" msgid="6298579528716834157">"Okuvamile"</string>
     <string name="display_category_title" msgid="6638191682294461408">"Bonisa"</string>
     <string name="accessibility_text_and_display_title" msgid="1398507755501334961">"Umbhalo nesibonisi"</string>
     <string name="accessibility_turn_screen_darker_title" msgid="5986223133285858349">"Yenza isikrini sibe mnyama"</string>
@@ -2298,7 +2319,7 @@
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Okubomvu-okuluhlaza okotshani"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Okubomvu-okuluhlaza okotshani"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Okuluhlaza okwesibhakabhaka-okuphuzi"</string>
-    <string name="reduce_bright_colors_preference_title" msgid="5249275952895378507">"Nciphisa ukukhanya"</string>
+    <string name="reduce_bright_colors_preference_title" msgid="8004574775504450263">"Nciphisa ukukhanya"</string>
     <string name="reduce_bright_colors_preference_summary" product="default" msgid="3824406431092247331">"Yenza isikrini sibe mnyama kakhulu kunokukhanya okuphansi kwefoni yakho"</string>
     <string name="reduce_bright_colors_preference_summary" product="tablet" msgid="867454382618040359">"Yenza isikrini sibe mnyama kakhulu kunokukhanya okuphansi kwethebulethi yakho"</string>
     <string name="reduce_bright_colors_preference_subtitle" product="default" msgid="7098993556258805657">"Qiniseka ukuthi isikrini simnyama ukuze kube lula ukufunda.&lt;br/&gt;&lt;br/&gt; Lokhu kungaba usizo lapho: &lt;ol&gt; &lt;li&gt; Ukukhanya okuphansi okuzenzakalelayo kwefoni yakho kusakhanya kakhulu&lt;/li&gt; &lt;li&gt; Usebenzisa ifoni yakho lapho kumnyama khona njengasebusuku noma egumbini elimnyama ngaphambi kokuyolala&lt;/li&gt; &lt;ol&gt;"</string>
@@ -3335,8 +3356,10 @@
     <string name="keywords_face_settings" msgid="1360447094486865058">"ubuso"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"izigxivizo zeminwe, engeza izigxivizo zeminwe"</string>
     <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"fiphalisa isikrini, isikrini sokuthinta, ibhethri, ukukhanya okuhlakaniphile, ukukhanya okuguqukayo, ukukhanya okuzenzakalelayo"</string>
-    <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"fiphalisa isikrini, lala, ibhethri, ukuphelelwa isikhathi, ukunaka, isiboniso, ukungasebenzi kwesikrini"</string>
-    <string name="keywords_auto_rotate" msgid="7914655570000378975">"zungezisa, phenya, ukupendukisa, i-portrait, i-landscape, umumo, okuqondile, okuvundlile"</string>
+    <!-- no translation found for keywords_display_adaptive_sleep (4905300860114643966) -->
+    <skip />
+    <!-- no translation found for keywords_auto_rotate (7288697525101837071) -->
+    <skip />
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"thuthukisa, i-android"</string>
     <string name="keywords_zen_mode_settings" msgid="7810203406522669584">"i-dnd, ishejuli, izaziso, vimbela, thulisa, ukudlidliza, ukulala, ukusebenza, ukugxila, umsindo, thulisa, nsukuzonke, bonke ubusuko, umculo"</string>
     <string name="keywords_screen_timeout" msgid="8921857020437540572">"isikrini, isikhathi sokukhiya, ukuphela kwesikhathi, ukukhiya isikrini"</string>
@@ -3505,9 +3528,10 @@
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Amaringithoni"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Eminye imisindo nokudlidliza"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Izaziso"</string>
+    <string name="conversation_notifs_category" msgid="2549844862379963273">"Ingxoxo"</string>
     <string name="recent_notifications" msgid="1105631022180160436">"Kuthunyelwe kamuva nje"</string>
     <string name="recent_notifications_see_all_title" msgid="3087299996651692987">"Bona kone kusuka ezinsukwini ezingu-7 zokugcina"</string>
-    <string name="advanced_section_header" msgid="6003255455888626056">"Okuthuthukisiwe"</string>
+    <string name="advanced_section_header" msgid="6478709678084326738">"Okuvamile"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Izaziso zomsebenzi"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Izaziso eziguqukayo"</string>
     <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Ukubaluleka kwesaziso sokujwayela"</string>
@@ -3569,7 +3593,7 @@
     <string name="gentle_notifications_display_summary_shade_status_lock" msgid="2068738866725616212">"Iboniswa kumthunzi wokudonselwa phansi, ibha yesimo nokukhiywa kwesikrini"</string>
     <string name="silent_notifications_status_bar" msgid="6113307620588767516">"Fihla izaziso ezithulile kubha yesimo"</string>
     <string name="notification_pulse_title" msgid="8013178454646671529">"Cwabizisa ukukhanya"</string>
-    <string name="lock_screen_notifications_title" msgid="3063951257121435570">"Izaziso esikrinini sokukhiya"</string>
+    <string name="lock_screen_notifications_title" msgid="2876323153692406203">"Ubumfihlo"</string>
     <string name="lockscreen_bypass_title" msgid="6519964196744088573">"Yeqa ukuze ukhiye isikrini"</string>
     <string name="lockscreen_bypass_summary" msgid="6688592486830491144">"Ngemuva kwe-face unlock, hamba ngokuqondile kusikrini sokugcina esisetshenzisiwe"</string>
     <string name="keywords_lockscreen_bypass" msgid="41035425468915498">"Khiya isikrini, ukukhiya isikrini, yeqa, dlula"</string>
@@ -3658,7 +3682,8 @@
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> izaziso zanjalo ngeviki</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Soze"</string>
-    <string name="manage_notification_access_title" msgid="4714320299084782521">"Ukufinyelela isaziso"</string>
+    <string name="manage_notification_access_title" msgid="6481256069087219982">"Idivayisi nezaziso ze-app"</string>
+    <string name="manage_notification_access_summary" msgid="8635826778429714415">"Lawula ukuthi yiziphi izaziso ezibonakala kuma-app namadivayisi akho"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8643809206612366067">"Ukufinyelela kuzaziso zephrofayela yomsebenzi zivinjelwe"</string>
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Izinhlelo zokusebenza azikwazi ukufunda izaziso"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
@@ -3677,17 +3702,17 @@
     <string name="notification_listener_disable_warning_confirm" msgid="841492108402184976">"Vala"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8802784105045594324">"Khansela"</string>
     <string name="notification_listener_type_title" msgid="2791552789364336733">"Izinhlobo zezaziso ezivumelekile"</string>
-    <string name="notif_type_ongoing" msgid="2295338067608686711">"Izaziso eziqhubekayo ezibalulekile"</string>
-    <string name="notif_type_conversation" msgid="3014259738224129504">"Izaziso zengxoxo"</string>
-    <string name="notif_type_alerting" msgid="2300039323822104165">"Izaziso zokuxwayisa"</string>
-    <string name="notif_type_silent" msgid="2514763073653979199">"Thulisa izaziso"</string>
-    <!-- no translation found for notif_listener_excluded_title (639103158747320529) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_zero (5152444145866958400) -->
-    <skip />
-    <!-- no translation found for notif_listener_excluded_summary_nonzero (3218891004546748617) -->
-    <!-- no translation found for notif_listener_excluded_app_title (8102477888511595023) -->
-    <skip />
+    <string name="notif_type_ongoing" msgid="135675014223627555">"Isikhathi sangempela"</string>
+    <string name="notif_type_ongoing_summary" msgid="3412379452346027089">"Ingxoxo yesikhathi sangempela evela kuma-app asetshenziswayo, ukuzulazula, amakholi wefoni, nokuningi"</string>
+    <string name="notif_type_conversation" msgid="4383931408641374979">"Izingxoxo"</string>
+    <string name="notif_type_conversation_summary" msgid="897491668422411641">"I-SMS nezinye izingxoxo"</string>
+    <string name="notif_type_alerting" msgid="4225291983925409612">"Zenzekela"</string>
+    <string name="notif_type_alerting_summary" msgid="6823969073567000728">"Izaziso ezingakhala noma zidlidlize ngokusekelwe kumasethingi"</string>
+    <string name="notif_type_silent" msgid="6273951794420331010">"Kuthulile"</string>
+    <string name="notif_type_silent_summary" msgid="7820923063105060844">"Izaziso ezingalokothi zenze umsindo noma ukudlidliza"</string>
+    <string name="notif_listener_excluded_app_title" msgid="6679316209330349730">"Bona wonke ama-app"</string>
+    <string name="notif_listener_excluded_app_summary" msgid="8552707617269767363">"Shintsha amasethingi esaziso ku-app ngayinye engathumela izaziso"</string>
+    <string name="notif_listener_excluded_app_screen_title" msgid="8636196723227432994">"Ama-app aboniswe kudivayisi"</string>
     <string name="vr_listeners_title" msgid="4960357292472540964">"Amasevisi omsizi we-VR"</string>
     <string name="no_vr_listeners" msgid="8442646085375949755">"Azikho izinhlelo zokusebenza ezifakiwe ezicele ukusetshenziswa njengamasevisi wesisizi se-VR."</string>
     <string name="vr_listener_security_warning_title" msgid="7026351795627615177">"Vumela isevisi ye-VR ukufinyelela i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -3975,9 +4000,30 @@
     <string name="launch_by_default" msgid="892824422067985734">"Vula ngokuzenzakalelayo"</string>
     <string name="app_launch_domain_links_title" msgid="6702041169676128550">"Ivula izixhumanisi"</string>
     <string name="app_launch_open_domain_urls_title" msgid="4805388403977096285">"Vula izixhumanisi ezisekelwayo"</string>
+    <string name="app_launch_top_intro_message" msgid="750361600458377823">"Izixhumanisi zosekelo zivuleka kule app"</string>
+    <string name="app_launch_links_category" msgid="2380467163878760037">"Izixhumanisi zokuvula le app"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="3609156836041234957">"Vula ngaphandle kokubuza"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="5088779668667217369">"Izixhumanisi ezisekelwayo"</string>
-    <string name="app_launch_other_defaults_title" msgid="3296350563585863885">"Okunye okuzenzakalelayo"</string>
+    <string name="app_launch_other_defaults_title" msgid="5674385877838735586">"Okunye okuncanyelwayo okuzenzakalelayo"</string>
+    <string name="app_launch_add_link" msgid="8622558044530305811">"Engeza isixhumanisi"</string>
+    <string name="app_launch_footer" msgid="2294418640866849774">"I-app ingaqinisekisa izixhumanisi ukuba zivuleke ngokuzenzakalelayo ku-app. "<annotation id="url">"Funda kabanzi"</annotation></string>
+    <plurals name="app_launch_verified_links_title" formatted="false" msgid="3945301449178587783">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> izixhumanisi eziqinisekisiwe</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> izixhumanisi eziqinisekisiwe</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message" formatted="false" msgid="1209292155940482111">
+      <item quantity="one">Lezi zixhumanisi ziqinisekisiwe futhi zivula le app ngokuzenzakalelayo.</item>
+      <item quantity="other">Lezi zixhumanisi ziqinisekisiwe futhi zivula le app ngokuzenzakalelayo.</item>
+    </plurals>
+    <string name="app_launch_dialog_ok" msgid="1446157681861409861">"KULUNGILE"</string>
+    <string name="app_launch_checking_links_title" msgid="6119228853554114201">"Ihlola ezinye izixhumanisi ezisekelwayo…"</string>
+    <string name="app_launch_dialog_cancel" msgid="6961071841814898663">"Khansela"</string>
+    <plurals name="app_launch_supported_links_title" formatted="false" msgid="8579323750839397568">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> izixhumanisi ezisekelwayo</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> izixhumanisi ezisekelwayo</item>
+    </plurals>
+    <string name="app_launch_supported_links_add" msgid="3271247750388016131">"Engeza"</string>
+    <string name="app_launch_supported_links_subtext" msgid="4268004019469184113">"Ivula ngomhla ka-<xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="storage_summary_format" msgid="5721782272185284276">"<xliff:g id="SIZE">%1$s</xliff:g> isetshenziwe ku-<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>"</string>
     <string name="storage_type_internal" msgid="979243131665635278">"isitoreji sangaphakathi"</string>
     <string name="storage_type_external" msgid="125078274000280821">"isitoreji sangaphandle"</string>
@@ -4272,7 +4318,8 @@
     <string name="disabled_by_policy_title_camera" msgid="8567781468959299078">"Ikhamera ayivunyelwe"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="6137746705692573992">"Isithombe-skrini asivunyelwe"</string>
     <string name="disabled_by_policy_title_suspend_packages" msgid="4223983156635729793">"Ayikwazi ukuvula lolu hlelo lokusebenza"</string>
-    <string name="default_admin_support_msg" msgid="8338570262037182531">"Uma unemibuzo, xhumana nomlawuli wakho we-IT"</string>
+    <!-- no translation found for disabled_by_policy_title_financed_device (2328740314082888228) -->
+    <skip />
     <string name="admin_support_more_info" msgid="8407433155725898290">"Imininingwane engaphezulu"</string>
     <string name="admin_profile_owner_message" msgid="8860709969532649195">"Umqondisi wakho angakwazi ukwengamela futhi aphathe izinhlelo zokusebenza nedatha ephathelene nephrofayela yakho yomsebenzi kufaka phakathi izilungiselelo, izimvume, ukufinyelela kwezinkampani, umsebenzi wenethiwekhi kanye nolwazi lwedivayisi yakho."</string>
     <string name="admin_profile_owner_user_message" msgid="4929926887231544950">"Umqondisi wakho angakwazi ukwengamela futhi aphathe izinhlelo zokusebenza nedatha ephathelene nalo msebenzisi, kufaka phakathi izilungiselelo, izimvume, ukufinyelela kwezinkampani, umsebenzi wenethiwekhi kanye nolwazi lwendawo ledivayisi yakho."</string>
@@ -4349,7 +4396,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> imikhawulo</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Ukubalwa kwedatha yenkampani yenethiwekhi kungahluka kusuka ekubaleni kwedivayisi"</string>
-    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ngaphandle kwedatha esetshenziswa amanethiwekhi wenkampani yenethiwekhi"</string>
+    <string name="non_carrier_data_usage_warning" msgid="4707184871368847697">"Ayifaki phakathi idatha esetshenziswe izinkampani zenethiwekhi"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> okusetshenzisiwe"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Setha isexwayiso sedatha"</string>
     <string name="data_warning" msgid="2925054658166062884">"Isexwayiso sedatha"</string>
@@ -4686,7 +4733,8 @@
     <string name="webview_uninstalled_for_user" msgid="627352948986275488">"(kukhishelwe umsebenzisi ongu-<xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="5809886172032644498">"(kukhutshazelwe umsebenzisi ongu-<xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7595308061826307921">"Isevisi yokugcwalisa ngokuzenzakalela"</string>
-    <string name="autofill_keywords" msgid="6260653325195017912">"okuzenzakalelayo, gcwalisa, ukugcwalisa okuzenzakalelayo"</string>
+    <string name="autofill_passwords" msgid="6708057251459761083">"Amaphasiwedi"</string>
+    <string name="autofill_keywords" msgid="8598763328489346438">"okuzenzakalelayo, gcwalisa, gcwalisa ngokuzenzakalelayo, iphasiwedi"</string>
     <string name="autofill_confirmation_message" msgid="4888767934273494272">"&lt;b&gt;Qiniseka ukuthi wethemba lolu hlelo lokusebenza&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; isebenzisa okusesikrinini sakho ukunquma okungagcwaliswa ngokuzenzakalela."</string>
     <string name="debug_autofill_category" msgid="5998163555428196185">"Ukugcwalisa okuzenzakalelayo"</string>
     <string name="autofill_logging_level_title" msgid="3733958845861098307">"Ileveli lokuloga"</string>
@@ -4893,7 +4941,7 @@
     <string name="preferred_network_mode_summary" msgid="537577807865497546">"Shintsha imodi esebenzayo yenethiwekhi"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4179420486180351631">"Uhlobo lwenethiwekhi oluncamelayo"</string>
     <string name="carrier_settings_euicc" msgid="1541279297111378907">"Inkampani yenethiwekhi"</string>
-    <string name="carrier_settings_version" msgid="4738147451583140935">"Inguqulo yezilungiselelo"</string>
+    <string name="carrier_settings_version" msgid="3364919669057317776">"Inguqulo yamasethingi wenkampani yenethiwekhi"</string>
     <string name="call_category" msgid="641461844504128789">"Iyashaya"</string>
     <string name="video_calling_settings_title" msgid="5490466306783552190">"Ukushaya kwevidiyo kwenkampani yenethiwekhi"</string>
     <string name="cdma_system_select_title" msgid="8261408056382123386">"Ukukhetha isistimu"</string>
@@ -4942,6 +4990,7 @@
     <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Khipha i-SIM yakho bese uyifake futhi. Inkinga iyaqhubeka, qala kabusha idivayisi yakho."</string>
     <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Zama ukuvula i-SIM futhi. Inkinga iyaqhubeka, qala kabusha idivayisi yakho."</string>
     <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ukwenziwa kusebenze kwenethiwekhi"</string>
+    <string name="sim_switch_channel_id" msgid="4927038626791837861">"Ukushintsha inkampani yenethiwekhi"</string>
     <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"I-<xliff:g id="CARRIER_NAME">%1$s</xliff:g> iyasebenza"</string>
     <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Thepha ukuze ubuyekeze izilungiselelo ze-SIM"</string>
     <string name="switch_to_removable_notification" msgid="7640342063449806296">"Ishintshelwe ku-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
@@ -5102,8 +5151,7 @@
     <string name="bluetooth_setting_off" msgid="4965493913199554789">"Valiwe"</string>
     <string name="provider_internet_settings" msgid="3831259474776313323">"I-inthanethi"</string>
     <string name="provider_network_settings_title" msgid="2624756136016346774">"Ama-SIM"</string>
-    <string name="airplane_safe_networks" msgid="6057114281183247124">"Bonisa amanethiwekhi wemodi yendiza"</string>
-    <string name="airplane_safe_networks_summary" msgid="4879620804022818385">"Thola futhi uxhume kumanethiwekhi wemodi yendiza."</string>
+    <string name="wifi_switch_summary" msgid="3577154777754849024">"Funa futhi uxhume kumanethiwekhi we-Wi‑Fi"</string>
     <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"indiza, kuphephile kwindiza"</string>
     <string name="calls_and_sms" msgid="1931855083959003306">"Amakholi ne-SMS"</string>
     <string name="calls_and_sms_category" msgid="2021321997884906046">"Ukushaya kwe-Wi‑Fi"</string>
@@ -5117,22 +5165,21 @@
     <string name="calls_sms_unavailable" msgid="4055729705246556529">"ayitholakali"</string>
     <string name="calls_sms_temp_unavailable" msgid="8602291749338757424">"Akutholakali okwesikhashana"</string>
     <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ayikho i-SIM"</string>
-    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Okuncamelayo"</string>
+    <string name="network_and_internet_preferences_title" msgid="8635896466814033405">"Okuncamelayo kwenethiwekhi"</string>
     <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Xhuma kumanethiwekhi asesidlangalaleni"</string>
     <string name="keywords_internet" msgid="7674082764898690310">"uxhumano lenethiwekhi, i-inthanethi, okungenantambo, idatha, i-wifi, i-wi-fi, i-wi fi, iselula, iselula, inkampani yekholi, i-4g, i-3g, i-2g, i-lte"</string>
     <string name="view_airplane_safe_networks" msgid="9170023210981508906">"Buka amanethiwekhi wemodi yendiza"</string>
     <string name="viewing_airplane_mode_networks" msgid="4548508852659577531">"Ukubuka amanethiwekhi wemodi yendiza"</string>
-    <string name="turn_on_networks" msgid="7786747178388835577">"Vula amanethiwekhi"</string>
-    <string name="turn_off_networks" msgid="886012600238121672">"Vala amanethiwekhi"</string>
+    <!-- no translation found for turn_on_wifi (4868116014727533668) -->
+    <skip />
     <string name="reset_your_internet_title" msgid="4856899004343241310">"Setha kabusha i-inthanethi yakho?"</string>
     <string name="reset_internet_text" product="default" msgid="8797910368942544453">"Lokhu kuzoqeda ikholi yakho yefoni"</string>
     <string name="reset_internet_text" product="tablet" msgid="8797910368942544453">"Lokhu kuzoqeda ikholi yakho yefoni"</string>
     <string name="resetting_internet_text" msgid="6696779371800051806">"Isetha kabusha i-inthanethi yakho…"</string>
     <string name="fix_connectivity" msgid="2781433603228089501">"Lungisa ukuxhumeka"</string>
-    <string name="airplane_mode_network_available" msgid="1059499681300395240">"Amanethiwekhi wemodi yendiza ayatholakala"</string>
     <string name="to_switch_networks_disconnect_ethernet" msgid="6615374552827587197">"Ukuze ushintshe amanethiwekhi, nqamula i-ethernet"</string>
-    <string name="cannot_switch_networks_while_connected" msgid="3867944849171754777">"Ayikwazi ukushintsha amanethiwekhi ngenkathi ixhunyiwe"</string>
-    <string name="airplane_mode_network_panel_title" msgid="6385046104863403604">"Amanethiwekhi wemodi yendiza"</string>
+    <!-- no translation found for wifi_is_turned_on_subtitle (4222869018808845600) -->
+    <skip />
     <string name="preference_summary_default_combination" msgid="4643585915107796253">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="NETWORKMODE">%2$s</xliff:g>"</string>
     <string name="mobile_data_connection_active" msgid="2422223108911581552">"Ixhunyiwe"</string>
     <string name="mobile_data_off_summary" msgid="3841411571485837651">"I-inthanethi ngeke ixhumeke ngokuzenzakalelayo"</string>
@@ -5153,6 +5200,10 @@
     <string name="category_name_color" msgid="937514550918977151">"Umbala"</string>
     <string name="category_name_others" msgid="2366006298768550310">"Abanye"</string>
     <string name="category_name_general" msgid="7737273712848115886">"Okuvamile"</string>
+    <!-- no translation found for dark_theme_main_switch_title (4045147031947562280) -->
+    <skip />
+    <!-- no translation found for bluetooth_main_switch_title (8409835540311309632) -->
+    <skip />
     <string name="default_see_all_apps_title" msgid="7481113230662612178">"Bona zonke izinhlelo zokusebenza"</string>
     <string name="smart_forwarding_title" msgid="8368634861971949799">"Ukudluliselwa phambili okuhlakaniphile"</string>
     <string name="smart_forwarding_summary_enabled" msgid="3341062878373185604">"Ukudlulisela phambili okusmathi kunikwe amandla"</string>
@@ -5166,4 +5217,6 @@
     <string name="smart_forwarding_input_mdn_dialog_title" msgid="7542216086697868415">"Faka inombolo yefoni"</string>
     <string name="smart_forwarding_missing_mdn_text" msgid="2907314684242542226">"Inombolo yefoni ayikho."</string>
     <string name="smart_forwarding_missing_alert_dialog_text" msgid="7870419247987316112">"KULUNGILE"</string>
+    <string name="enable_2g_title" msgid="8184757884636162942">"Vumela i-2G"</string>
+    <string name="enable_2g_summary" msgid="906487478332145407">"Sebenzisa uxhumano lweselula lwe-2G. Ukwenza amakholi aphuthumayo, i-2G ihlala njalo ivuliwe."</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 183dd1e..2057c50 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -966,6 +966,35 @@
         <item>-1</item>
     </integer-array>
 
+    <!-- Titles for the accessibility button location. [CHAR LIMIT=35] -->
+    <string-array name="accessibility_button_location_selector_titles">
+        <item>Floating over other apps</item>
+        <item>Navigation bar</item>
+    </string-array>
+
+    <!-- Values for the accessibility button location. -->
+    <!-- Should Keep in sync with Settings.Secure.ACCESSIBILITY_BUTTON_MODE_* -->
+    <string-array name="accessibility_button_location_selector_values" translatable="false">
+        <!-- Floating over other apps -->
+        <item>1</item>
+        <!-- Navigation bar -->
+        <item>0</item>
+    </string-array>
+
+    <!-- Titles for the accessibility button size. [CHAR LIMIT=35] -->
+    <string-array name="accessibility_button_size_selector_titles">
+        <item>Small</item>
+        <item>Large</item>
+    </string-array>
+
+    <!-- Values for the accessibility button size. -->
+    <string-array name="accessibility_button_size_selector_values" translatable="false" >
+        <!-- Small -->
+        <item>0</item>
+        <!-- Large -->
+        <item>1</item>
+    </string-array>
+
     <!-- Match this with the constants in VpnProfile. --> <skip />
     <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
     <string-array name="vpn_types" translatable="false">
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index f78120c..bde5288 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -170,6 +170,7 @@
     <declare-styleable name="LabeledSeekBarPreference">
         <attr name="textStart" format="reference" />
         <attr name="textEnd" format="reference" />
+        <attr name="tickMark" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="TintDrawable">
diff --git a/res/values/config.xml b/res/values/config.xml
index 57d5a75..984906f 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -503,4 +503,10 @@
 
     <!-- Whether to handle slot change events -->
     <bool name="config_handle_sim_slot_change">false</bool>
+
+    <!-- whether use partner overlay theme for outside setupwizard flow -->
+    <bool name="config_suc_use_partner_resource">false</bool>
+
+    <!-- Cell broacast receiver package name -->
+    <string name="config_cell_broadcast_receiver_package" translatable="false">com.android.cellbroadcastreceiver.module</string>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 16db908..dbf21fc 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -57,6 +57,8 @@
 
     <dimen name="color_mode_preview_height">320dp</dimen>
 
+    <dimen name="accessibility_button_preview_height">200dp</dimen>
+
     <dimen name="ring_progress_bar_thickness">4dp</dimen>
 
     <!-- Weight of the left pane in a multi-pane preference layout. -->
@@ -213,7 +215,7 @@
     <dimen name="wifi_detail_page_header_image_size">32dp</dimen>
 
     <!-- Internet Preferences -->
-    <dimen name="view_airplane_mode_networks_button_margin_vertical">24dp</dimen>
+    <dimen name="airplane_mode_message_margin_vertical">24dp</dimen>
     <dimen name="reset_internet_ring_progress_right_margin">4dp</dimen>
 
     <!-- Color picker -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 107ca38..46bd351 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -102,8 +102,7 @@
 
     <!-- Disclaimer for camera based rotate [CHAR_LIMIT=NONE] -->
     <string name="smart_rotate_text_headline">
-        Face based Autorotate uses the front camera to see if and how someone is looking at the screen. It allows
-        for reading while lying down and images are never stored or sent to Google.&lt;br>&lt;br>
+        Face Detection uses the front-facing camera to improve Auto-Rotate accuracy. Images are never stored or sent to Google.&lt;br>&lt;br>
        &lt;a href="<xliff:g example="http://www.google.com" id="url">http://support.google.com/mobile?p=telephony_rtt</xliff:g>">Learn more&lt;/a>
     </string>
     <string name="font_size_preview_text_headline">Sample text</string>
@@ -884,13 +883,21 @@
     <!-- message shown in summary field when no fingerprints are registered -->
     <string name="security_settings_fingerprint_preference_summary_none"></string>
     <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=29] -->
-    <string name="security_settings_fingerprint_enroll_introduction_title">Unlock with fingerprint</string>
-    <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature, when fingerprint unlock is disabed by device admin [CHAR LIMIT=40] -->
+    <string name="security_settings_fingerprint_enroll_introduction_title">Set up your fingerprint</string>
+    <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature, when fingerprint unlock is disabled by device admin [CHAR LIMIT=40] -->
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled">Use your fingerprint</string>
     <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
     <string name="security_settings_fingerprint_enroll_introduction_message">Just touch the fingerprint sensor to unlock your phone, authorize purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.</string>
+    <!-- Introduction title shown in the bottom of fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_1">You\u2019re in control</string>
+    <!-- Introduction title shown in the bottom of fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
+    <string name="security_settings_fingerprint_enroll_introduction_footer_title_2">Keep in mind</string>
     <!-- Introduction detail message shown in the bottom of fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
-    <string name="security_settings_fingerprint_enroll_introduction_bottom_message">Your fingerprint may be less secure than a strong pattern or PIN.</string>
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_1">The data recorded by Fingerprint is stored securely and never leaves your phone. You can delete your data anytime in Settings.</string>
+    <!-- Introduction detail message shown in the bottom of fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_2">Your fingerprint may be less secure than a strong pattern or PIN.</string>
+    <!-- Introduction detail message shown in the bottom of fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
+    <string name="security_settings_fingerprint_enroll_introduction_footer_message_3" product="default">Your phone will occasionally use your recent fingerprint images to create improved fingerprint models.</string>
     <!-- Introduction detail message shown in fingerprint enrollment dialog, when fingerprint unlock is disabled by device admin [CHAR LIMIT=NONE]-->
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled">Use your fingerprint to unlock your phone or approve purchases.\n\nNote: You can\u2019t use your fingerprint to unlock this device. For more information, contact your organization\u2019s admin.</string>
     <!-- Introduction detail message shown in fingerprint enrollment screen in setup wizard. [CHAR LIMIT=NONE]-->
@@ -899,8 +906,12 @@
     <string name="security_settings_fingerprint_enroll_introduction_cancel">Cancel</string>
     <!-- Button text to cancel enrollment [CHAR LIMIT=30] -->
     <string name="security_settings_fingerprint_enroll_introduction_no_thanks">No thanks</string>
+    <!-- Button text to skip enrollment [CHAR LIMIT=30] -->
+    <string name="security_settings_fingerprint_enroll_introduction_skip">Skip</string>
     <!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_enroll_introduction_continue">Continue</string>
+    <!-- Button text to agree the consent and continue to the next screen from the introduction [CHAR LIMIT=22] -->
+    <string name="security_settings_fingerprint_enroll_introduction_agree">Agree</string>
     <!-- Button text to cancel enrollment from the introduction (this string variant is used while in setup wizard) [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup">Skip</string>
     <!-- Button text to continue to the next screen from the introduction (this string variant is used while in setup wizard) [CHAR LIMIT=22] -->
@@ -933,10 +944,12 @@
     <string name="cancel_lock_screen_dialog_button_label">Cancel</string>
     <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=29] -->
     <string name="security_settings_fingerprint_enroll_find_sensor_title">Touch the sensor</string>
+    <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=60] -->
+    <string name="security_settings_udfps_enroll_find_sensor_title">Touch &amp; hold the fingerprint icon</string>
     <!-- Message shown in fingerprint enrollment dialog to locate the sensor -->
     <string name="security_settings_fingerprint_enroll_find_sensor_message">It\u2019s on the back of your phone. Use your index finger.</string>
     <!-- Message shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=NONE]-->
-    <string name="security_settings_udfps_enroll_find_sensor_message">It\u2019s on the screen. Look for the fingerprint with a glowing circle.</string>
+    <string name="security_settings_udfps_enroll_find_sensor_message">The fingerprint sensor is on your screen. Move your finger across the screen to find it.</string>
     <!-- Content description of graphic that shows where the fingerprint of the device is [CHAR LIMIT=NONE] -->
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description">Illustration with device and fingerprint sensor location</string>
     <!-- Label text shown in fingerprint dialog for renaming a fingerprint template [CHAR LIMIT=22] -->
@@ -949,10 +962,18 @@
     <string name="security_settings_fingerprint_enroll_start_title">Touch the sensor</string>
     <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
     <string name="security_settings_fingerprint_enroll_start_message">Put your finger on the sensor and lift after you feel a vibration</string>
+    <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
+    <string name="security_settings_udfps_enroll_start_message">Each time you touch, keep your finger on the icon until you feel a vibration</string>
     <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=40] -->
     <string name="security_settings_fingerprint_enroll_repeat_title">Lift, then touch again</string>
+    <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=40] -->
+    <string name="security_settings_udfps_enroll_title_one_more_time">One more time</string>
+    <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=60] -->
+    <string name="security_settings_udfps_enroll_repeat_title_touch_icon">Touch the fingerprint icon as it moves</string>
     <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=NONE] -->
     <string name="security_settings_fingerprint_enroll_repeat_message">Keep lifting your finger to add the different parts of your fingerprint</string>
+    <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=NONE] -->
+    <string name="security_settings_udfps_enroll_repeat_message">This helps capture your full fingerprint</string>
     <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->
     <string name="security_settings_fingerprint_enroll_finish_title">Fingerprint added</string>
     <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
@@ -1852,7 +1873,7 @@
     <!-- Used in the settings screen to secure NFC [CHAR LIMIT=NONE] -->
     <string name="nfc_secure_settings_title">Require device unlock for NFC</string>
     <!-- Description of Secure NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
-    <string name="nfc_secure_toggle_summary" product="default">Allow NFC Payment and Transit use only when screen is unlocked</string>
+    <string name="nfc_secure_toggle_summary" product="default">Allow NFC use only when screen is unlocked</string>
 
     <!-- Used to enter the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
     <string name="android_beam_settings_title">Android Beam</string>
@@ -2395,6 +2416,10 @@
     <string name="wifi_hotspot_auto_off_title">Turn off hotspot automatically</string>
     <!-- Summary for the toggle to turn off hotspot automatically [CHAR LIMIT=NONE]-->
     <string name="wifi_hotspot_auto_off_summary">When no devices are connected</string>
+    <!-- Title for the toggle to enable/disable the maximize compatibility [CHAR LIMIT=NONE]-->
+    <string name="wifi_hotspot_maximize_compatibility">Maximize compatibility</string>
+    <!-- Summary for the toggle to show the maximize compatibility warning message [CHAR LIMIT=NONE]-->
+    <string name="wifi_hotspot_maximize_compatibility_summary">This may reduce speed for devices connected to this hotspot and use more power</string>
 
     <!-- Summary text when turning hotspot on -->
     <string name="wifi_tether_starting">Turning hotspot on\u2026</string>
@@ -2815,7 +2840,9 @@
     <!-- adaptive_sleep settings screen, title about the required permission is missing [CHAR LIMIT=NONE]-->
     <string name="adaptive_sleep_title_no_permission">Camera access needed</string>
     <!-- adaptive_sleep settings screen, subtitle when permission is missing [CHAR LIMIT=NONE]-->
-    <string name="adaptive_sleep_summary_no_permission">Tap to manage permissions for Device Personalization Services</string>
+    <string name="adaptive_sleep_summary_no_permission">Camera access is required for screen attention. Tap to manage permissions for Device Personalization Services</string>
+    <!-- adaptive_sleep settings screen, text for the camera permission button [CHAR LIMIT=NONE]-->
+    <string name="adaptive_sleep_manage_permission_button">Manage permissions</string>
     <!-- Description about the feature adaptive sleep [CHAR LIMIT=NONE]-->
     <string name="adaptive_sleep_description">Prevents your screen from turning off if you\u2019re looking at it</string>
     <!-- Description feature's privacy sensitive details to make sure users understand what feature users, what it saves/sends etc [CHAR LIMIT=NONE]-->
@@ -2824,6 +2851,10 @@
     <string name="adaptive_sleep_contextual_slice_title">Turn on screen attention</string>
     <!-- Description about the contextual adaptive sleep card [CHAR LIMIT=NONE]-->
     <string name="adaptive_sleep_contextual_slice_summary">Keep screen on when looking at it</string>
+    <!-- auto_rotate settings screen, title about the required permission is missing [CHAR LIMIT=NONE]-->
+    <string name="auto_rotate_summary_no_permission">Camera access is required for Face Detection. Tap to manage permissions for Device Personalization Services</string>
+    <!-- auto_rotate settings screen, text for the camera permission button [CHAR LIMIT=NONE]-->
+    <string name="auto_rotate_manage_permission_button">Manage permissions</string>
 
     <!-- Night display screen, setting option name to enable night display (renamed "Night Light" with title caps). [CHAR LIMIT=30] -->
     <string name="night_display_title">Night Light</string>
@@ -2985,7 +3016,7 @@
     <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the always-on ambient display feature. -->
     <string name="doze_always_on_summary">Increased battery usage</string>
     <!-- [CHAR LIMIT=30] Display and accessibility settings screens, setting option name to force bold text. -->
-    <string name="force_bold_text">Bold Text</string>
+    <string name="force_bold_text">Bold text</string>
     <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
     <string name="title_font_size">Font size</string>
     <!-- Summary for Font size. Lets the user know that this will make text larger or smaller. Appears in the accessibility portion of setup wizard. [CHAR LIMIT=NONE] -->
@@ -3165,6 +3196,10 @@
     <string name="status_prl_version">PRL version</string>
     <!-- About phone screen, title for MEID for multi-sim devices -->
     <string name="meid_multi_sim">MEID (sim slot %1$d)</string>
+    <!-- The status text when (Wi-Fi or Bluetooth) scanning is on. [CHAR LIMIT=100] -->
+    <string name="scanning_status_text_on">On</string>
+    <!-- The status text when (Wi-Fi or Bluetooth) scanning is off. [CHAR LIMIT=100] -->
+    <string name="scanning_status_text_off">Off</string>
     <!-- The status text when both Wi-Fi scanning and Bluetooth scanning are on. [CHAR LIMIT=100] -->
     <string name="scanning_status_text_wifi_on_ble_on">Both Wi\u2011Fi and Bluetooth scanning are on</string>
     <!-- The status text when Wi-Fi scanning is on and Bluetooth scanning are off. [CHAR LIMIT=100] -->
@@ -3359,6 +3394,22 @@
     <!-- Section header above list of external storage devices [CHAR LIMIT=30]-->
     <string name="storage_external_title">Portable storage</string>
 
+    <!-- Label for the settings activity for controlling apps that can schedule alarms [CHAR LIMIT=30] -->
+    <string name="alarms_and_reminders_label">Alarms and reminders</string>
+    <!-- Label for the switch to toggler the permission for scheduling alarms [CHAR LIMIT=50] -->
+    <string name="alarms_and_reminders_switch_title">Allow to set alarms or reminders</string>
+    <!-- Title for the setting screen for controlling apps that can schedule alarms [CHAR LIMIT=30] -->
+    <string name="alarms_and_reminders_title">Alarms and reminders</string>
+    <!-- Description that appears below the alarms_and_reminders switch [CHAR LIMIT=NONE] -->
+    <string name="alarms_and_reminders_footer_title">
+        Allow this app to schedule alarms or other timing based events.
+        This will allow the app to wake up and run even when you are not using the device.
+        Note that revoking this permission may cause the app to malfunction, specifically any alarms
+        that the app has scheduled will no longer work.
+    </string>
+    <!-- Keywords for setting screen for controlling apps that can schedule alarms [CHAR LIMIT=100] -->
+    <string name="keywords_alarms_and_reminders">schedule, alarm, reminder, event</string>
+
     <!-- Summary of a single storage volume, constrasting available and total storage space. [CHAR LIMIT=48]-->
     <string name="storage_volume_summary"><xliff:g id="used" example="1.2GB">%1$s</xliff:g> used of <xliff:g id="total" example="32GB">%2$s</xliff:g></string>
     <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
@@ -3969,7 +4020,7 @@
     <string name="managed_profile_location_switch_title">Location for work profile</string>
     <!-- [CHAR LIMIT=30] Location settings screen. It's a link that directs the user to a page that
       shows the location permission setting for each installed app -->
-    <string name="location_app_level_permissions">App access to location</string>
+    <string name="location_app_level_permissions">Manage location permissions</string>
     <!-- Summary for app permission on Location settings page when location is off [CHAR LIMIT=NONE] -->
     <string name="location_app_permission_summary_location_off">Location is off</string>
     <!--
@@ -3994,7 +4045,9 @@
             apps have access to location</item>
     </plurals>
     <!-- [CHAR LIMIT=50] Location settings screen, sub category for recent location access -->
-    <string name="location_category_recent_location_access">Recent location access</string>
+    <string name="location_category_recent_location_access">Recent access</string>
+    <!-- Location settings screen, displayed when there're more than three recent location access apps [CHAR LIMIT=30] -->
+    <string name="location_recent_location_access_see_all">See all</string>
     <!-- [CHAR LIMIT=30] Location settings screen, button to bring the user to view the details of recent location access -->
     <string name="location_recent_location_access_view_details">View details</string>
     <!-- Location settings screen, displayed when there's no recent app accessing location
@@ -4007,8 +4060,6 @@
     <string name="location_high_battery_use">High battery use</string>
     <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->
     <string name="location_low_battery_use">Low battery use</string>
-    <!-- [CHAR LIMIT=60] Wireless background scanning settings screen, screen title -->
-    <string name="location_scanning_screen_title">Wi\u2011Fi and Bluetooth scanning</string>
     <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
     <string name="location_scanning_wifi_always_scanning_title">Wi\u2011Fi scanning</string>
     <!-- Preference description text for Wi-Fi always scanning -->
@@ -4017,25 +4068,17 @@
     <string name="location_scanning_bluetooth_always_scanning_title">Bluetooth scanning</string>
     <!-- Description text for Bluetooth always scanning -->
     <string name="location_scanning_bluetooth_always_scanning_description">Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services.</string>
+    <!-- [CHAR LIMIT=60] Location Services screen, screen title -->
+    <string name="location_services_screen_title">Location Services</string>
     <!-- [CHAR LIMIT=50] Location settings screen, sub category for location services for managed profile -->
     <string name="managed_profile_location_services">Location services for work</string>
 
-    <!-- [CHAR LIMIT=60] Location settings screen, screen title -->
-    <string name="location_time_zone_detection_screen_title">Location time zone detection</string>
-    <!-- [CHAR LIMIT=50] Location settings screen, title for the setting that control whether the
-         device can use its location for time zone detection. -->
-    <string name="location_time_zone_detection_enabled_title">Location time zone detection</string>
-    <!-- [CHAR LIMIT=NONE] Preference description text for location time zone detection -->
-    <string name="location_time_zone_detection_enabled_description">Allows the device\u2019s location to be used to detect the current time zone. Other location settings such as Wi\u2011Fi scanning can affect the accuracy of time zone detection.</string>
-
-    <!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is on -->
-    <string name="location_time_zone_detection_on">On</string>
-    <!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is off -->
-    <string name="location_time_zone_detection_off">Off</string>
+    <!-- [CHAR LIMIT=60] Date&Time settings screen, toggle button title -->
+    <string name="location_time_zone_detection_toggle_title">Use location to set time zone</string>
     <!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is not
          applicable due to other settings like the "automatic time zone detection enabled" setting
          being set to "off". -->
-    <string name="location_time_zone_detection_auto_is_off">Automatic time zone detection is disabled</string>
+    <string name="location_time_zone_detection_auto_is_off">Automatic time zone is off</string>
     <!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is not
          applicable for the user for unspecified reasons. More specific messages are used when there
          is a clear reason. -->
@@ -4466,13 +4509,13 @@
     <!-- Manage applications, restore updated system application to factory version -->
     <string name="app_factory_reset">Uninstall updates</string>
     <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app is set as a default for some actions. -->
-    <string name="auto_launch_enable_text">You\u2019ve chosen to launch this app by default for some actions.</string>
+    <string name="auto_launch_enable_text">Some activities you\u2019ve selected open in this app by default.</string>
     <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app was given user permission to create widgets. -->
     <string name="always_allow_bind_appwidgets_text">You\u2019ve chosen to allow this app to create widgets and access their data.</string>
     <!-- Manage applications, individual application screen, text under Launch by default heading if the app is NOT a default for actions -->
     <string name="auto_launch_disable_text">No defaults set.</string>
     <!-- Manage applications, individual application screen, button label under Launch by default heading.  This is used to clear any default actions that may be assigned to this app.  -->
-    <string name="clear_activities">Clear defaults</string>
+    <string name="clear_activities">Clear default preferences</string>
     <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
     <string name="screen_compatibility_text">This app may not be designed for your screen. You can control how it
             adjusts to your screen here.</string>
@@ -4965,6 +5008,8 @@
     <string name="captions_category_title">Captions</string>
     <!-- Title for the accessibility preference category of audio services and settings. [CHAR LIMIT=50] -->
     <string name="audio_category_title">Audio</string>
+    <!-- Title for the accessibility preference category of general services and settings. [CHAR LIMIT=50] -->
+    <string name="general_category_title">General</string>
     <!-- Title for the accessibility preference category of display services and settings. [CHAR LIMIT=50] -->
     <string name="display_category_title">Display</string>
     <!-- Title for the accessibility text options page. [CHAR LIMIT=50] -->
@@ -4994,27 +5039,27 @@
     <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
     <string name="accessibility_screen_magnification_title">Magnification</string>
     <!-- Title for the accessibility preference screen to edit magnification area. [CHAR LIMIT=35] -->
-    <string name="accessibility_magnification_mode_title">Magnification area</string>
+    <string name="accessibility_magnification_mode_title">Choose how to magnify</string>
     <!-- Message for the accessibility preference screen to edit magnification area dialog. [CHAR LIMIT=none] -->
-    <string name="accessibility_magnification_area_settings_message">Choose the magnification area(s) you want to use when magnifying the screen</string>
+    <string name="accessibility_magnification_area_settings_message">Magnify your full screen, a specific area, or switch between both options</string>
     <!-- Summary for the accessibility preference screen to edit full screen. [CHAR LIMIT=none] -->
     <string name="accessibility_magnification_area_settings_full_screen_summary">Full screen</string>
-    <!-- Summary for the accessibility preference screen to edit window screen. [CHAR LIMIT=none] -->
-    <string name="accessibility_magnification_area_settings_window_screen_summary">Part of screen</string>
-    <!-- Summary for the accessibility preference screen to edit entire screen. [CHAR LIMIT=none] -->
-    <string name="accessibility_magnification_area_settings_all_summary">Full screen &amp; part of screen</string>
-    <!-- Message for the accessibility preference screen to edit entire screen. [CHAR LIMIT=none] -->
-    <string name="accessibility_magnification_area_settings_full_screen">Magnify entire screen</string>
+    <!-- Summary for the accessibility preference screen to edit partial screen. [CHAR LIMIT=none] -->
+    <string name="accessibility_magnification_area_settings_window_screen_summary">Partial screen</string>
+    <!-- Summary for the accessibility preference screen to edit full and partial screen. [CHAR LIMIT=none] -->
+    <string name="accessibility_magnification_area_settings_all_summary">Switch between full and partial screen</string>
+    <!-- Message for the accessibility preference screen to edit the full screen. [CHAR LIMIT=none] -->
+    <string name="accessibility_magnification_area_settings_full_screen">Magnify full screen</string>
     <!-- Message for the accessibility preference screen to edit part of screen. [CHAR LIMIT=none] -->
     <string name="accessibility_magnification_area_settings_window_screen">Magnify part of screen</string>
     <!-- Title for the accessibility magnification switch shortcut dialog. [CHAR LIMIT=48] -->
     <string name="accessibility_magnification_switch_shortcut_title">Switch to accessibility button?</string>
     <!-- Message for the accessibility magnification switch shortcut dialog. [CHAR LIMIT=none] -->
-    <string name="accessibility_magnification_switch_shortcut_message">Using triple tap to magnify part of the screen will cause typing and other actions to be delayed.\n\nDo you want to switch to using accessibility button to magnify?</string>
+    <string name="accessibility_magnification_switch_shortcut_message">Using triple-tap to magnify part of the screen causes typing and other delays.\n\nThe accessibility button floats on your screen over other apps. Tap it to magnify.</string>
     <!-- Title for the switch shortcut button in accessibility switch shortcut dialog to change the config shortcut value. [CHAR LIMIT=45] -->
     <string name="accessibility_magnification_switch_shortcut_positive_button">Switch to accessibility button</string>
     <!-- Title for the cancel button in accessibility switch shortcut dialog to keep the config shortcut value. [CHAR LIMIT=54] -->
-    <string name="accessibility_magnification_switch_shortcut_negative_button">Keep triple tap to magnify</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button">Use triple-tap</string>
     <!-- Title for the accessibility preference screen to enable screen magnification settings. [CHAR LIMIT=35] -->
     <string name="accessibility_magnification_service_settings_title">Magnification settings</string>
     <!-- Title for the accessibility preference screen to enable triple-tap gesture screen magnification. [CHAR LIMIT=35] -->
@@ -5035,7 +5080,7 @@
     <string name="accessibility_screen_magnification_navbar_short_summary">Tap a button to zoom</string>
     <!-- Summary for the accessibility preference screen to enable screen magnification gestures. [CHAR LIMIT=none] -->
     <string name="accessibility_screen_magnification_summary">
-        <![CDATA[Quickly zoom in on the screen to display content more clearly.<br/><br/>
+        <![CDATA[Quickly zoom in on the screen to make content larger.<br/><br/>
         <b>To zoom in:</b><br/>
         1. Use shortcut to start magnification<br/>
         2. Tap the screen<br/>
@@ -5065,6 +5110,8 @@
     <string name="accessibility_tutorial_dialog_title_gesture_settings">Use new accessibility gesture</string>
     <!-- Message for the accessibility tutorial dialog when user enables an accessibility service while using the 3-button nav bar. [CHAR LIMIT=NONE] -->
     <string name="accessibility_tutorial_dialog_message_button">To use this feature, tap the accessibility button <xliff:g id="accessibility_icon" example="[Icon]">%s</xliff:g> on the bottom of your screen.\n\nTo switch between features, touch &amp; hold the accessibility button.</string>
+    <!-- Message for the accessibility tutorial dialog when user enables an accessibility service while using the accessibility floating button. [CHAR LIMIT=100] -->
+    <string name="accessibility_tutorial_dialog_message_floating_button">To use this feature, tap the accessibility button on your screen.</string>
     <!-- Instruction for the accessibility tutorial dialog in accessibility service with volume keys. [CHAR LIMIT=100] -->
     <string name="accessibility_tutorial_dialog_message_volume">To use this feature, press &amp; hold both volume keys.</string>
     <!-- Instruction for the accessibility tutorial dialog in accessibility service with triple tap. [CHAR LIMIT=100] -->
@@ -5095,6 +5142,8 @@
     <string name="accessibility_shortcut_edit_dialog_summary_software_gesture">Swipe up from the bottom of the screen with 2 fingers.\n\nTo switch between features, swipe up with 2 fingers and hold.</string>
     <!-- Summary for software shortcut in gesture mode in accessibility edit shortcut dialog while using gesture navigation and touch exploration are enabled [CHAR LIMIT=NONE] -->
     <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback">Swipe up from the bottom of the screen with 3 fingers.\n\nTo switch between features, swipe up with 3 fingers and hold.</string>
+    <!-- Summary for software shortcut in accessibility edit shortcut dialog when user had enabled the accessibility floating button mode (Floating over other apps). [CHAR LIMIT=NONE] -->
+    <string name="accessibility_shortcut_edit_dialog_summary_software_floating"><annotation id="link">Customize accessibility button</annotation></string>
     <!-- Title for hardware shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
     <string name="accessibility_shortcut_edit_dialog_title_hardware">Hold volume keys</string>
     <!-- Part of list to compose user's accessibility shortcut list. [CHAR LIMIT=NONE] -->
@@ -5123,6 +5172,26 @@
     <string name="accessibility_shortcut_service_on_lock_screen_title">Shortcut from lock screen</string>
     <!-- Description of accessibility shortcut. [CHAR LIMIT=NONE] -->
     <string name="accessibility_shortcut_description">Allow feature shortcut to turn on from the lock screen. Hold both volume keys for a few seconds.</string>
+    <!-- Title for the accessibility button page. [CHAR LIMIT=35] -->
+    <string name="accessibility_button_title">Accessibility button</string>
+    <!-- Summary text for the accessibility button preference. [CHAR LIMIT=50] -->
+    <string name="accessibility_button_summary">Quickly access accessibility features</string>
+    <!-- Description for the accessibility button page. Explain how this page works. [CHAR LIMIT=NONE] -->
+    <string name="accessibility_button_description">Quickly access accessibility features from any screen. \n\nTo get started, go to accessibility settings and select a feature. Tap on the shortcut and select the accessibility button.</string>
+    <!-- Title for the location of the accessibility button. [CHAR LIMIT=35] -->
+    <string name="accessibility_button_location_title">Location</string>
+    <!-- Title for the size of the accessibility button. [CHAR LIMIT=35] -->
+    <string name="accessibility_button_size_title">Size</string>
+    <!-- Title for the fade of the accessibility button. [CHAR LIMIT=35] -->
+    <string name="accessibility_button_fade_title">Fade when not in use</string>
+    <!-- Summary for the fade of the accessibility button. [CHAR LIMIT=80] -->
+    <string name="accessibility_button_fade_summary">Fades after a few seconds so it\u2019s easier to see your screen</string>
+    <!-- Title for the transparency of the accessibility button. Will become fade when not interact with the accessibility button. [CHAR LIMIT=40] -->
+    <string name="accessibility_button_opacity_title">Transparency when not in use</string>
+    <!-- Label on the left side of transparency adjustment slider [CHAR LIMIT=30] -->
+    <string name="accessibility_button_low_label">Transparent</string>
+    <!-- Label on the right side of transparency adjustment slider [CHAR LIMIT=30] -->
+    <string name="accessibility_button_high_label">Non-transparent</string>
     <!-- Title for the accessibility preference to high contrast text. [CHAR LIMIT=35] -->
     <string name="accessibility_toggle_high_text_contrast_preference_title">High contrast text</string>
     <!-- Title for the accessibility preference to auto update screen magnification. [CHAR LIMIT=35] -->
@@ -5297,15 +5366,17 @@
     <!-- Summary shown for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
     <string name="daltonizer_mode_tritanomaly_summary">Blue-yellow</string>
 
-    <!-- Title for the accessibility preference and switch of the Reduce Brightness feature. [CHAR LIMIT=NONE] -->
-    <string name="reduce_bright_colors_preference_title">Reduce Brightness</string>
+    <!-- Title for the accessibility preference of the Reduce Brightness feature. [CHAR LIMIT=NONE] -->
+    <string name="reduce_bright_colors_preference_title">Extra dim</string>
+    <!-- Title for the activation switch of the Reduce Brightness feature. [CHAR LIMIT=NONE] -->
+    <string name="reduce_bright_colors_switch_title">Make screen extra dim</string>
     <!-- Summary for the accessibility preference to configure Reduce Brightness feature. [CHAR LIMIT=NONE] -->
-    <string name="reduce_bright_colors_preference_summary" product="default">Make screen darker than your phone\u2019s minimum brightness</string>
+    <string name="reduce_bright_colors_preference_summary" product="default">Dim screen beyond your phone\u2019s minimum brightness</string>
     <!-- Summary for the accessibility preference to configure Reduce Brightness feature. [CHAR LIMIT=NONE] -->
-    <string name="reduce_bright_colors_preference_summary" product="tablet">Make screen darker than your tablet\u2019s minimum brightness</string>
+    <string name="reduce_bright_colors_preference_summary" product="tablet">Dim screen beyond your tablet\u2019s minimum brightness</string>
     <!-- Subtitle that describes Reduce Brightness. [CHAR LIMIT=NONE] -->
     <string name="reduce_bright_colors_preference_subtitle" product="default">
-        <![CDATA[Make your screen darker so it\u2019s more comfortable to read.<br/><br/>
+        <![CDATA[Make your screen dimmer so it\u2019s more comfortable to read.<br/><br/>
         This can be helpful when:
         <ol>
             <li>\u00a0Your phone\u2019s default minimum brightness is still too bright</li>
@@ -5325,10 +5396,6 @@
     </string>
     <!-- Title for setting the brightness intensity of the display using Reduce Brightness. [CHAR LIMIT=NONE] -->
     <string name="reduce_bright_colors_intensity_preference_title">Intensity</string>
-    <!-- Start label for setting the brightness intensity of the display using Reduce Brightness. [CHAR LIMIT=50] -->
-    <string name="reduce_bright_colors_intensity_preference_start_label">Slightly darker</string>
-    <!-- End label for setting the brightness intensity of the display using Reduce Brightness. [CHAR LIMIT=NONE] -->
-    <string name="reduce_bright_colors_intensity_preference_end_label">Darkest</string>
     <!-- Title for setting whether the Reduce Brightness activation state persists across reboots. [CHAR LIMIT=NONE] -->
     <string name="reduce_bright_colors_persist_preference_title">Keep on after device restarts</string>
 
@@ -7294,6 +7361,8 @@
     <string name="help_uri_apps_wifi_access" translatable="false"></string>
     <!-- Help URI, manage apps that have access to all files [DO NOT TRANSLATE] -->
     <string name="help_uri_manage_external_storage" translatable="false"></string>
+    <!-- Help URI, manage apps that can modify media files [DO NOT TRANSLATE] -->
+    <string name="help_uri_media_management_apps" translatable="false"></string>
     <!-- Help URI, Storage [DO NOT TRANSLATE] -->
     <string name="help_uri_storage" translatable="false"></string>
     <!-- Help URI, Accessibility [DO NOT TRANSLATE] -->
@@ -7304,6 +7373,8 @@
     <string name="help_uri_printing" translatable="false"></string>
     <!-- Help URI, About phone [DO NOT TRANSLATE] -->
     <string name="help_uri_about" translatable="false"></string>
+    <!-- Help URI, manage apps that can set alarms and reminders [DO NOT TRANSLATE] -->
+    <string name="help_uri_alarms_and_reminders" translatable="false"></string>
 
     <!-- Help URL, WiFi [DO NOT TRANSLATE] -->
     <string name="help_url_wifi" translatable="false"></string>
@@ -7499,9 +7570,6 @@
     <!-- Summary of multimedia messaging service settings.  [CHAR LIMIT=100] -->
     <string name="mms_message_summary">Send &amp; receive when mobile data is off</string>
 
-    <!-- Cell broacast receiver package name [DO NOT TRANSLATE] -->
-    <string name="cell_broadcast_receiver_package">com.android.cellbroadcastreceiver.module</string>
-
     <!-- Title of a preference for whether to allow data during calls that is shown when mobile
          data is turned off. This is needed for some multi-SIM scenarios, because the SIM that is
          default for data might not be available during a phone call. [CHAR LIMIT=60] -->
@@ -7801,10 +7869,10 @@
     <string name="keywords_display_auto_brightness">dim screen, touchscreen, battery, smart brightness, dynamic brightness, Auto brightness</string>
 
     <!-- Search keywords for adaptive sleep setting [CHAR LIMIT=NONE]-->
-    <string name="keywords_display_adaptive_sleep">dim screen, sleep, battery, timeout, attention, display, screen, inactivity</string>
+    <string name="keywords_display_adaptive_sleep">smart, dim screen, sleep, battery, timeout, attention, display, screen, inactivity</string>
 
     <!-- List of synonyms for the auto rotate (rotate the virtual display when the device rotates) setting, used to match in settings search [CHAR LIMIT=NONE] -->
-    <string name="keywords_auto_rotate">rotate, flip, rotation, portrait, landscape, orientation, vertical, horizontal</string>
+    <string name="keywords_auto_rotate">camera, smart, auto rotate, auto-rotate, rotate, flip, rotation, portrait, landscape, orientation, vertical, horizontal</string>
 
     <!-- List of synonyms for the System Update (update the operating system) setting, used to match in settings search [CHAR LIMIT=NONE] -->
     <string name="keywords_system_update_settings">upgrade, android</string>
@@ -8153,7 +8221,7 @@
     <string name="zen_mode_settings_dnd_custom_settings_footer">Do Not Disturb is on for <xliff:g id="rule_names" example="Sleeping and Work">%s</xliff:g> with custom settings.</string>
 
     <!-- [CHAR LIMIT=120] Zen mode settings footer: Link following zen_mode_settings_dnd_custom_settings_footer to see the currently applied custom dnd settings. -->
-    <string name="zen_mode_settings_dnd_custom_settings_footer_link"><annotation id="link"> View custom settings</annotation></string>
+    <string name="zen_mode_settings_dnd_custom_settings_footer_link"> <annotation id="link">View custom settings</annotation></string>
 
     <!--[CHAR LIMIT=40] Zen Interruption level: Priority.  -->
     <string name="zen_interruption_level_priority">Priority only</string>
@@ -8211,6 +8279,9 @@
     <!-- Do not disturb settings, main screen, field, duration setting where user can specify how
     long dnd will last when toggling dnd on from qs) [CHAR LIMIT=100] -->
     <string name="zen_category_duration">Duration for Quick Settings</string>
+    <!-- Do not disturb settings, main screen, category header describing settings that do not
+    fit in another group [CHAR LIMIT=100] -->
+    <string name="zen_settings_general">General</string>
 
     <!-- Do not disturb settings, sound and vibrations screen footer [CHAR LIMIT=NONE]-->
     <string name="zen_sound_footer">When Do Not Disturb is on, sound and vibration will be muted, except for the items you allow above.</string>
@@ -8756,8 +8827,10 @@
     <!-- app summary of notification app list screen [CHAR LIMIT=100] -->
     <string name="notifications_sent_never">Never</string>
 
-    <!-- Sound & notification > Advanced section: Title for managing notification listeners option. [CHAR LIMIT=30] -->
-    <string name="manage_notification_access_title">Notification access</string>
+    <!-- Sound & notification > Advanced section: Title for managing notification listeners option. [CHAR LIMIT=60] -->
+    <string name="manage_notification_access_title">Device &amp; app notifications</string>
+
+    <string name="manage_notification_access_summary">Control which notifications show on your apps and devices</string>
 
     <!-- Notification Access section: Indicates that the work profile admin doesn't allow this
          notification listener to access work profile notifications [CHAR LIMIT=100] -->
@@ -8816,26 +8889,19 @@
     <string name="notification_listener_disable_warning_confirm">Turn off</string>
     <string name="notification_listener_disable_warning_cancel">Cancel</string>
     <string name="notification_listener_type_title">Allowed notification types</string>
-    <string name="notif_type_ongoing">Important ongoing notifications</string>
-    <string name="notif_type_conversation">Conversation notifications</string>
-    <string name="notif_type_alerting">Alerting notifications</string>
-    <string name="notif_type_silent">Silent notifications</string>
-
-    <!-- Per notification listener, launches a list of apps whose notifications this listener cannot see -->
-    <string name="notif_listener_excluded_title">Apps that are not bridged to this listener</string>
-
-    <!-- Per notification listener, when the listener can see notifications from all apps -->
-    <string name="notif_listener_excluded_summary_zero">All apps are bridged</string>
-
-    <!-- Per notification listener, a summary of how many apps this listener cannot see
-     notifications from -->
-    <plurals name="notif_listener_excluded_summary_nonzero">
-        <item quantity="one">%d app is not bridged</item>
-        <item quantity="other">%d apps are not bridged</item>
-    </plurals>
+    <string name="notif_type_ongoing">Real-time</string>
+    <string name="notif_type_ongoing_summary">Real-time communication from apps in use, navigation, phone calls, and more</string>
+    <string name="notif_type_conversation">Conversations</string>
+    <string name="notif_type_conversation_summary">SMS and other communications</string>
+    <string name="notif_type_alerting">Default</string>
+    <string name="notif_type_alerting_summary">Notifications that may ring or vibrate based on settings</string>
+    <string name="notif_type_silent">Silent</string>
+    <string name="notif_type_silent_summary">Notifications that never make sound or vibrations</string>
 
     <!-- Per notification listener, a list of apps whose notifications this listener cannot see -->
-    <string name="notif_listener_excluded_app_title">Bridged apps</string>
+    <string name="notif_listener_excluded_app_title">See all apps</string>
+    <string name="notif_listener_excluded_app_summary">Change notification settings for each app that can send notifications</string>
+    <string name="notif_listener_excluded_app_screen_title">Apps shown on device</string>
 
     <!-- Title for managing VR (virtual reality) helper services. [CHAR LIMIT=50] -->
     <string name="vr_listeners_title">VR helper services</string>
@@ -9651,9 +9717,46 @@
     <!-- Category name for App Launch -->
     <string name="app_launch_domain_links_title">Opening links</string>
     <string name="app_launch_open_domain_urls_title">Open supported links</string>
+    <!-- Preference title for Supported links open in this app. [CHAR LIMIT=60] -->
+    <string name="app_launch_top_intro_message">Allow web links to open in this app</string>
+    <!-- Preference title for Links to open in this app. [CHAR LIMIT=60] -->
+    <string name="app_launch_links_category">Links to open in this app</string>
+
     <string name="app_launch_open_domain_urls_summary">Open without asking</string>
     <string name="app_launch_supported_domain_urls_title">Supported links</string>
-    <string name="app_launch_other_defaults_title">Other defaults</string>
+
+    <string name="app_launch_other_defaults_title">Other default preferences</string>
+    <!-- Preference title for Add link [CHAR LIMIT=60] -->
+    <string name="app_launch_add_link">Add link</string>
+    <!-- Footer for Open by default. [CHAR LIMIT=NONE] -->
+    <string name="app_launch_footer">An app can verify links to automatically open in the app. <annotation id="url">Learn more</annotation></string>
+
+    <!-- Title, message and button for verified links dialog. -->
+    <plurals name="app_launch_verified_links_title">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> verified link</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> verified links</item>
+    </plurals>
+    <plurals name="app_launch_verified_links_message">
+        <item quantity="one">This link is verified and automatically opens in this app.</item>
+        <item quantity="other">These links are verified and automatically open in this app.</item>
+    </plurals>
+    <!-- OK button for verified links dialog. [CHAR LIMIT=20] -->
+    <string name="app_launch_dialog_ok">OK</string>
+
+    <!-- Title for Checking other supported links dialog. [CHAR LIMIT=50] -->
+    <string name="app_launch_checking_links_title">Checking for other supported links\u2026</string>
+    <!-- Cancel button for Checking other supported links dialog. [CHAR LIMIT=20] -->
+    <string name="app_launch_dialog_cancel">Cancel</string>
+
+    <!-- Title and button for supported links dialog. -->
+    <plurals name="app_launch_supported_links_title">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> supported link</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> supported links</item>
+    </plurals>
+    <!-- Add button for supported links dialog. [CHAR LIMIT=20] -->
+    <string name="app_launch_supported_links_add">Add</string>
+    <!-- The subtext of the link title in supported links dialog. [CHAR LIMIT=30] -->
+    <string name="app_launch_supported_links_subtext">Opens in <xliff:g id="app_label" example="Reddit">%s</xliff:g></string>
 
     <!-- Summary for app storage preference -->
     <string name="storage_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used in <xliff:g id="storage_type" example="internal memory">%2$s</xliff:g></string>
@@ -9732,6 +9835,18 @@
     <!-- Runtime permissions preference summary, which describes what the permission manager does. [CHAR LIMIT=NONE] -->
     <string name="runtime_permissions_summary_control_app_access">Control app access to your data</string>
 
+    <!-- Label for showing apps that have not been used for months. [CHAR LIMIT=40]-->
+    <string name="unused_apps">Unused apps</string>
+
+    <!-- Summary of number of apps that have not been used for months. [CHAR LIMIT=40]-->
+    <plurals name="unused_apps_summary">
+        <item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> unused app</item>
+        <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> unused apps</item>
+    </plurals>
+
+    <!-- Label of a switch preference that controls whether the system will remove the permissions and free up space when the app has not been used for months [CHAR LIMIT=40]-->
+    <string name="unused_apps_switch">Remove permissions and free up space</string>
+
     <!-- Label for showing all apps in list [CHAR LIMIT=30] -->
     <string name="filter_all_apps">All apps</string>
     <!-- Label for showing enabled apps in list [CHAR LIMIT=30] -->
@@ -10250,6 +10365,15 @@
     <!-- Label for showing apps that can manage external storage[CHAR LIMIT=45] -->
     <string name="filter_manage_external_storage">Can access all files</string>
 
+    <!-- Media management apps settings title [CHAR LIMIT=40] -->
+    <string name="media_management_apps_title">Media management apps</string>
+    <!-- Label for a setting which controls whether an app can manage media files [CHAR LIMIT=45] -->
+    <string name="media_management_apps_toggle_label">Allow app to manage media files</string>
+    <!-- Description for a setting which controls whether an app can manage media files [CHAR LIMIT=NONE] -->
+    <string name="media_management_apps_description">If allowed, this app can modify or delete media files on this device or connected storage device without asking you. App must have permission to access files and media.</string>
+    <!-- Search keywords for media management apps settings [CHAR_LIMIT=NONE] -->
+    <string name="keywords_media_management_apps">Media, File, Management, Manager, Manage, Edit, Editor, App, Application, Program</string>
+
     <!-- Keyword for VR setting -->
     <string name="keywords_vr_listener">vr virtual reality listener stereo helper service</string>
     <!-- Main settings screen item's title to go into the overlay settings screen [CHAR LIMIT=30] -->
@@ -10422,8 +10546,8 @@
     <string name="disabled_by_policy_title_screen_capture">Screenshot not allowed</string>
     <!-- Title for dialog displayed to tell user that the app was suspended by an admin [CHAR LIMIT=50] -->
     <string name="disabled_by_policy_title_suspend_packages">Can’t open this app</string>
-    <!-- Shown when the user tries to change a settings locked by an admin [CHAR LIMIT=200] -->
-    <string name="default_admin_support_msg">If you have questions, contact your IT admin</string>
+    <!-- Dialog title. This dialog lets a user know that a specific setting is blocked by their credit provider. Since the user purchased the device from the credit provider, the credit provider controls what they can access. [CHAR LIMIT=50] -->
+    <string name="disabled_by_policy_title_financed_device">Blocked by your credit provider</string>
     <!-- Shown in dialog to allow user to see more information about the device admin [CHAR LIMIT=30] -->
     <string name="admin_support_more_info">More details</string>
     <!-- Shown in admin details page to warn user about policies the admin can set in a work profile. [CHAR LIMIT=NONE] -->
@@ -10438,6 +10562,9 @@
     <string name="admin_device_owner_message">Your admin can monitor and manage apps and data
         associated with this device, including settings, permissions, corporate access,
         network activity, and the device\'s location information.</string>
+    <!-- Shown in admin details page to warn user about policies the admin can set on a financed device. [CHAR LIMIT=NONE] -->
+    <string name="admin_financed_message">Your device administrator may be able to access data
+        associated with this device, manage apps, and change this device\’s settings.</string>
 
     <!-- Turn off a conditional state of the device (e.g. airplane mode, or hotspot) [CHAR LIMIT=30] -->
     <string name="condition_turn_off">Turn off</string>
@@ -11464,8 +11591,10 @@
     <!-- AutoFill strings -->
     <!-- Preference label for choosing auto-fill service. [CHAR LIMIT=60] -->
     <string name="autofill_app">Autofill service</string>
+    <!-- Preference category for showing auto-fill services with saved passwords. [CHAR LIMIT=60] -->
+    <string name="autofill_passwords">Passwords</string>
     <!-- Keywords for the auto-fill feature. [CHAR LIMIT=NONE] -->
-    <string name="autofill_keywords">auto, fill, autofill</string>
+    <string name="autofill_keywords">auto, fill, autofill, password</string>
 
     <!-- Message of the warning dialog for setting the auto-fill app. [CHAR_LIMIT=NONE] -->
     <string name="autofill_confirmation_message">
@@ -12086,7 +12215,7 @@
     <string name="carrier_settings_euicc">Carrier</string>
     <!-- Mobile network settings screen, a string showing the version of carrier settings for this
          subscription [CHAR LIMIT=NONE] -->
-    <string name="carrier_settings_version">Settings version</string>
+    <string name="carrier_settings_version">Carrier settings version</string>
 
     <!-- Mobile network settings screen, name for call settings category [CHAR LIMIT=NONE] -->
     <string name="call_category">Calling</string>
@@ -12610,10 +12739,8 @@
     <string name="provider_internet_settings">Internet</string>
     <!-- Provider Model: SIMs controls settings screen, item title to go into the SIMs settings -->
     <string name="provider_network_settings_title">SIMs</string>
-    <!-- Provider Model: Airplane mode networks controls settings screen -->
-    <string name="airplane_safe_networks">Show airplane mode networks</string>
-    <!-- Provider Model: Summary for showing airplane mode networks-->
-    <string name="airplane_safe_networks_summary">Find and connect to networks in airplane mode.</string>
+    <!-- Provider Model: Summary for Wi-Fi switch [CHAR LIMIT=NONE] -->
+    <string name="wifi_switch_summary">Find and connect to Wi\u2011Fi networks</string>
     <!-- Provider Model: List of synonyms for the airplane-safe networks, used to match in settings search [CHAR LIMIT=NONE] -->
     <string name="keywords_airplane_safe_networks">airplane, airplane-safe</string>
     <!-- Provider Model: Calls and SMS controllers settings screen, item title to go into the Calls and SMS settings -->
@@ -12651,10 +12778,8 @@
     <string name="view_airplane_safe_networks">View airplane mode networks</string>
     <!-- Text of message for viewing the networks that are available in airplane mode. [CHAR LIMIT=60] -->
     <string name="viewing_airplane_mode_networks">Viewing airplane mode networks</string>
-    <!-- Slice title text for turning on networks (e.g. Wi-Fi). [CHAR LIMIT=40] -->
-    <string name="turn_on_networks">Turn on networks</string>
-    <!-- Slice title text for turning off networks (e.g. Wi-Fi). [CHAR LIMIT=40] -->
-    <string name="turn_off_networks">Turn off networks</string>
+    <!-- Slice title text for turning on the Wi-Fi networks. [CHAR LIMIT=40] -->
+    <string name="turn_on_wifi">Turn on Wi\u2011Fi</string>
     <!-- Title for interrupting the voice call alert. [CHAR_LIMIT=NONE] -->
     <string name="reset_your_internet_title">Reset your internet?</string>
     <!-- Description for interrupting the voice call alert. [CHAR_LIMIT=NONE] -->
@@ -12665,12 +12790,10 @@
     <string name="resetting_internet_text">Resetting your internet\u2026</string>
     <!-- Menu option for data connectivity recovery for all requested technologies. [CHAR_LIMIT=NONE] -->
     <string name="fix_connectivity">Fix connectivity</string>
-    <!-- Summary for airplane mode networks available. [CHAR LIMIT=60] -->
-    <string name="airplane_mode_network_available">Airplane mode networks available</string>
     <!-- Summary for warning to disconnect ethernet first then switch to other networks. [CHAR LIMIT=60] -->
     <string name="to_switch_networks_disconnect_ethernet">To switch networks, disconnect ethernet</string>
-    <!-- Title for airplane mode network panel. [CHAR LIMIT=60] -->
-    <string name="airplane_mode_network_panel_title">Airplane mode networks</string>
+    <!-- Panel subtitle for Wi-Fi turned on. [CHAR LIMIT=60] -->
+    <string name="wifi_is_turned_on_subtitle">Wi\u2011Fi is turned on</string>
 
     <!-- Summary text separator for preferences including a short description
          (eg. "Connected / 5G"). [CHAR LIMIT=50] -->
@@ -12720,39 +12843,43 @@
     <string name="category_name_others">Others</string>
     <!-- General category name [CHAR LIMIT=none] -->
     <string name="category_name_general">General</string>
+    <!-- Title for Dark theme main switch preferences. [CHAR LIMIT=50] -->
+    <string name="dark_theme_main_switch_title">Use Dark theme</string>
+    <!-- Title for bluetooth main switch. [CHAR LIMIT=50] -->
+    <string name="bluetooth_main_switch_title">Use Bluetooth</string>
 
-    <!-- Do not translate. Title for prevent ringing main switch. [CHAR LIMIT=50] -->
-    <string name="prevent_ringing_main_switch_title" translatable="false">Use prevent ringing</string>
-    <!-- Do not translate. Title for use wifi hotspot main switch [CHAR LIMIT=50]-->
-    <string name="use_wifi_hotsopt_main_switch_title" translatable="false">Use Wi\u2011Fi hotspot</string>
-    <!-- Do not translate. Title for bluetooth main switch. [CHAR LIMIT=50] -->
-    <string name="bluetooth_main_switch_title" translatable="false">Use bluetooth</string>
-    <!-- Do not translate. Title for app pinning main switch. [CHAR LIMIT=50] -->
-    <string name="app_pinning_main_switch_title" translatable="false">Use app pinning</string>
-    <!-- Do not translate. Title for developer options main switch. [CHAR LIMIT=50] -->
-    <string name="developer_options_main_switch_title" translatable="false">Use developer options</string>
-    <!-- Do not translate. Title for default print service main switch. [CHAR LIMIT=50] -->
-    <string name="default_print_service_main_switch_title" translatable="false">Use default print service</string>
-    <!-- Do not translate. Title for multiple users main switch. [CHAR LIMIT=50] -->
-    <string name="multiple_users_main_switch_title" translatable="false">Use multiple users</string>
-    <!-- Do not translate. Title for wireless debugging main switch. [CHAR LIMIT=50] -->
-    <string name="wireless_debugging_main_switch_title" translatable="false">Use wireless debugging</string>
-    <!-- Do not translate. Title for graphics driver main switch. [CHAR LIMIT=50] -->
-    <string name="graphics_driver_main_switch_title" translatable="false">Use graphics driver preferences</string>
-    <!-- Do not translate. Title for battery saver main switch preferences. [CHAR LIMIT=50] -->
-    <string name="battery_saver_main_switch_title" translatable="false">Use battery saver</string>
-    <!-- Do not translate. Title for Do Not Disturb main switch preferences. [CHAR LIMIT=50] -->
-    <string name="do_not_disturb_main_switch_title" translatable="false">Use Do Not Disturb</string>
-    <!-- Do not translate. Title for Dark theme main switch preferences. [CHAR LIMIT=50] -->
-    <string name="dark_theme_main_switch_title" translatable="false">Use Dark Theme</string>
-    <!-- Do not translate. Title for Night Light main switch preferences. [CHAR LIMIT=50] -->
-    <string name="night_light_main_switch_title" translatable="false">Use Night Light</string>
-    <!-- Do not translate. Title for NFC main switch preferences. [CHAR LIMIT=50] -->
-    <string name="nfc_main_switch_title" translatable="false">Use NFC</string>
-    <!-- Do not translate. Title for Adaptive Battery main switch preferences. [CHAR LIMIT=50] -->
-    <string name="adaptive_battery_main_switch_title" translatable="false">Use adaptive battery</string>
-    <!-- Do not translate. Title for adaptive brightness main switch preferences. [CHAR LIMIT=50] -->
-    <string name="adaptive_brightness_main_switch_title" translatable="false">Use adaptive brightness</string>
+    <!-- Title for prevent ringing main switch. [CHAR LIMIT=50] -->
+    <string name="prevent_ringing_main_switch_title">Use prevent ringing</string>
+    <!-- Title for use wifi hotspot main switch [CHAR LIMIT=50]-->
+    <string name="use_wifi_hotsopt_main_switch_title">Use Wi\u2011Fi hotspot</string>
+    <!-- Title for app pinning main switch. [CHAR LIMIT=50] -->
+    <string name="app_pinning_main_switch_title">Use app pinning</string>
+    <!-- Title for developer options main switch. [CHAR LIMIT=50] -->
+    <string name="developer_options_main_switch_title">Use developer options</string>
+    <!-- Title for default print service main switch. [CHAR LIMIT=50] -->
+    <string name="default_print_service_main_switch_title">Use default print service</string>
+    <!-- Title for multiple users main switch. [CHAR LIMIT=50] -->
+    <string name="multiple_users_main_switch_title">Use multiple users</string>
+    <!-- Title for wireless debugging main switch. [CHAR LIMIT=50] -->
+    <string name="wireless_debugging_main_switch_title">Use wireless debugging</string>
+    <!-- Title for graphics driver main switch. [CHAR LIMIT=50] -->
+    <string name="graphics_driver_main_switch_title">Use graphics driver preferences</string>
+    <!-- Title for battery saver main switch preferences. [CHAR LIMIT=50] -->
+    <string name="battery_saver_main_switch_title">Use battery saver</string>
+    <!-- Title for Do Not Disturb main switch preferences. [CHAR LIMIT=50] -->
+    <string name="do_not_disturb_main_switch_title_on">Turn off now</string>
+    <!-- Title for Do Not Disturb main switch preferences. [CHAR LIMIT=50] -->
+    <string name="do_not_disturb_main_switch_title_off">Turn on now</string>
+    <!-- Title for Night Light main switch preferences. [CHAR LIMIT=50] -->
+    <string name="night_light_main_switch_title">Use Night Light</string>
+    <!-- Title for NFC main switch preferences. [CHAR LIMIT=50] -->
+    <string name="nfc_main_switch_title">Use NFC</string>
+    <!-- Title for Adaptive Battery main switch preferences. [CHAR LIMIT=50] -->
+    <string name="adaptive_battery_main_switch_title">Use adaptive battery</string>
+    <!-- Title for adaptive brightness main switch preferences. [CHAR LIMIT=50] -->
+    <string name="adaptive_brightness_main_switch_title">Use adaptive brightness</string>
+    <!-- Title for wifi calling main switch preferences. [CHAR LIMIT=50] -->
+    <string name="wifi_calling_main_switch_title">Use Wi‑Fi calling</string>
 
     <!-- Default preference title for showing all apps on device [CHAR_LIMIT=50]-->
     <string name="default_see_all_apps_title">See all apps</string>
@@ -12782,6 +12909,11 @@
     <!-- Alert Dialog text when user didn't input the phone number [CHAR LIMIT=50]-->
     <string name="smart_forwarding_missing_alert_dialog_text">OK</string>
 
-    <!-- Enable 2G: Title for if user wants to enable 2G [CHAR LIMIT=40] -->
+    <!-- Title for toggle if user wants to enable 2G [CHAR LIMIT=40] -->
     <string name="enable_2g_title">Allow 2G</string>
+    <!-- Title for toggle if user wants to enable 2G [CHAR LIMIT=NONE] -->
+    <string name="enable_2g_summary">Use 2G cellular connections. For emergency calls, 2G is always turned on.</string>
+
+    <!-- Label for extra app info settings for a specific app [CHAR LIMIT=40] -->
+    <string name="extra_app_info_label" translatable="false"></string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 993417a..0d773f1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -606,7 +606,7 @@
 
     <style name="SetupWizardPartnerResource">
         <!-- Disable to use partner overlay theme for outside setupwizard flow. -->
-        <item name="sucUsePartnerResource">false</item>
+        <item name="sucUsePartnerResource">@bool/config_suc_use_partner_resource</item>
         <!-- Enable heavy theme style inside setupwizard flow. -->
         <item name="sudUsePartnerHeavyTheme">true</item>
     </style>
diff --git a/res/xml/accessibility_button_settings.xml b/res/xml/accessibility_button_settings.xml
new file mode 100644
index 0000000..5e81616
--- /dev/null
+++ b/res/xml/accessibility_button_settings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/accessibility_button_title">
+
+    <com.android.settingslib.widget.LayoutPreference
+        android:key="caption_preview"
+        android:title="@string/summary_placeholder"
+        android:layout="@layout/accessibility_button_preview"
+        android:selectable="false"
+        settings:searchable="false"
+        android:persistent="false"
+        settings:controller="com.android.settings.accessibility.AccessibilityButtonPreviewPreferenceController"/>
+
+    <ListPreference
+        android:entries="@array/accessibility_button_location_selector_titles"
+        android:entryValues="@array/accessibility_button_location_selector_values"
+        android:key="accessibility_button_location"
+        android:title="@string/accessibility_button_location_title"
+        android:summary="%s"
+        android:persistent="false"
+        settings:controller="com.android.settings.accessibility.AccessibilityButtonLocationPreferenceController"/>
+
+    <ListPreference
+        android:entries="@array/accessibility_button_size_selector_titles"
+        android:entryValues="@array/accessibility_button_size_selector_values"
+        android:key="accessibility_button_size"
+        android:title="@string/accessibility_button_size_title"
+        android:summary="%s"
+        android:persistent="false"
+        settings:controller="com.android.settings.accessibility.FloatingMenuSizePreferenceController"/>
+
+    <SwitchPreference
+        android:key="accessibility_button_fade"
+        android:title="@string/accessibility_button_fade_title"
+        android:summary="@string/accessibility_button_fade_summary"
+        android:persistent="false"
+        settings:controller="com.android.settings.accessibility.FloatingMenuFadePreferenceController"/>
+
+    <com.android.settings.widget.SeekBarPreference
+        android:key="accessibility_button_opacity"
+        android:title="@string/accessibility_button_opacity_title"
+        android:selectable="true"
+        android:persistent="false"
+        settings:controller="com.android.settings.accessibility.FloatingMenuOpacityPreferenceController"/>
+
+    <com.android.settingslib.widget.FooterPreference
+        android:key="accessibility_button_footer"
+        android:title="@string/accessibility_button_description"
+        android:selectable="false"
+        settings:searchable="false"
+        android:persistent="false"/>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 67b1211..1743f9b 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -128,8 +128,9 @@
 
     </PreferenceCategory>
 
-    <!-- TODO(b/174829936): Add title for shortcuts settings category. -->
-    <PreferenceCategory android:persistent="false">
+    <PreferenceCategory
+        android:persistent="false"
+        android:title="@string/general_category_title">
 
         <Preference
             android:fragment="com.android.settings.accessibility.ShortcutsSettingsFragment"
diff --git a/res/xml/accessibility_shortcuts_settings.xml b/res/xml/accessibility_shortcuts_settings.xml
index 35314e7..465f96d 100644
--- a/res/xml/accessibility_shortcuts_settings.xml
+++ b/res/xml/accessibility_shortcuts_settings.xml
@@ -21,6 +21,13 @@
     android:persistent="false"
     android:title="@string/accessibility_shortcuts_settings_title">
 
+    <Preference
+        android:fragment="com.android.settings.accessibility.AccessibilityButtonFragment"
+        android:key="accessibility_button_preference"
+        android:persistent="false"
+        android:title="@string/accessibility_button_title"
+        android:summary="@string/accessibility_button_summary"/>
+
     <SwitchPreference
         android:key="accessibility_shortcut_preference"
         android:persistent="false"
diff --git a/res/xml/accessibility_text_and_display.xml b/res/xml/accessibility_text_and_display.xml
index bd30e61..26b119f 100644
--- a/res/xml/accessibility_text_and_display.xml
+++ b/res/xml/accessibility_text_and_display.xml
@@ -43,13 +43,6 @@
         settings:controller="com.android.settings.accessibility.FontWeightAdjustmentPreferenceController"/>
 
     <Preference
-        android:fragment="com.android.settings.accessibility.TurnScreenDarkerFragment"
-        android:key="turn_screen_darker_preference_screen"
-        android:persistent="false"
-        android:title="@string/accessibility_turn_screen_darker_title"
-        settings:searchable="true"/>
-
-    <Preference
         android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
         android:icon="@drawable/ic_daltonizer"
         android:key="daltonizer_preference"
@@ -57,11 +50,13 @@
         android:title="@string/accessibility_display_daltonizer_preference_title"
         settings:controller="com.android.settings.accessibility.DaltonizerPreferenceController"/>
 
-    <SwitchPreference
-        android:key="toggle_high_text_contrast_preference"
+    <Preference
+        android:fragment="com.android.settings.accessibility.ToggleColorInversionPreferenceFragment"
+        android:icon="@drawable/ic_color_inversion"
+        android:key="toggle_inversion_preference"
         android:persistent="false"
-        android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
-        settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>
+        android:title="@string/accessibility_display_inversion_preference_title"
+        settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
 
     <SwitchPreference
         android:key="toggle_disable_animations"
@@ -75,9 +70,15 @@
         android:title="@string/accessibility_toggle_large_pointer_icon_title"
         settings:controller="com.android.settings.accessibility.LargePointerIconPreferenceController"/>
 
+    <SwitchPreference
+        android:key="toggle_high_text_contrast_preference"
+        android:persistent="false"
+        android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
+        settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>
+
     <PreferenceCategory
         android:key="experimental_category"
         android:persistent="false"
         android:title="@string/experimental_category_title">
     </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/res/xml/alarms_and_reminders.xml b/res/xml/alarms_and_reminders.xml
new file mode 100644
index 0000000..a9d4323
--- /dev/null
+++ b/res/xml/alarms_and_reminders.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:title="@string/alarms_and_reminders_title">
+
+    <com.android.settings.widget.FilterTouchesRestrictedSwitchPreference
+        android:key="alarms_and_reminders_switch"
+        android:title="@string/alarms_and_reminders_switch_title" />
+
+    <com.android.settingslib.widget.FooterPreference
+        android:key="alarms_and_reminders_description"
+        android:title="@string/alarms_and_reminders_footer_title"
+        android:selectable="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index bd2e85c..8b4c912 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -83,6 +83,16 @@
         <intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>
     </Preference>
 
+    <Preference
+        android:key="hibernated_apps"
+        android:title="@string/unused_apps"
+        android:summary="@string/summary_placeholder"
+        android:order="13"
+        settings:keywords="app_hibernation_key"
+        settings:controller="com.android.settings.applications.HibernatedAppsPreferenceController">
+        <intent android:action="android.intent.action.MANAGE_UNUSED_APPS"/>
+    </Preference>
+
     <com.android.settingslib.RestrictedPreference
         android:key="app_and_notif_cell_broadcast_settings"
         android:title="@string/cell_broadcast_settings"
@@ -90,7 +100,7 @@
         settings:useAdminDisabledSummary="true">
         <intent
             android:action="android.intent.action.MAIN"
-            android:targetPackage="@string/cell_broadcast_receiver_package"
+            android:targetPackage="@string/config_cell_broadcast_receiver_package"
             android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
     </com.android.settingslib.RestrictedPreference>
 
diff --git a/res/xml/app_info_settings.xml b/res/xml/app_info_settings.xml
index a76f0d9..f5d927e 100644
--- a/res/xml/app_info_settings.xml
+++ b/res/xml/app_info_settings.xml
@@ -120,6 +120,19 @@
         android:title="@string/sms_application_title"
         android:summary="@string/summary_placeholder" />
 
+    <PreferenceCategory
+        android:key="app_hibernation_info"
+        android:title="@string/unused_apps"
+        settings:controller=
+            "com.android.settings.applications.appinfo.AppHibernationPreferenceCategoryController">
+
+        <SwitchPreference
+            android:key="hibernation_switch"
+            android:title="@string/unused_apps_switch"
+            settings:controller=
+                "com.android.settings.applications.appinfo.HibernationSwitchPreferenceController" />
+    </PreferenceCategory>
+
     <!-- Advanced apps settings -->
     <PreferenceCategory
         android:key="advanced_app_info"
diff --git a/res/xml/app_info_settings_v2.xml b/res/xml/app_info_settings_v2.xml
index 805df59..80c449a 100644
--- a/res/xml/app_info_settings_v2.xml
+++ b/res/xml/app_info_settings_v2.xml
@@ -81,6 +81,11 @@
         settings:controller="com.android.settings.applications.appinfo.AppDataUsagePreferenceController" />
 
     <Preference
+        android:key="extra_app_info_settings"
+        android:title="@string/extra_app_info_label"
+        settings:controller="com.android.settings.applications.appinfo.ExtraAppInfoPreferenceController" />
+
+    <Preference
         android:key="time_spent_in_app"
         android:title="@string/time_spent_in_app_pref_title"
         settings:controller="com.android.settings.applications.appinfo.TimeSpentInAppPreferenceController" />
@@ -129,6 +134,19 @@
         android:title="@string/sms_application_title"
         android:summary="@string/summary_placeholder" />
 
+    <PreferenceCategory
+        android:key="app_hibernation_info"
+        android:title="@string/unused_apps"
+        settings:controller=
+            "com.android.settings.applications.appinfo.AppHibernationPreferenceCategoryController">
+
+        <SwitchPreference
+            android:key="hibernation_switch"
+            android:title="@string/unused_apps_switch"
+            settings:controller=
+                "com.android.settings.applications.appinfo.HibernationSwitchPreferenceController" />
+    </PreferenceCategory>
+
     <!-- Advanced apps settings -->
     <PreferenceCategory
         android:key="advanced_app_info"
diff --git a/res/xml/apps.xml b/res/xml/apps.xml
index df295bf..cefb67a 100644
--- a/res/xml/apps.xml
+++ b/res/xml/apps.xml
@@ -67,6 +67,16 @@
         android:order="10"/>
 
     <Preference
+        android:key="hibernated_apps"
+        android:title="@string/unused_apps"
+        android:summary="@string/summary_placeholder"
+        android:order="15"
+        settings:keywords="app_hibernation_key"
+        settings:controller="com.android.settings.applications.HibernatedAppsPreferenceController">
+        <intent android:action="android.intent.action.MANAGE_UNUSED_APPS"/>
+    </Preference>
+
+    <Preference
         android:key="special_access_v2"
         android:fragment="com.android.settings.applications.specialaccess.SpecialAccessSettings"
         android:title="@string/special_access"
diff --git a/res/xml/auto_rotate_settings.xml b/res/xml/auto_rotate_settings.xml
index a316b8f..7c46d29 100644
--- a/res/xml/auto_rotate_settings.xml
+++ b/res/xml/auto_rotate_settings.xml
@@ -20,11 +20,10 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/accelerometer_title" >
 
-    <Preference
+    <com.android.settingslib.widget.BannerMessagePreference
         android:key="face_rotate_permission"
         android:title="@string/adaptive_sleep_title_no_permission"
-        android:summary="@string/adaptive_sleep_summary_no_permission"
-        android:icon="@drawable/ic_info_outline_24"
+        android:summary="@string/auto_rotate_summary_no_permission"
         settings:controller="com.android.settings.display.SmartAutoRotatePermissionController" />
 
     <SwitchPreference
diff --git a/res/xml/channel_notification_settings.xml b/res/xml/channel_notification_settings.xml
index 707cae9..95f7944 100644
--- a/res/xml/channel_notification_settings.xml
+++ b/res/xml/channel_notification_settings.xml
@@ -65,56 +65,56 @@
         android:summary="@string/promote_conversation_summary"
         settings:allowDividerAbove="true"/>
 
-        <!-- Default ringtone -->
-        <com.android.settings.notification.app.NotificationSoundPreference
-            android:key="ringtone"
-            android:title="@string/notification_channel_sound_title"
-            android:dialogTitle="@string/notification_channel_sound_title"
-            android:order="11"
-            android:showSilent="true"
-            android:showDefault="true"/>
+    <!-- Default ringtone -->
+    <com.android.settings.notification.app.NotificationSoundPreference
+        android:key="ringtone"
+        android:title="@string/notification_channel_sound_title"
+        android:dialogTitle="@string/notification_channel_sound_title"
+        android:order="11"
+        android:showSilent="true"
+        android:showDefault="true"/>
 
-        <!-- Vibration -->
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="vibrate"
-            android:order="12"
-            android:title="@string/notification_vibrate_title"
-            settings:useAdditionalSummary="true" />
+    <!-- Vibration -->
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="vibrate"
+        android:order="12"
+        android:title="@string/notification_vibrate_title"
+        settings:useAdditionalSummary="true" />
 
-        <!-- Visibility Override -->
-        <com.android.settings.RestrictedListPreference
-            android:key="visibility_override"
-            android:order="13"
-            android:title="@string/app_notification_visibility_override_title"/>
+    <!-- Visibility Override -->
+    <com.android.settings.RestrictedListPreference
+        android:key="visibility_override"
+        android:order="13"
+        android:title="@string/app_notification_visibility_override_title"/>
 
-        <!-- Lights -->
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="lights"
-            android:order="14"
-            android:title="@string/notification_show_lights_title"
-            settings:useAdditionalSummary="true"/>
+    <!-- Lights -->
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="lights"
+        android:order="14"
+        android:title="@string/notification_show_lights_title"
+        settings:useAdditionalSummary="true"/>
 
-        <!-- Show badge -->
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="badge"
-            android:order="15"
-            android:title="@string/notification_channel_badge_title"
-            settings:useAdditionalSummary="true"
-            settings:restrictedSwitchSummary="@string/enabled_by_admin"/>
+    <!-- Show badge -->
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="badge"
+        android:order="15"
+        android:title="@string/notification_channel_badge_title"
+        settings:useAdditionalSummary="true"
+        settings:restrictedSwitchSummary="@string/enabled_by_admin"/>
 
-        <!-- Bypass DND -->
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="bypass_dnd"
-            android:order="17"
-            android:title="@string/app_notification_override_dnd_title"
-            android:summary="@string/app_notification_override_dnd_summary"
-            settings:useAdditionalSummary="true"/>
+    <!-- Bypass DND -->
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="bypass_dnd"
+        android:order="17"
+        android:title="@string/app_notification_override_dnd_title"
+        android:summary="@string/app_notification_override_dnd_summary"
+        settings:useAdditionalSummary="true"/>
 
-        <Preference
-            android:key="app_link"
-            android:order="18"
-            android:title="@string/app_settings_link"
-            settings:allowDividerAbove="true"/>
+    <Preference
+        android:key="app_link"
+        android:order="18"
+        android:title="@string/app_settings_link"
+        settings:allowDividerAbove="true"/>
 
     <com.android.settings.notification.app.NotificationFooterPreference
         android:key="desc"
diff --git a/res/xml/configure_notification_settings_v2.xml b/res/xml/configure_notification_settings_v2.xml
index 6c3ec52..b7cc2c8 100644
--- a/res/xml/configure_notification_settings_v2.xml
+++ b/res/xml/configure_notification_settings_v2.xml
@@ -23,12 +23,14 @@
         android:title="@string/conversation_notifs_category">
         <Preference
             android:key="conversations"
+            android:order="1"
             android:title="@string/conversations_category_title"
             settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"
             android:fragment="com.android.settings.notification.app.ConversationListSettings"
         />
         <Preference
             android:key="notification_bubbles"
+            android:order="2"
             android:title="@string/notification_bubbles_title"
             android:summary="@string/notifications_bubble_setting_on_summary"
             settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"
@@ -44,6 +46,7 @@
         <!-- See all apps button -->
         <Preference
             android:key="all_notifications"
+            android:order="10"
             android:title="@string/notifications_title"
             android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
             settings:searchable="false">
@@ -58,6 +61,7 @@
         android:title="@string/lock_screen_notifications_title">
         <Preference
             android:key="notification_history"
+            android:order="11"
             android:title="@string/notification_history"
             android:summary="@string/notification_history_summary">
             <intent
@@ -65,27 +69,38 @@
                 android:targetPackage="com.android.settings"
                 android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />
         </Preference>
+        <Preference
+            android:key="notification_access"
+            android:order="12"
+            android:title="@string/manage_notification_access_title"
+            android:summary="@string/manage_notification_access_summary"
+            android:fragment="com.android.settings.notification.NotificationAccessSettings"
+            settings:controller="com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessController" />
         <!-- When device is locked -->
         <com.android.settings.RestrictedListPreference
             android:key="lock_screen_notifications"
+            android:order="13"
             android:title="@string/lock_screen_notifs_title"
             android:singleLineTitle="false"
             android:summary="@string/summary_placeholder" />
 
         <SwitchPreference
             android:key="lock_screen_redact"
+            android:order="14"
             android:title="@string/lock_screen_notifs_redact"
             android:summary="@string/lock_screen_notifs_redact_summary"
             settings:controller="com.android.settings.notification.RedactNotificationPreferenceController" />
 
         <SwitchPreference
             android:key="lock_screen_work_redact"
+            android:order="15"
             android:title="@string/lock_screen_notifs_redact_work"
             android:summary="@string/lock_screen_notifs_redact_work_summary"
             settings:controller="com.android.settings.notification.RedactNotificationPreferenceController" />
 
         <SwitchPreference
             android:key="notification_lockscreen_bypass"
+            android:order="16"
             android:title="@string/lockscreen_bypass_title"
             android:summary="@string/lockscreen_bypass_summary"
             settings:searchable="false"
@@ -98,6 +113,7 @@
         android:title="@string/advanced_section_header">
         <com.android.settingslib.RestrictedPreference
             android:key="zen_mode_notifications"
+            android:order="17"
             android:title="@string/zen_mode_settings_title"
             settings:useAdminDisabledSummary="true"
             android:fragment="com.android.settings.notification.zen.ZenModeSettings"
@@ -105,33 +121,38 @@
         />
         <com.android.settingslib.RestrictedPreference
             android:key="app_and_notif_cell_broadcast_settings"
+            android:order="18"
             android:title="@string/cell_broadcast_settings"
             settings:useAdminDisabledSummary="true">
             <intent
                 android:action="android.intent.action.MAIN"
-                android:targetPackage="@string/cell_broadcast_receiver_package"
+                android:targetPackage="@string/config_cell_broadcast_receiver_package"
                 android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
         </com.android.settingslib.RestrictedPreference>
 
         <SwitchPreference
              android:key="silent_icons"
+             android:order="19"
              android:title="@string/silent_notifications_status_bar"
              settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>
 
         <SwitchPreference
             android:key="show_snooze_options"
+            android:order="20"
             android:title="@string/snooze_options_title"
             settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />
 
         <!-- Notification badging -->
         <SwitchPreference
             android:key="notification_badging"
+            android:order="21"
             android:title="@string/notification_badging_title"
             settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
 
         <!-- Pulse notification light, on devices that support it -->
         <SwitchPreference
             android:key="notification_pulse"
+            android:order="22"
             android:title="@string/notification_pulse_title"
             settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
     </PreferenceCategory>
diff --git a/res/xml/conversation_notification_settings.xml b/res/xml/conversation_notification_settings.xml
index 65fdee5..ea555c2 100644
--- a/res/xml/conversation_notification_settings.xml
+++ b/res/xml/conversation_notification_settings.xml
@@ -62,10 +62,6 @@
         android:key="block_desc"
         settings:allowDividerAbove="false"/>
 
-    <PreferenceCategory
-        android:key="channel_advanced"
-        android:order="50"
-        settings:initialExpandedChildrenCount="0">
 
         <!-- peeking -->
         <com.android.settingslib.RestrictedSwitchPreference
@@ -107,6 +103,5 @@
             android:icon="@drawable/ic_volume_ringer_vibrate"
             android:title="@string/notification_vibrate_title"
             settings:useAdditionalSummary="true" />
-    </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index 43a797a..6fc0b25 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -53,12 +53,12 @@
         settings:keywords="@string/keywords_time_zone"/>
 
     <!-- This preference gets removed if location-based time zone detection is not supported -->
-    <com.android.settingslib.RestrictedPreference
+    <com.android.settingslib.RestrictedSwitchPreference
         android:key="location_time_zone_detection"
-        android:title="@string/location_time_zone_detection_screen_title"
+        android:title="@string/location_time_zone_detection_toggle_title"
         settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController"
-        android:fragment="com.android.settings.datetime.locationtimezone.TimeZoneDetectionSettings"
-        settings:userRestriction="no_config_date_time"/>
+        settings:userRestriction="no_config_date_time"
+    />
 
     <PreferenceCategory
         android:key="time_format_preference_category"
diff --git a/res/xml/default_autofill_picker_settings.xml b/res/xml/default_autofill_picker_settings.xml
index bfc285b..392f733 100644
--- a/res/xml/default_autofill_picker_settings.xml
+++ b/res/xml/default_autofill_picker_settings.xml
@@ -22,14 +22,27 @@
     android:title="@string/autofill_app"
     settings:keywords="@string/autofill_keywords">
 
-  <com.android.settings.widget.GearPreference
-      android:key="default_autofill_main"
-      android:title="@string/autofill_app"
-      android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"
-      settings:searchable="false"
-      settings:keywords="@string/autofill_keywords">
-    <extra android:name="for_work" android:value="false" />
-  </com.android.settings.widget.GearPreference>
+  <PreferenceCategory
+      android:key="passwords_category"
+      android:persistent="false"
+      android:title="@string/autofill_passwords"
+      settings:controller="com.android.settings.applications.autofill.PasswordsPreferenceController" >
+  </PreferenceCategory>
+
+  <PreferenceCategory
+      android:key="default_service_category"
+      android:title="@string/autofill_app">
+
+    <!-- TODO(b/169455298): Fix the redundant title. -->
+    <com.android.settings.widget.GearPreference
+        android:key="default_autofill_main"
+        android:title="@string/autofill_app"
+        android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"
+        settings:searchable="false"
+        settings:keywords="@string/autofill_keywords">
+      <extra android:name="for_work" android:value="false" />
+    </com.android.settings.widget.GearPreference>
+  </PreferenceCategory>
 
 
   <com.android.settings.widget.WorkOnlyCategory
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 8df5696..27bf0ba 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -20,7 +20,7 @@
     android:key="display_settings_screen"
     android:title="@string/display_settings"
     settings:keywords="@string/keywords_display"
-    settings:initialExpandedChildrenCount="5">
+    settings:initialExpandedChildrenCount="6">
 
     <com.android.settingslib.RestrictedPreference
         android:key="brightness"
diff --git a/res/xml/emergency_settings.xml b/res/xml/emergency_settings.xml
index 774e328..28ae8b1 100644
--- a/res/xml/emergency_settings.xml
+++ b/res/xml/emergency_settings.xml
@@ -39,7 +39,7 @@
         settings:useAdminDisabledSummary="true">
         <intent
             android:action="android.intent.action.MAIN"
-            android:targetPackage="@string/cell_broadcast_receiver_package"
+            android:targetPackage="@string/config_cell_broadcast_receiver_package"
             android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
     </com.android.settingslib.RestrictedPreference>
 </PreferenceScreen>
diff --git a/res/xml/location_time_zone_detection.xml b/res/xml/location_recent_access_see_all.xml
similarity index 60%
rename from res/xml/location_time_zone_detection.xml
rename to res/xml/location_recent_access_see_all.xml
index 9f5e775..97b71ec 100644
--- a/res/xml/location_time_zone_detection.xml
+++ b/res/xml/location_recent_access_see_all.xml
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
+<!-- Copyright (C) 2021 The Android Open Source Project
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-
           http://www.apache.org/licenses/LICENSE-2.0
-
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:title="@string/location_time_zone_detection_screen_title">
-
-    <SwitchPreference
-        android:title="@string/location_time_zone_detection_enabled_title"
-        android:summary="@string/location_time_zone_detection_enabled_description"
-        settings:controller="com.android.settings.datetime.locationtimezone.TimeZoneDetectionTogglePreferenceController"
-        android:key="location_time_zone_detection_enabled" />
+    android:title="@string/location_category_recent_location_access"
+    android:key="all_recent_location_access"
+    settings:controller="com.android.settings.location.RecentLocationAccessSeeAllPreferenceController">
 
 </PreferenceScreen>
diff --git a/res/xml/location_scanning.xml b/res/xml/location_scanning.xml
deleted file mode 100644
index f82500b..0000000
--- a/res/xml/location_scanning.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/location_scanning_screen_title">
-
-        <SwitchPreference
-            android:title="@string/location_scanning_wifi_always_scanning_title"
-            android:summary="@string/location_scanning_wifi_always_scanning_description"
-            android:defaultValue="true"
-            android:key="wifi_always_scanning" />
-
-        <SwitchPreference
-            android:title="@string/location_scanning_bluetooth_always_scanning_title"
-            android:summary="@string/location_scanning_bluetooth_always_scanning_description"
-            android:defaultValue="true"
-            android:key="bluetooth_always_scanning" />
-
-</PreferenceScreen>
diff --git a/res/xml/location_services.xml b/res/xml/location_services.xml
new file mode 100644
index 0000000..516491c
--- /dev/null
+++ b/res/xml/location_services.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
+        android:title="@string/location_services_screen_title">
+
+        <PreferenceCategory
+            android:key="location_services"
+            android:layout="@layout/preference_category_no_label"
+            settings:controller="com.android.settings.location.LocationInjectedServicesPreferenceController"/>
+
+        <Preference
+            android:fragment="com.android.settings.location.WifiScanningFragment"
+            android:key="location_services_wifi_scanning"
+            android:title="@string/location_scanning_wifi_always_scanning_title"
+            settings:controller="com.android.settings.location.LocationServicesWifiScanningPreferenceController"/>
+
+        <Preference
+            android:fragment="com.android.settings.location.BluetoothScanningFragment"
+            android:key="location_services_bluetooth_scanning"
+            android:title="@string/location_scanning_bluetooth_always_scanning_title"
+            settings:controller="com.android.settings.location.LocationServicesBluetoothScanningPreferenceController"/>
+
+</PreferenceScreen>
diff --git a/res/xml/location_services_bluetooth_scanning.xml b/res/xml/location_services_bluetooth_scanning.xml
new file mode 100644
index 0000000..fb522f0
--- /dev/null
+++ b/res/xml/location_services_bluetooth_scanning.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
+        android:title="@string/location_scanning_bluetooth_always_scanning_title">
+
+        <com.android.settingslib.widget.MainSwitchPreference
+            android:key="bluetooth_always_scanning_switch"
+            android:title="@string/location_scanning_bluetooth_always_scanning_title"
+            settings:controller="com.android.settings.location.BluetoothScanningMainSwitchPreferenceController"/>
+
+        <com.android.settingslib.widget.FooterPreference
+            android:key="bluetooth_always_scanning_footer"
+            android:title="@string/location_scanning_bluetooth_always_scanning_description"
+            android:selectable="false"
+            settings:searchable="false"/>
+
+</PreferenceScreen>
diff --git a/res/xml/location_services_wifi_scanning.xml b/res/xml/location_services_wifi_scanning.xml
new file mode 100644
index 0000000..a436fac
--- /dev/null
+++ b/res/xml/location_services_wifi_scanning.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
+        android:title="@string/location_scanning_wifi_always_scanning_title">
+
+        <com.android.settingslib.widget.MainSwitchPreference
+            android:key="wifi_always_scanning_switch"
+            android:title="@string/location_scanning_wifi_always_scanning_title"
+            settings:controller="com.android.settings.location.WifiScanningMainSwitchPreferenceController"/>
+
+        <com.android.settingslib.widget.FooterPreference
+            android:key="wifi_always_scanning_footer"
+            android:title="@string/location_scanning_wifi_always_scanning_description"
+            android:selectable="false"
+            settings:searchable="false"/>
+
+</PreferenceScreen>
diff --git a/res/xml/location_services_workprofile.xml b/res/xml/location_services_workprofile.xml
new file mode 100644
index 0000000..6db2083
--- /dev/null
+++ b/res/xml/location_services_workprofile.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
+        android:title="@string/location_services_screen_title">
+
+        <PreferenceCategory
+            android:title="@string/managed_profile_location_services"
+            android:layout="@layout/preference_category_no_label"
+            android:key="location_services_managed_profile"
+            settings:controller="com.android.settings.location.LocationInjectedServicesForWorkPreferenceController"/>
+
+</PreferenceScreen>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index fb03f4c..93f30e5 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -22,15 +22,17 @@
     settings:keywords="@string/keywords_location">
 
     <PreferenceCategory
-        android:key="recent_location_requests"
-        android:title="@string/location_category_recent_location_requests"
-        settings:controller="com.android.settings.location.RecentLocationRequestPreferenceController"/>
+        android:key="recent_location_access"
+        android:title="@string/location_category_recent_location_access"
+        settings:controller=
+            "com.android.settings.location.RecentLocationAccessPreferenceController"/>
 
     <Preference
-        android:key="recent_location_requests_see_all_button"
-        android:title="@string/location_recent_location_requests_see_all"
+        android:key="recent_location_access_see_all_button"
+        android:title="@string/location_recent_location_access_see_all"
         android:icon="@drawable/ic_chevron_right_24dp"
-        android:fragment="com.android.settings.location.RecentLocationRequestSeeAllFragment"
+        android:fragment="com.android.settings.location.RecentLocationAccessSeeAllFragment"
+        settings:controller="com.android.settings.location.RecentLocationAccessSeeAllButtonPreferenceController"
         settings:searchable="false"/>
 
     <PreferenceCategory
@@ -50,10 +52,10 @@
         </Preference>
 
         <Preference
-            android:fragment="com.android.settings.location.ScanningSettings"
-            android:key="location_scanning"
-            android:title="@string/location_scanning_screen_title"
-            settings:controller="com.android.settings.location.LocationScanningPreferenceController"/>
+            android:fragment="com.android.settings.location.LocationServices"
+            android:key="location_services"
+            android:title="@string/location_services_screen_title"
+            settings:controller="com.android.settings.location.LocationServicesPreferenceController"/>
 
         <!-- This preference gets removed if there is no managed profile -->
         <com.android.settingslib.RestrictedSwitchPreference
@@ -65,17 +67,12 @@
             settings:forWork="true"
             settings:useAdminDisabledSummary="true"/>
 
-        <PreferenceCategory
-            android:key="location_services"
-            android:layout="@layout/preference_category_no_label"
-            settings:controller="com.android.settings.location.LocationServicePreferenceController"/>
-
         <!-- This preference gets removed if there is no managed profile -->
         <PreferenceCategory
             android:key="location_services_managed_profile"
             android:title="@string/managed_profile_location_services"
             settings:forWork="true"
-            settings:controller="com.android.settings.location.LocationServiceForWorkPreferenceController"/>
+            settings:controller="com.android.settings.location.LocationInjectedServicesForWorkPreferenceController"/>
 
     </PreferenceCategory>
 
diff --git a/res/xml/location_settings_personal.xml b/res/xml/location_settings_personal.xml
index de8ed81..0e971d6 100644
--- a/res/xml/location_settings_personal.xml
+++ b/res/xml/location_settings_personal.xml
@@ -23,15 +23,17 @@
     settings:keywords="@string/keywords_location">
 
     <PreferenceCategory
-        android:key="recent_location_requests"
-        android:title="@string/location_category_recent_location_requests"
-        settings:controller="com.android.settings.location.RecentLocationRequestPreferenceController"/>
+        android:key="recent_location_access"
+        android:title="@string/location_category_recent_location_access"
+        settings:controller=
+            "com.android.settings.location.RecentLocationAccessPreferenceController"/>
 
     <Preference
-        android:key="recent_location_requests_see_all_button"
-        android:title="@string/location_recent_location_requests_see_all"
+        android:key="recent_location_access_see_all_button"
+        android:title="@string/location_recent_location_access_see_all"
         android:icon="@drawable/ic_chevron_right_24dp"
-        android:fragment="com.android.settings.location.RecentLocationRequestSeeAllFragment"
+        android:fragment="com.android.settings.location.RecentLocationAccessSeeAllFragment"
+        settings:controller="com.android.settings.location.RecentLocationAccessSeeAllButtonPreferenceController"
         settings:searchable="false"/>
 
     <!-- This preference category gets removed if new_recent_location_ui is disabled -->
@@ -46,15 +48,10 @@
     </Preference>
 
     <Preference
-        android:key="location_scanning"
-        android:title="@string/location_scanning_screen_title"
-        android:fragment="com.android.settings.location.ScanningSettings"
-        settings:controller="com.android.settings.location.LocationScanningPreferenceController"/>
-
-    <PreferenceCategory
         android:key="location_services"
-        android:layout="@layout/preference_category_no_label"
-        settings:controller="com.android.settings.location.LocationServicePreferenceController"/>
+        android:title="@string/location_services_screen_title"
+        android:fragment="com.android.settings.location.LocationServices"
+        settings:controller="com.android.settings.location.LocationServicesPreferenceController"/>
 
     <PreferenceCategory
         android:key="location_footer"
diff --git a/res/xml/location_settings_workprofile.xml b/res/xml/location_settings_workprofile.xml
index f15c8d8..c3efcbe 100644
--- a/res/xml/location_settings_workprofile.xml
+++ b/res/xml/location_settings_workprofile.xml
@@ -23,16 +23,17 @@
     settings:keywords="@string/keywords_location">
 
     <PreferenceCategory
-        android:key="recent_location_requests"
-        android:title="@string/location_category_recent_location_requests"
-        settings:controller="com.android.settings.location.RecentLocationRequestPreferenceController"/>
+        android:key="recent_location_access"
+        android:title="@string/location_category_recent_location_access"
+        settings:controller=
+            "com.android.settings.location.RecentLocationAccessPreferenceController"/>
 
     <Preference
-        android:key="recent_location_requests_see_all_button"
-        android:title="@string/location_recent_location_requests_see_all"
+        android:key="recent_location_access_see_all_button"
+        android:title="@string/location_recent_location_access_see_all"
         android:icon="@drawable/ic_chevron_right_24dp"
-        android:fragment="com.android.settings.location.RecentLocationRequestSeeAllFragment"
-        settings:controller="com.android.settings.core.WorkPreferenceController"
+        android:fragment="com.android.settings.location.RecentLocationAccessSeeAllFragment"
+        settings:controller="com.android.settings.location.RecentLocationAccessSeeAllButtonPreferenceController"
         settings:forWork="true"
         settings:searchable="false"/>
 
@@ -54,11 +55,11 @@
         </intent>
     </Preference>
 
-    <PreferenceCategory
-        android:title="@string/managed_profile_location_services"
-        android:layout="@layout/preference_category_no_label"
-        android:key="location_services_managed_profile"
-        settings:controller="com.android.settings.location.LocationServiceForWorkPreferenceController"/>
+    <Preference
+        android:key="location_services_for_work"
+        android:title="@string/location_services_screen_title"
+        android:fragment="com.android.settings.location.LocationServicesForWork"
+        settings:controller="com.android.settings.location.LocationServicesForWorkPreferenceController"/>
 
     <PreferenceCategory
         android:key="location_footer"
diff --git a/res/xml/media_management_apps.xml b/res/xml/media_management_apps.xml
new file mode 100644
index 0000000..7cf0d77
--- /dev/null
+++ b/res/xml/media_management_apps.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:title="@string/media_management_apps_title">
+
+    <com.android.settings.widget.FilterTouchesSwitchPreference
+        android:key="media_management_apps_toggle"
+        android:title="@string/media_management_apps_toggle_label" />
+
+    <com.android.settingslib.widget.FooterPreference
+        android:key="media_management_apps_description"
+        android:title="@string/media_management_apps_description"
+        android:selectable="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index 86f5a83..7ab9893 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -258,5 +258,6 @@
     <SwitchPreference
         android:key="enable_2g"
         android:title="@string/enable_2g_title"
+        android:summary="@string/enable_2g_summary"
         settings:controller="com.android.settings.network.telephony.Enable2gPreferenceController" />
 </PreferenceScreen>
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index c92ce94..4a11cbe 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -18,8 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="network_and_internet_screen"
-    android:title="@string/network_dashboard_title"
-    settings:initialExpandedChildrenCount="5">
+    android:title="@string/network_dashboard_title">
 
     <PreferenceCategory
         android:key="multi_network_header"
diff --git a/res/xml/network_provider_calls_sms.xml b/res/xml/network_provider_calls_sms.xml
index 0b390b5..2281f48 100644
--- a/res/xml/network_provider_calls_sms.xml
+++ b/res/xml/network_provider_calls_sms.xml
@@ -51,12 +51,4 @@
         settings:controller="com.android.settings.network.telephony.NetworkProviderBackupCallingPreferenceController"
         settings:allowDividerAbove="true"
         />
-
-    <com.android.settingslib.widget.FooterPreference
-        android:key="provider_model_calls_sms_footer"
-        android:title="@string/calls_sms_footnote"
-        android:selectable="false"
-        settings:allowDividerAbove="true"
-        settings:searchable="false"
-        settings:controller="com.android.settings.network.telephony.NetworkProviderWfcFooterPreferenceController"/>
 </PreferenceScreen>
diff --git a/res/xml/network_provider_internet.xml b/res/xml/network_provider_internet.xml
index 90a04f1..bb7117d 100644
--- a/res/xml/network_provider_internet.xml
+++ b/res/xml/network_provider_internet.xml
@@ -18,8 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="network_provider_and_internet_screen"
-    android:title="@string/network_dashboard_title"
-    settings:initialExpandedChildrenCount="5">
+    android:title="@string/network_dashboard_title">
 
     <com.android.settingslib.RestrictedPreference
         android:fragment="com.android.settings.network.NetworkProviderSettings"
@@ -61,15 +60,6 @@
         settings:controller="com.android.settings.network.AirplaneModePreferenceController"
         settings:userRestriction="no_airplane_mode"/>
 
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="airplane_safe_networks"
-        android:title="@string/airplane_safe_networks"
-        android:icon="@drawable/ic_airplane_safe_networks_24dp"
-        android:summary="@string/airplane_safe_networks_summary"
-        android:order="-4"
-        settings:userRestriction="no_airplane_mode"
-        settings:keywords="@string/keywords_airplane_safe_networks" />
-
     <com.android.settingslib.RestrictedPreference
         android:key="manage_mobile_plan"
         android:title="@string/manage_mobile_plan_title"
diff --git a/res/xml/network_provider_settings.xml b/res/xml/network_provider_settings.xml
index 0a8dbaa..30fe6fe 100644
--- a/res/xml/network_provider_settings.xml
+++ b/res/xml/network_provider_settings.xml
@@ -28,12 +28,12 @@
         android:layout="@layout/resetting_internet"
         settings:allowDividerBelow="true"/>
 
-    <!-- View airplane mode networks button -->
+    <!-- Airplane mode message -->
     <com.android.settingslib.widget.LayoutPreference
-        android:key="view_airplane_mode_netwokrs_button"
+        android:key="airplane_mode_message"
         android:title="@string/condition_airplane_title"
         android:selectable="false"
-        android:layout="@layout/view_airplane_mode_networks_button"
+        android:layout="@layout/airplane_mode_message_preference"
         settings:allowDividerBelow="true"/>
 
     <Preference
@@ -56,6 +56,13 @@
         android:key="access_points"
         android:layout="@layout/preference_category_no_label"/>
 
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="wifi_switch"
+        android:title="@string/wifi"
+        android:summary="@string/wifi_switch_summary"
+        settings:allowDividerAbove="true"
+        settings:keywords="@string/keywords_wifi"/>
+
     <Preference
         android:key="configure_wifi_settings"
         android:title="@string/network_and_internet_preferences_title"
diff --git a/res/xml/notification_access_bridged_apps_settings.xml b/res/xml/notification_access_bridged_apps_settings.xml
index 590a468..535a040 100644
--- a/res/xml/notification_access_bridged_apps_settings.xml
+++ b/res/xml/notification_access_bridged_apps_settings.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="nonbridged_apps"
-    android:title="@string/notif_listener_excluded_app_title"
+    android:title="@string/notif_listener_excluded_app_screen_title"
     settings:controller="com.android.settings.applications.specialaccess.notificationaccess.BridgedAppsPreferenceController"
     settings:searchable="false">
 </PreferenceScreen>
diff --git a/res/xml/notification_access_permission_details.xml b/res/xml/notification_access_permission_details.xml
index edac955..c4bb7f0 100644
--- a/res/xml/notification_access_permission_details.xml
+++ b/res/xml/notification_access_permission_details.xml
@@ -31,21 +31,37 @@
         android:title="@string/notification_access_detail_switch"
         settings:controller="com.android.settings.applications.specialaccess.notificationaccess.ApprovalPreferenceController"/>
 
-    <MultiSelectListPreference
-        android:key="notification_type_filter"
-        android:title="@string/notification_listener_type_title"
-        android:entries="@array/notif_types_titles"
-        android:entryValues="@array/notif_types_values"
-        android:summary="%s"
-        android:persistent="false"
-        style="@style/SettingsMultiSelectListPreference"
-        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.TypeFilterPreferenceController"/>/>
+    <CheckBoxPreference
+        android:key="type_filter_ongoing"
+        android:title="@string/notif_type_ongoing"
+        android:summary="@string/notif_type_ongoing_summary"
+        android:icon="@drawable/ic_ongoing_notification"
+        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.OngoingTypeFilterPreferenceController"/>
+    <CheckBoxPreference
+        android:key="type_filter_conversation"
+        android:title="@string/notif_type_conversation"
+        android:summary="@string/notif_type_conversation_summary"
+        android:icon="@drawable/ic_promote_conversation"
+        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.ConversationTypeFilterPreferenceController"/>
+    <CheckBoxPreference
+        android:key="type_filter_alerting"
+        android:title="@string/notif_type_alerting"
+        android:summary="@string/notif_type_alerting_summary"
+        android:icon="@drawable/ic_notification_alert"
+        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.AlertingTypeFilterPreferenceController"/>
+    <CheckBoxPreference
+        android:key="type_filter_silent"
+        android:title="@string/notif_type_silent"
+        android:summary="@string/notif_type_silent_summary"
+        android:icon="@drawable/ic_notification_silence"
+        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.SilentTypeFilterPreferenceController"/>
 
-        <Preference
-            android:key="bridged_apps"
-            android:title="@string/notif_listener_excluded_app_title"
-            android:fragment="com.android.settings.applications.specialaccess.notificationaccess.BridgedAppsSettings"
-            settings:searchable="false"
-            settings:controller="com.android.settings.applications.specialaccess.notificationaccess.BridgedAppsPreferenceController" />
+    <Preference
+        android:key="bridged_apps"
+        android:title="@string/notif_listener_excluded_app_title"
+        android:summary="@string/notif_listener_excluded_app_summary"
+        android:fragment="com.android.settings.applications.specialaccess.notificationaccess.BridgedAppsSettings"
+        settings:searchable="false"
+        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.BridgedAppsPreferenceController" />
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/notification_access_settings.xml b/res/xml/notification_access_settings.xml
index 43f7c49..b523d7d 100644
--- a/res/xml/notification_access_settings.xml
+++ b/res/xml/notification_access_settings.xml
@@ -21,4 +21,13 @@
     android:key="notification_access_screen"
     android:title="@string/manage_notification_access_title"
     settings:searchable="false"
-    settings:controller="com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessScreenPreferenceController" />
+    settings:controller="com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessScreenPreferenceController">
+
+    <PreferenceCategory
+        android:key="allowed"
+        android:title="@string/app_permission_summary_allowed"/>
+
+    <PreferenceCategory
+        android:key="not_allowed"
+        android:title="@string/app_permission_summary_not_allowed"/>
+</PreferenceScreen>
diff --git a/res/xml/one_handed_settings.xml b/res/xml/one_handed_settings.xml
index 3508d8a..9382657 100644
--- a/res/xml/one_handed_settings.xml
+++ b/res/xml/one_handed_settings.xml
@@ -21,6 +21,14 @@
     android:persistent="false"
     android:title="@string/one_handed_title">
 
+    <com.android.settingslib.widget.LayoutPreference
+        android:key="one_handed_header"
+        android:layout="@layout/one_handed_header"
+        android:persistent="false"
+        android:selectable="false"
+        settings:allowDividerBelow="false"
+        settings:searchable="false"/>
+
     <SwitchPreference
         android:key="gesture_one_handed_mode_enabled"
         android:title="@string/one_handed_mode_enabled"
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index b5e414b..75bbca0 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -17,6 +17,7 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:key="power_usage_summary_screen"
     android:title="@string/power_usage_summary_title"
     settings:keywords="@string/keywords_battery">
@@ -31,6 +32,7 @@
         android:fragment="com.android.settings.fuelgauge.PowerUsageAdvanced"
         android:key="battery_usage_summary"
         android:title="@string/advanced_battery_preference_title"
+        app:iconSpaceReserved="false"
         settings:searchable="false" />
 
     <com.android.settings.widget.CardPreference
@@ -38,23 +40,27 @@
         android:title="@string/summary_placeholder"
         settings:controller="com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController" />
 
-    <com.android.settings.widget.PrimarySwitchPreference
-        android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings"
-        android:key="battery_saver_summary"
-        android:title="@string/battery_saver"
-        settings:controller="com.android.settings.fuelgauge.BatterySaverController" />
+    <PreferenceCategory>
+        <SwitchPreference
+            android:key="battery_percentage"
+            android:title="@string/battery_percentage"
+            android:summary="@string/battery_percentage_description"
+            settings:controller="com.android.settings.display.BatteryPercentagePreferenceController" />
+    </PreferenceCategory>
 
-    <SwitchPreference
-        android:key="battery_percentage"
-        android:title="@string/battery_percentage"
-        android:summary="@string/battery_percentage_description"
-        settings:controller="com.android.settings.display.BatteryPercentagePreferenceController" />
+    <PreferenceCategory>
+        <Preference
+            android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings"
+            android:key="battery_saver_summary"
+            android:title="@string/battery_saver"
+            settings:controller="com.android.settings.fuelgauge.BatterySaverController" />
 
-    <Preference
-        android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
-        android:key="smart_battery_manager"
-        android:title="@string/smart_battery_manager_title"
-        settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController" />
+        <Preference
+            android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
+            android:key="smart_battery_manager"
+            android:title="@string/smart_battery_manager_title"
+            settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController" />
+    </PreferenceCategory>
 
     <com.android.settingslib.widget.FooterPreference
         android:key="power_usage_footer"
diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml
index b5dcebf..1b7b026 100644
--- a/res/xml/security_dashboard_settings.xml
+++ b/res/xml/security_dashboard_settings.xml
@@ -78,7 +78,6 @@
 
         <SwitchPreference
             android:key="visiblepattern_profile"
-            android:summary="@string/summary_placeholder"
             android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"
             settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
 
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 150c1e6..83c23b5 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -29,17 +29,6 @@
     </Preference>
 
     <Preference
-        android:key="high_power_apps"
-        android:title="@string/high_power_apps"
-        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
-        settings:keywords="@string/keywords_ignore_optimizations"
-        settings:controller="com.android.settings.applications.specialaccess.HighPowerAppsController">
-        <extra
-            android:name="classname"
-            android:value="com.android.settings.Settings$HighPowerApplicationsActivity" />
-    </Preference>
-
-    <Preference
         android:key="interact_across_profiles"
         android:title="@string/interact_across_profiles_title"
         android:fragment="com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesSettings"
@@ -72,6 +61,16 @@
         settings:controller="com.android.settings.applications.specialaccess.zenaccess.ZenAccessController" />
 
     <Preference
+        android:key="media_management_apps"
+        android:title="@string/media_management_apps_title"
+        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
+        settings:keywords="@string/keywords_media_management_apps">
+        <extra
+            android:name="classname"
+            android:value="com.android.settings.Settings$MediaManagementAppsActivity" />
+    </Preference>
+
+    <Preference
         android:key="write_settings_apps"
         android:title="@string/write_settings"
         android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
@@ -124,6 +123,16 @@
     </Preference>
 
     <Preference
+        android:key="alarms_and_reminders"
+        android:title="@string/alarms_and_reminders_title"
+        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
+        settings:keywords="@string/keywords_alarms_and_reminders">
+        <extra
+            android:name="classname"
+            android:value="com.android.settings.Settings$AlarmsAndRemindersActivity" />
+    </Preference>
+
+    <Preference
         android:key="special_app_usage_access"
         android:title="@string/usage_access"
         android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
diff --git a/res/xml/top_level_settings_grouped.xml b/res/xml/top_level_settings_grouped.xml
index d6564b7..704a106 100644
--- a/res/xml/top_level_settings_grouped.xml
+++ b/res/xml/top_level_settings_grouped.xml
@@ -24,7 +24,7 @@
         android:fragment="com.android.settings.network.NetworkDashboardFragment"
         android:icon="@drawable/ic_homepage_network_v2"
         android:key="top_level_network"
-        android:order="-140"
+        android:order="-150"
         android:title="@string/network_dashboard_title"
         settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>
 
@@ -32,153 +32,128 @@
         android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
         android:icon="@drawable/ic_homepage_connected_device_v2"
         android:key="top_level_connected_devices"
-        android:order="-130"
+        android:order="-140"
         android:title="@string/connected_devices_dashboard_title"
         settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
 
-    <PreferenceCategory
-        android:key="apps"
+    <com.android.settings.homepage.HomepagePreference
+        android:fragment="com.android.settings.applications.AppDashboardFragment"
+        android:icon="@drawable/ic_homepage_apps_v2"
+        android:key="top_level_apps"
+        android:order="-130"
+        android:title="@string/apps_dashboard_title"/>
+
+    <com.android.settings.homepage.HomepagePreference
+        android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
+        android:icon="@drawable/ic_homepage_notification_v2"
+        android:key="top_level_notification"
         android:order="-120"
-        settings:allowDividerAbove="false">
-        <com.android.settings.homepage.HomepagePreference
-            android:fragment="com.android.settings.applications.AppDashboardFragment"
-            android:icon="@drawable/ic_homepage_apps_v2"
-            android:key="top_level_apps"
-            android:order="-120"
-            android:title="@string/apps_dashboard_title"/>
+        android:title="@string/configure_notification_settings"/>
 
-        <com.android.settings.homepage.HomepagePreference
-            android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
-            android:icon="@drawable/ic_homepage_notification_v2"
-            android:key="top_level_notification"
-            android:order="-110"
-            android:title="@string/configure_notification_settings"/>
-    </PreferenceCategory>
+    <com.android.settings.homepage.HomepagePreference
+        android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
+        android:icon="@drawable/ic_homepage_battery_v2"
+        android:key="top_level_battery"
+        android:order="-110"
+        android:title="@string/power_usage_summary_title"
+        settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
 
-    <PreferenceCategory
-        android:key="phone_essential"
+    <com.android.settings.homepage.HomepagePreference
+        android:fragment="com.android.settings.deviceinfo.StorageSettings"
+        android:icon="@drawable/ic_homepage_storage_v2"
+        android:key="top_level_storage"
         android:order="-100"
-        settings:allowDividerAbove="false">
-        <com.android.settings.homepage.HomepagePreference
-            android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
-            android:icon="@drawable/ic_homepage_battery_v2"
-            android:key="top_level_battery"
-            android:order="-100"
-            android:title="@string/power_usage_summary_title"
-            settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
+        android:title="@string/storage_settings"
+        settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
 
-        <com.android.settings.homepage.HomepagePreference
-            android:fragment="com.android.settings.deviceinfo.StorageSettings"
-            android:icon="@drawable/ic_homepage_storage_v2"
-            android:key="top_level_storage"
-            android:order="-90"
-            android:title="@string/storage_settings"
-            settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
+    <com.android.settings.homepage.HomepagePreference
+        android:fragment="com.android.settings.notification.SoundSettings"
+        android:icon="@drawable/ic_homepage_sound_v2"
+        android:key="top_level_sound"
+        android:order="-90"
+        android:title="@string/sound_settings"/>
 
-        <com.android.settings.homepage.HomepagePreference
-            android:fragment="com.android.settings.notification.SoundSettings"
-            android:icon="@drawable/ic_homepage_sound_v2"
-            android:key="top_level_sound"
-            android:order="-80"
-            android:title="@string/sound_settings"/>
+    <com.android.settings.homepage.HomepagePreference
+        android:fragment="com.android.settings.DisplaySettings"
+        android:icon="@drawable/ic_homepage_display_v2"
+        android:key="top_level_display"
+        android:order="-80"
+        android:title="@string/display_settings"
+        settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
 
-        <com.android.settings.homepage.HomepagePreference
-            android:fragment="com.android.settings.DisplaySettings"
-            android:icon="@drawable/ic_homepage_display_v2"
-            android:key="top_level_display"
-            android:order="-70"
-            android:title="@string/display_settings"
-            settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
+    <com.android.settings.homepage.RestrictedHomepagePreference
+        android:icon="@drawable/ic_homepage_wallpaper_v2"
+        android:key="top_level_wallpaper"
+        android:order="-70"
+        android:title="@string/wallpaper_settings_title"
+        settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>
 
-        <com.android.settings.homepage.RestrictedHomepagePreference
-            android:icon="@drawable/ic_homepage_wallpaper_v2"
-            android:key="top_level_wallpaper"
-            android:order="-60"
-            android:title="@string/wallpaper_settings_title"
-            settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>
+    <com.android.settings.homepage.HomepagePreference
+        android:fragment="com.android.settings.accessibility.AccessibilitySettings"
+        android:icon="@drawable/ic_homepage_accessibility_v2"
+        android:key="top_level_accessibility"
+        android:order="-60"
+        android:title="@string/accessibility_settings"
+        settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
 
-        <com.android.settings.homepage.HomepagePreference
-            android:fragment="com.android.settings.accessibility.AccessibilitySettings"
-            android:icon="@drawable/ic_homepage_accessibility_v2"
-            android:key="top_level_accessibility"
-            android:order="-50"
-            android:title="@string/accessibility_settings"
-            settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
-    </PreferenceCategory>
+    <com.android.settings.homepage.HomepagePreference
+        android:fragment="com.android.settings.security.SecuritySettings"
+        android:icon="@drawable/ic_homepage_security_v2"
+        android:key="top_level_security"
+        android:order="-50"
+        android:title="@string/security_settings_title"
+        settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
 
-    <PreferenceCategory
-        android:key="privacy_and_security"
+    <com.android.settings.homepage.HomepagePreference
+        android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
+        android:icon="@drawable/ic_homepage_privacy_v2"
+        android:key="top_level_privacy"
         android:order="-40"
-        settings:allowDividerAbove="false">
-        <com.android.settings.homepage.HomepagePreference
-            android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
-            android:icon="@drawable/ic_homepage_privacy_v2"
-            android:key="top_level_privacy"
-            android:order="-40"
-            android:title="@string/privacy_dashboard_title"/>
+        android:title="@string/privacy_dashboard_title"/>
 
-        <com.android.settings.homepage.HomepagePreference
-            android:fragment="com.android.settings.location.LocationSettings"
-            android:icon="@drawable/ic_homepage_location_v2"
-            android:key="top_level_location"
-            android:order="-30"
-            android:title="@string/location_settings_title"
-            settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
+    <com.android.settings.homepage.HomepagePreference
+        android:fragment="com.android.settings.location.LocationSettings"
+        android:icon="@drawable/ic_homepage_location_v2"
+        android:key="top_level_location"
+        android:order="-30"
+        android:title="@string/location_settings_title"
+        settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
 
-        <com.android.settings.homepage.HomepagePreference
-            android:fragment="com.android.settings.security.SecuritySettings"
-            android:icon="@drawable/ic_homepage_security_v2"
-            android:key="top_level_security"
-            android:order="-20"
-            android:title="@string/security_settings_title"
-            settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
+    <com.android.settings.homepage.HomepagePreference
+        android:key="top_level_emergency"
+        android:title="@string/emergency_settings_preference_title"
+        android:icon="@drawable/ic_homepage_emergency_v2"
+        android:order="-20"
+        android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>
 
-        <com.android.settings.homepage.HomepagePreference
-            android:key="top_level_emergency"
-            android:title="@string/emergency_settings_preference_title"
-            android:icon="@drawable/ic_homepage_emergency_v2"
-            android:order="-10"
-            android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="accounts"
+    <com.android.settings.homepage.HomepagePreference
+        android:fragment="com.android.settings.accounts.AccountDashboardFragment"
+        android:icon="@drawable/ic_homepage_accounts_v2"
+        android:key="top_level_accounts"
         android:order="-10"
-        settings:allowDividerAbove="false">
-        <com.android.settings.homepage.HomepagePreference
-            android:fragment="com.android.settings.accounts.AccountDashboardFragment"
-            android:icon="@drawable/ic_homepage_accounts_v2"
-            android:key="top_level_accounts"
-            android:order="-10"
-            android:title="@string/account_dashboard_title"
-            settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
-    </PreferenceCategory>
+        android:title="@string/account_dashboard_title"
+        settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
 
-    <PreferenceCategory
-        android:key="system"
+    <com.android.settings.homepage.HomepagePreference
+        android:fragment="com.android.settings.system.SystemDashboardFragment"
+        android:icon="@drawable/ic_homepage_system_dashboard_v2"
+        android:key="top_level_system"
         android:order="10"
-        settings:allowDividerAbove="false">
-        <com.android.settings.homepage.HomepagePreference
-            android:fragment="com.android.settings.system.SystemDashboardFragment"
-            android:icon="@drawable/ic_homepage_system_dashboard_v2"
-            android:key="top_level_system"
-            android:order="10"
-            android:title="@string/header_category_system"/>
+        android:title="@string/header_category_system"/>
 
-        <com.android.settings.homepage.HomepagePreference
-            android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
-            android:icon="@drawable/ic_homepage_about_v2"
-            android:key="top_level_about_device"
-            android:order="20"
-            android:title="@string/about_settings"
-            settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>
+    <com.android.settings.homepage.HomepagePreference
+        android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
+        android:icon="@drawable/ic_homepage_about_v2"
+        android:key="top_level_about_device"
+        android:order="20"
+        android:title="@string/about_settings"
+        settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>
 
-        <com.android.settings.homepage.HomepagePreference
-            android:icon="@drawable/ic_homepage_support_v2"
-            android:key="top_level_support"
-            android:order="100"
-            android:title="@string/page_tab_title_support"
-            settings:controller="com.android.settings.support.SupportPreferenceController"/>
-    </PreferenceCategory>
+    <com.android.settings.homepage.HomepagePreference
+        android:icon="@drawable/ic_homepage_support_v2"
+        android:key="top_level_support"
+        android:order="100"
+        android:title="@string/page_tab_title_support"
+        settings:controller="com.android.settings.support.SupportPreferenceController"/>
 
 </PreferenceScreen>
diff --git a/res/xml/transcode_settings.xml b/res/xml/transcode_settings.xml
index b142d31..c5a9763 100644
--- a/res/xml/transcode_settings.xml
+++ b/res/xml/transcode_settings.xml
@@ -35,4 +35,9 @@
         android:key="transcode_default"
         android:title="@string/transcode_default"
         settings:controller="com.android.settings.development.transcode.TranscodeDefaultOptionPreferenceController" />
+
+    <SwitchPreference
+        android:key="transcode_notification"
+        android:title="@string/transcode_notification"
+        settings:controller="com.android.settings.development.transcode.TranscodeNotificationPreferenceController" />
 </PreferenceScreen>
diff --git a/res/xml/wifi_tether_settings.xml b/res/xml/wifi_tether_settings.xml
index 34d8032..8648cff 100644
--- a/res/xml/wifi_tether_settings.xml
+++ b/res/xml/wifi_tether_settings.xml
@@ -37,12 +37,13 @@
         android:persistent="false"
         android:title="@string/wifi_hotspot_password_title"/>
 
-    <ListPreference
-        android:key="wifi_tether_network_ap_band"
-        android:title="@string/wifi_hotspot_ap_band_title"/>
-
     <SwitchPreference
         android:key="wifi_tether_auto_turn_off"
         android:title="@string/wifi_hotspot_auto_off_title"
         android:summary="@string/wifi_hotspot_auto_off_summary"/>
+
+    <SwitchPreference
+        android:key="wifi_tether_maximize_compatibility"
+        android:title="@string/wifi_hotspot_maximize_compatibility"
+        android:summary="@string/wifi_hotspot_maximize_compatibility_summary"/>
 </PreferenceScreen>
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 78dee02..10b3e41 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -23,7 +23,6 @@
     <!-- Turn on DND button -->
     <com.android.settingslib.widget.MainSwitchPreference
         android:key="zen_mode_toggle"
-        android:title="@string/do_not_disturb_main_switch_title"
         settings:keywords="@string/keywords_zen_mode_settings"/>
 
     <PreferenceCategory
@@ -49,15 +48,18 @@
     </PreferenceCategory>
 
     <!-- Automatic rules -->
-    <Preference
-        android:key="zen_mode_automation_settings"
-        android:title="@string/zen_category_schedule"
-        settings:allowDividerAbove="true"
-        android:fragment="com.android.settings.notification.zen.ZenModeAutomationSettings"/>
+    <PreferenceCategory
+        android:key="zen_mode_settings_schedule"
+        android:title="@string/zen_category_schedule">
+        <Preference
+            android:key="zen_mode_automation_settings"
+            android:title="@string/zen_category_schedule"
+            android:fragment="com.android.settings.notification.zen.ZenModeAutomationSettings"/>
+    </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="zen_mode_settings_advanced"
-        settings:initialExpandedChildrenCount="0">
+        android:title="@string/zen_settings_general"
+        android:key="zen_mode_settings_advanced">
 
         <!-- DND duration settings -->
         <com.android.settings.notification.zen.ZenDurationDialogPreference
diff --git a/src/com/android/settings/ActivityPicker.java b/src/com/android/settings/ActivityPicker.java
index ae61944..f75ce37 100644
--- a/src/com/android/settings/ActivityPicker.java
+++ b/src/com/android/settings/ActivityPicker.java
@@ -16,6 +16,8 @@
 
 package com.android.settings;
 
+import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -71,6 +73,8 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        getWindow().addPrivateFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
         
         final Intent intent = getIntent();
         
diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java
index 6028c18..735ae23 100644
--- a/src/com/android/settings/AirplaneModeEnabler.java
+++ b/src/com/android/settings/AirplaneModeEnabler.java
@@ -192,3 +192,4 @@
         return WirelessUtils.isAirplaneModeOn(mContext);
     }
 }
+
diff --git a/src/com/android/settings/AllInOneTetherSettings.java b/src/com/android/settings/AllInOneTetherSettings.java
index 34d723f..d41c07b 100644
--- a/src/com/android/settings/AllInOneTetherSettings.java
+++ b/src/com/android/settings/AllInOneTetherSettings.java
@@ -16,8 +16,8 @@
 
 package com.android.settings;
 
-import static android.net.ConnectivityManager.ACTION_TETHER_STATE_CHANGED;
 import static android.net.ConnectivityManager.TETHERING_WIFI;
+import static android.net.TetheringManager.ACTION_TETHER_STATE_CHANGED;
 import static android.net.wifi.WifiManager.WIFI_AP_STATE_CHANGED_ACTION;
 
 import android.app.settings.SettingsEnums;
diff --git a/src/com/android/settings/MainClear.java b/src/com/android/settings/MainClear.java
index 326aeef..a7aa8ea 100644
--- a/src/com/android/settings/MainClear.java
+++ b/src/com/android/settings/MainClear.java
@@ -59,11 +59,11 @@
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.core.InstrumentedFragment;
-import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.password.ConfirmLockPattern;
 import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.development.DevelopmentSettingsEnabler;
 
 import com.google.android.setupcompat.template.FooterBarMixin;
@@ -187,12 +187,15 @@
         final Bundle args = new Bundle();
         args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
         args.putBoolean(ERASE_ESIMS_EXTRA, mEsimStorage.isChecked());
-        new SubSettingLauncher(getContext())
-                .setDestination(MainClearConfirm.class.getName())
-                .setArguments(args)
-                .setTitleRes(R.string.main_clear_confirm_title)
-                .setSourceMetricsCategory(getMetricsCategory())
-                .launch();
+        final Intent intent = new Intent();
+        intent.setClass(getContext(),
+                com.android.settings.Settings.FactoryResetConfirmActivity.class);
+        intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, MainClearConfirm.class.getName());
+        intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
+        intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID,
+                R.string.main_clear_confirm_title);
+        intent.putExtra(MetricsFeatureProvider.EXTRA_SOURCE_METRICS_CATEGORY, getMetricsCategory());
+        getContext().startActivity(intent);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java
index a685841..57d3c6a 100644
--- a/src/com/android/settings/ProxySelector.java
+++ b/src/com/android/settings/ProxySelector.java
@@ -44,6 +44,8 @@
 import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
 import com.android.settings.core.InstrumentedFragment;
 
+import java.util.Arrays;
+
 public class ProxySelector extends InstrumentedFragment implements DialogCreatable {
     private static final String TAG = "ProxySelector";
 
@@ -229,7 +231,9 @@
                 return false;
             }
         }
-        ProxyInfo p = new ProxyInfo(hostname, port, exclList);
+
+        ProxyInfo p = ProxyInfo.buildDirectProxy(
+                hostname, port, Arrays.asList(exclList.split(",")));
         // FIXME: The best solution would be to make a better UI that would
         // disable editing of the text boxes if the user chooses to use the
         // default settings. i.e. checking a box to always use the default
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 43f35a6..f79bdb2 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -28,6 +28,7 @@
 import android.net.ConnectivityManager;
 import android.net.NetworkPolicyManager;
 import android.net.Uri;
+import android.net.VpnManager;
 import android.net.wifi.WifiManager;
 import android.net.wifi.p2p.WifiP2pManager;
 import android.os.AsyncTask;
@@ -101,6 +102,11 @@
                 connectivityManager.factoryReset();
             }
 
+            VpnManager vpnManager = mContext.getSystemService(VpnManager.class);
+            if (vpnManager != null) {
+                vpnManager.factoryReset();
+            }
+
             WifiManager wifiManager = (WifiManager)
                     mContext.getSystemService(Context.WIFI_SERVICE);
             if (wifiManager != null) {
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 1008888..95e68de 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -97,6 +97,7 @@
     public static class DisplaySettingsActivity extends SettingsActivity { /* empty */ }
     public static class NightDisplaySettingsActivity extends SettingsActivity { /* empty */ }
     public static class NightDisplaySuggestionActivity extends NightDisplaySettingsActivity { /* empty */ }
+    public static class SmartAutoRotateSettingsActivity extends SettingsActivity { /* empty */ }
     public static class MyDeviceInfoActivity extends SettingsActivity { /* empty */ }
     public static class ModuleLicensesActivity extends SettingsActivity { /* empty */ }
     public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }
@@ -123,7 +124,30 @@
     public static class ScanningSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PrivacyDashboardActivity extends SettingsActivity { /* empty */ }
     public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }
-    public static class FactoryResetActivity extends SettingsActivity { /* empty */ }
+    public static class FactoryResetActivity extends SettingsActivity {
+        @Override
+        protected void onCreate(Bundle savedState) {
+            setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+            super.onCreate(savedState);
+        }
+
+        @Override
+        protected boolean isToolbarEnabled() {
+            return false;
+        }
+    }
+    public static class FactoryResetConfirmActivity extends SettingsActivity {
+        @Override
+        protected void onCreate(Bundle savedState) {
+            setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+            super.onCreate(savedState);
+        }
+
+        @Override
+        protected boolean isToolbarEnabled() {
+            return false;
+        }
+    }
     public static class RunningServicesActivity extends SettingsActivity { /* empty */ }
     public static class BatterySaverSettingsActivity extends SettingsActivity { /* empty */ }
     public static class BatterySaverScheduleSettingsActivity extends SettingsActivity { /* empty */ }
@@ -193,6 +217,8 @@
     public static class OverlaySettingsActivity extends SettingsActivity { /* empty */ }
     public static class ManageExternalStorageActivity extends SettingsActivity { /* empty */ }
     public static class AppManageExternalStorageActivity extends SettingsActivity { /* empty */ }
+    public static class MediaManagementAppsActivity extends SettingsActivity { /* empty */ }
+    public static class AppMediaManagementAppsActivity extends SettingsActivity { /* empty */ }
     public static class WriteSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ChangeWifiStateActivity extends SettingsActivity { /* empty */ }
     public static class AppDrawOverlaySettingsActivity extends SettingsActivity { /* empty */ }
@@ -204,6 +230,10 @@
     public static class ManagedProfileSettingsActivity extends SettingsActivity { /* empty */ }
     public static class DeletionHelperActivity extends SettingsActivity { /* empty */ }
 
+    /** Actviity to manage apps with {@link android.Manifest.permission#SCHEDULE_EXACT_ALARM} */
+    public static class AlarmsAndRemindersActivity extends SettingsActivity {/* empty */ }
+    /** App specific version of {@link AlarmsAndRemindersActivity} */
+    public static class AlarmsAndRemindersAppActivity extends SettingsActivity {/* empty */ }
 
     public static class ApnEditorActivity extends SettingsActivity { /* empty */ }
     public static class ChooseAccountActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index d22a381..b672917 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -309,6 +309,7 @@
         mMainSwitch = findViewById(R.id.switch_bar);
         if (mMainSwitch != null) {
             mMainSwitch.setMetricsTag(getMetricsTag());
+            mMainSwitch.setTranslationZ(findViewById(R.id.main_content).getTranslationZ() + 1);
         }
 
         // see if we should show Back/Next buttons
diff --git a/src/com/android/settings/SettingsDumpService.java b/src/com/android/settings/SettingsDumpService.java
index 2b6c7d8..5e6ee93 100644
--- a/src/com/android/settings/SettingsDumpService.java
+++ b/src/com/android/settings/SettingsDumpService.java
@@ -14,13 +14,15 @@
 
 package com.android.settings;
 
+import static android.content.pm.PackageManager.FEATURE_ETHERNET;
+import static android.content.pm.PackageManager.FEATURE_WIFI;
+
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.net.ConnectivityManager;
 import android.net.NetworkTemplate;
 import android.net.Uri;
 import android.os.IBinder;
@@ -101,10 +103,10 @@
     private JSONObject dumpDataUsage() throws JSONException {
         JSONObject obj = new JSONObject();
         DataUsageController controller = new DataUsageController(this);
-        ConnectivityManager connectivityManager = getSystemService(ConnectivityManager.class);
         SubscriptionManager manager = this.getSystemService(SubscriptionManager.class);
         TelephonyManager telephonyManager = this.getSystemService(TelephonyManager.class);
-        if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {
+        final PackageManager packageManager = this.getPackageManager();
+        if (telephonyManager.isDataCapable()) {
             JSONArray array = new JSONArray();
             for (SubscriptionInfo info : manager.getAvailableSubscriptionInfoList()) {
                 telephonyManager = telephonyManager
@@ -117,10 +119,11 @@
             }
             obj.put("cell", array);
         }
-        if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_WIFI)) {
+        if (packageManager.hasSystemFeature(FEATURE_WIFI)) {
             obj.put("wifi", dumpDataUsage(NetworkTemplate.buildTemplateWifiWildcard(), controller));
         }
-        if (connectivityManager.isNetworkSupported(ConnectivityManager.TYPE_ETHERNET)) {
+
+        if (packageManager.hasSystemFeature(FEATURE_ETHERNET)) {
             obj.put("ethernet", dumpDataUsage(NetworkTemplate.buildTemplateEthernet(), controller));
         }
         return obj;
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 2c628f6..0c1ace9 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -57,6 +57,8 @@
 import com.android.settingslib.search.Indexable;
 import com.android.settingslib.widget.LayoutPreference;
 
+import com.google.android.material.appbar.AppBarLayout;
+
 import java.util.UUID;
 
 /**
@@ -112,9 +114,8 @@
 
     @VisibleForTesting
     ViewGroup mPinnedHeaderFrameLayout;
-
+    private AppBarLayout mAppBarLayout;
     private LayoutPreference mHeader;
-
     private View mEmptyView;
     private LinearLayoutManager mLayoutManager;
     private ArrayMap<String, Preference> mPreferenceCache;
@@ -145,6 +146,7 @@
             Bundle savedInstanceState) {
         final View root = super.onCreateView(inflater, container, savedInstanceState);
         mPinnedHeaderFrameLayout = root.findViewById(R.id.pinned_header);
+        mAppBarLayout = getActivity().findViewById(R.id.app_bar);
         return root;
     }
 
@@ -250,7 +252,7 @@
             return;
         }
         if (mAdapter != null) {
-            mAdapter.requestHighlight(getView(), getListView());
+            mAdapter.requestHighlight(getView(), getListView(), mAppBarLayout);
         }
     }
 
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 48dd218..6d98f36 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -167,8 +167,8 @@
         mEm = (EthernetManager) getSystemService(Context.ETHERNET_SERVICE);
         mTm = (TetheringManager) getSystemService(Context.TETHERING_SERVICE);
 
-        mUsbRegexs = mCm.getTetherableUsbRegexs();
-        mBluetoothRegexs = mCm.getTetherableBluetoothRegexs();
+        mUsbRegexs = mTm.getTetherableUsbRegexs();
+        mBluetoothRegexs = mTm.getTetherableBluetoothRegexs();
         mEthernetRegex = getContext().getResources().getString(
                 com.android.internal.R.string.config_ethernet_iface_regex);
 
@@ -251,14 +251,14 @@
         public void onReceive(Context content, Intent intent) {
             String action = intent.getAction();
             // TODO: stop using ACTION_TETHER_STATE_CHANGED and use mTetheringEventCallback instead.
-            if (action.equals(ConnectivityManager.ACTION_TETHER_STATE_CHANGED)) {
+            if (action.equals(TetheringManager.ACTION_TETHER_STATE_CHANGED)) {
                 // TODO - this should understand the interface types
                 ArrayList<String> available = intent.getStringArrayListExtra(
-                        ConnectivityManager.EXTRA_AVAILABLE_TETHER);
+                        TetheringManager.EXTRA_AVAILABLE_TETHER);
                 ArrayList<String> active = intent.getStringArrayListExtra(
-                        ConnectivityManager.EXTRA_ACTIVE_TETHER);
+                        TetheringManager.EXTRA_ACTIVE_TETHER);
                 ArrayList<String> errored = intent.getStringArrayListExtra(
-                        ConnectivityManager.EXTRA_ERRORED_TETHER);
+                        TetheringManager.EXTRA_ERRORED_TETHER);
                 updateState(available.toArray(new String[available.size()]),
                         active.toArray(new String[active.size()]),
                         errored.toArray(new String[errored.size()]));
@@ -345,7 +345,7 @@
         final Activity activity = getActivity();
 
         mTetherChangeReceiver = new TetherChangeReceiver();
-        IntentFilter filter = new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
+        IntentFilter filter = new IntentFilter(TetheringManager.ACTION_TETHER_STATE_CHANGED);
         final Intent intent = activity.registerReceiver(mTetherChangeReceiver, filter);
 
         filter = new IntentFilter();
@@ -367,11 +367,10 @@
     }
 
     private void updateState() {
-        final ConnectivityManager cm =
-                (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
-        final String[] available = cm.getTetherableIfaces();
-        final String[] tethered = cm.getTetheredIfaces();
-        final String[] errored = cm.getTetheringErroredIfaces();
+        final TetheringManager tm = getContext().getSystemService(TetheringManager.class);
+        final String[] available = tm.getTetherableIfaces();
+        final String[] tethered = tm.getTetheredIfaces();
+        final String[] errored = tm.getTetheringErroredIfaces();
         updateState(available, tethered, errored);
     }
 
@@ -391,7 +390,7 @@
             for (String regex : mUsbRegexs) {
                 if (s.matches(regex)) {
                     if (usbError == ConnectivityManager.TETHER_ERROR_NO_ERROR) {
-                        usbError = mCm.getLastTetherError(s);
+                        usbError = mTm.getLastTetherError(s);
                     }
                 }
             }
@@ -558,8 +557,8 @@
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
                     final List<String> keys = super.getNonIndexableKeys(context);
-                    final ConnectivityManager cm =
-                            context.getSystemService(ConnectivityManager.class);
+                    final TetheringManager tm =
+                            context.getSystemService(TetheringManager.class);
 
                     if (!TetherUtil.isTetherAvailable(context)) {
                         keys.add(KEY_TETHER_PREFS_SCREEN);
@@ -567,13 +566,13 @@
                     }
 
                     final boolean usbAvailable =
-                            cm.getTetherableUsbRegexs().length != 0;
+                            tm.getTetherableUsbRegexs().length != 0;
                     if (!usbAvailable || Utils.isMonkeyRunning()) {
                         keys.add(KEY_USB_TETHER_SETTINGS);
                     }
 
                     final boolean bluetoothAvailable =
-                            cm.getTetherableBluetoothRegexs().length != 0;
+                            tm.getTetherableBluetoothRegexs().length != 0;
                     if (!bluetoothAvailable) {
                         keys.add(KEY_ENABLE_BLUETOOTH_TETHERING);
                     }
diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java
index d322819..5f72ca5 100644
--- a/src/com/android/settings/UserCredentialsSettings.java
+++ b/src/com/android/settings/UserCredentialsSettings.java
@@ -34,9 +34,9 @@
 import android.security.IKeyChainService;
 import android.security.KeyChain;
 import android.security.KeyChain.KeyChainConnection;
-import android.security.KeyStore;
-import android.security.keymaster.KeyCharacteristics;
-import android.security.keymaster.KeymasterDefs;
+import android.security.keystore.AndroidKeyStoreProvider;
+import android.security.keystore.KeyProperties;
+import android.security.keystore2.AndroidKeyStoreLoadStoreParameter;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
@@ -55,13 +55,21 @@
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
+import java.security.Key;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableKeyException;
+import java.security.cert.Certificate;
 import java.util.ArrayList;
 import java.util.EnumSet;
+import java.util.Enumeration;
 import java.util.List;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+import javax.crypto.SecretKey;
+
 public class UserCredentialsSettings extends SettingsPreferenceFragment
         implements View.OnClickListener {
     private static final String TAG = "UserCredentialsSettings";
@@ -201,21 +209,19 @@
             }
 
             private void deleteWifiCredential(final Credential credential) {
-                final KeyStore keyStore = KeyStore.getInstance();
-                final EnumSet<Credential.Type> storedTypes = credential.getStoredTypes();
-
-                // Remove all Wi-Fi credentials
-                if (storedTypes.contains(Credential.Type.USER_KEY)) {
-                    keyStore.delete(Credentials.USER_PRIVATE_KEY + credential.getAlias(),
-                            Process.WIFI_UID);
-                }
-                if (storedTypes.contains(Credential.Type.USER_CERTIFICATE)) {
-                    keyStore.delete(Credentials.USER_CERTIFICATE + credential.getAlias(),
-                            Process.WIFI_UID);
-                }
-                if (storedTypes.contains(Credential.Type.CA_CERTIFICATE)) {
-                    keyStore.delete(Credentials.CA_CERTIFICATE + credential.getAlias(),
-                            Process.WIFI_UID);
+                try {
+                    KeyStore keyStore = null;
+                    if (AndroidKeyStoreProvider.isKeystore2Enabled()) {
+                        keyStore = KeyStore.getInstance("AndroidKeyStore");
+                        keyStore.load(
+                                new AndroidKeyStoreLoadStoreParameter(
+                                        KeyProperties.NAMESPACE_WIFI));
+                    } else {
+                        keyStore = AndroidKeyStoreProvider.getKeyStoreForUid(Process.WIFI_UID);
+                    }
+                    keyStore.deleteEntry(credential.getAlias());
+                } catch (Exception e) {
+                    throw new RuntimeException("Failed to delete keys from keystore.");
                 }
             }
 
@@ -266,73 +272,103 @@
          */
         @Override
         protected List<Credential> doInBackground(Void... params) {
-            final KeyStore keyStore = KeyStore.getInstance();
-
             // Certificates can be installed into SYSTEM_UID or WIFI_UID through CertInstaller.
             final int myUserId = UserHandle.myUserId();
             final int systemUid = UserHandle.getUid(myUserId, Process.SYSTEM_UID);
             final int wifiUid = UserHandle.getUid(myUserId, Process.WIFI_UID);
 
-            List<Credential> credentials = new ArrayList<>();
-            credentials.addAll(getCredentialsForUid(keyStore, systemUid).values());
-            credentials.addAll(getCredentialsForUid(keyStore, wifiUid).values());
-            return credentials;
-        }
+            try {
+                KeyStore processKeystore = KeyStore.getInstance("AndroidKeyStore");
+                processKeystore.load(null);
+                KeyStore wifiKeystore = null;
+                if (myUserId == 0) {
+                    // Only the primary user may see wifi configurations.
+                    if (AndroidKeyStoreProvider.isKeystore2Enabled()) {
+                        wifiKeystore = KeyStore.getInstance("AndroidKeyStore");
+                        wifiKeystore.load(new AndroidKeyStoreLoadStoreParameter(
+                                KeyProperties.NAMESPACE_WIFI));
+                    } else {
+                        wifiKeystore = AndroidKeyStoreProvider.getKeyStoreForUid(Process.WIFI_UID);
+                    }
+                }
 
-        private boolean isAsymmetric(KeyStore keyStore, String alias, int uid)
-            throws UnrecoverableKeyException {
-                KeyCharacteristics keyCharacteristics = new KeyCharacteristics();
-                int errorCode = keyStore.getKeyCharacteristics(alias, null, null, uid,
-                        keyCharacteristics);
-                if (errorCode != KeyStore.NO_ERROR) {
-                    throw (UnrecoverableKeyException)
-                            new UnrecoverableKeyException("Failed to obtain information about key")
-                                    .initCause(KeyStore.getKeyStoreException(errorCode));
+                List<Credential> credentials = new ArrayList<>();
+                credentials.addAll(getCredentialsForUid(processKeystore, systemUid).values());
+                if (wifiKeystore != null) {
+                    credentials.addAll(getCredentialsForUid(wifiKeystore, wifiUid).values());
                 }
-                Integer keymasterAlgorithm = keyCharacteristics.getEnum(
-                        KeymasterDefs.KM_TAG_ALGORITHM);
-                if (keymasterAlgorithm == null) {
-                    throw new UnrecoverableKeyException("Key algorithm unknown");
-                }
-                return keymasterAlgorithm == KeymasterDefs.KM_ALGORITHM_RSA ||
-                        keymasterAlgorithm == KeymasterDefs.KM_ALGORITHM_EC;
+                return credentials;
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to load credentials from Keystore.", e);
+            }
         }
 
         private SortedMap<String, Credential> getCredentialsForUid(KeyStore keyStore, int uid) {
-            final SortedMap<String, Credential> aliasMap = new TreeMap<>();
-            for (final Credential.Type type : Credential.Type.values()) {
-                for (final String prefix : type.prefix) {
-                    for (final String alias : keyStore.list(prefix, uid)) {
-                        if (UserHandle.getAppId(uid) == Process.SYSTEM_UID) {
+            try {
+                final SortedMap<String, Credential> aliasMap = new TreeMap<>();
+                boolean isSystem = UserHandle.getAppId(uid) == Process.SYSTEM_UID;
+                Enumeration<String> aliases = keyStore.aliases();
+                while (aliases.hasMoreElements()) {
+                    String alias = aliases.nextElement();
+                    Credential c = new Credential(alias, uid);
+                    Key key = null;
+                    try {
+                        key = keyStore.getKey(alias, null);
+                    } catch (NoSuchAlgorithmException | UnrecoverableKeyException e) {
+                        Log.e(TAG, "Error tying to retrieve key: " + alias, e);
+                        continue;
+                    }
+                    if (key != null) {
+                        // So we have a key
+                        if (key instanceof SecretKey) {
+                            // We don't display any symmetric key entries.
+                            continue;
+                        }
+                        if (isSystem) {
                             // Do not show work profile keys in user credentials
                             if (alias.startsWith(LockPatternUtils.PROFILE_KEY_NAME_ENCRYPT) ||
                                     alias.startsWith(LockPatternUtils.PROFILE_KEY_NAME_DECRYPT)) {
                                 continue;
                             }
                             // Do not show synthetic password keys in user credential
+                            // We should never reach this point because the synthetic password key
+                            // is symmetric.
                             if (alias.startsWith(LockPatternUtils.SYNTHETIC_PASSWORD_KEY_PREFIX)) {
                                 continue;
                             }
                         }
-                        try {
-                            if (type == Credential.Type.USER_KEY &&
-                                    !isAsymmetric(keyStore, prefix + alias, uid)) {
-                                continue;
+                        // At this point we have determined that we have an asymmetric key.
+                        // so we have at least a USER_KEY and USER_CERTIFICATE.
+                        c.storedTypes.add(Credential.Type.USER_KEY);
+
+                        Certificate[] certs =  keyStore.getCertificateChain(alias);
+                        if (certs != null) {
+                            c.storedTypes.add(Credential.Type.USER_CERTIFICATE);
+                            if (certs.length > 1) {
+                                c.storedTypes.add(Credential.Type.CA_CERTIFICATE);
                             }
-                        } catch (UnrecoverableKeyException e) {
-                            Log.e(TAG, "Unable to determine algorithm of key: " + prefix + alias, e);
-                            continue;
                         }
-                        Credential c = aliasMap.get(alias);
-                        if (c == null) {
-                            c = new Credential(alias, uid);
-                            aliasMap.put(alias, c);
+                    } else {
+                        // So there is no key but we have an alias. This must mean that we have
+                        // some certificate.
+                        if (keyStore.isCertificateEntry(alias)) {
+                            c.storedTypes.add(Credential.Type.CA_CERTIFICATE);
+                        } else {
+                            // This is a weired inconsistent case that should not exist.
+                            // Pure trusted certificate entries should be stored in CA_CERTIFICATE,
+                            // but if isCErtificateEntry returns null this means that only the
+                            // USER_CERTIFICATE is populated which should never be the case without
+                            // a private key. It can still be retrieved with
+                            // keystore.getCertificate().
+                            c.storedTypes.add(Credential.Type.USER_CERTIFICATE);
                         }
-                        c.storedTypes.add(type);
                     }
+                    aliasMap.put(alias, c);
                 }
+                return aliasMap;
+            } catch (KeyStoreException e) {
+                throw new RuntimeException("Failed to load credential from Android Keystore.", e);
             }
-            return aliasMap;
         }
 
         @Override
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index e44ee78..391ee90 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -54,6 +54,7 @@
 import android.hardware.face.FaceManager;
 import android.hardware.fingerprint.FingerprintManager;
 import android.net.ConnectivityManager;
+import android.net.LinkAddress;
 import android.net.LinkProperties;
 import android.net.Network;
 import android.net.wifi.WifiManager;
@@ -111,7 +112,6 @@
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settingslib.widget.ActionBarShadowController;
 
-import java.net.InetAddress;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -153,6 +153,9 @@
     public static final String PROPERTY_LOCATION_INDICATOR_SETTINGS_ENABLED =
             "location_indicator_settings_enabled";
 
+    /** Whether or not app hibernation is enabled on the device **/
+    public static final String PROPERTY_APP_HIBERNATION_ENABLED = "app_hibernation_enabled";
+
     /**
      * Finds a matching activity for a preference's intent. If a matching
      * activity is not found, it will remove the preference.
@@ -243,13 +246,13 @@
 
     private static String formatIpAddresses(LinkProperties prop) {
         if (prop == null) return null;
-        final Iterator<InetAddress> iter = prop.getAllAddresses().iterator();
+        final Iterator<LinkAddress> iter = prop.getAllLinkAddresses().iterator();
         // If there are no entries, return null
         if (!iter.hasNext()) return null;
         // Concatenate all available addresses, comma separated
         String addresses = "";
         while (iter.hasNext()) {
-            addresses += iter.next().getHostAddress();
+            addresses += iter.next().getAddress().getHostAddress();
             if (iter.hasNext()) addresses += "\n";
         }
         return addresses;
diff --git a/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettings.java b/src/com/android/settings/accessibility/AccessibilityButtonFragment.java
similarity index 64%
rename from src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettings.java
rename to src/com/android/settings/accessibility/AccessibilityButtonFragment.java
index db6ffc4..c3e683a 100644
--- a/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettings.java
+++ b/src/com/android/settings/accessibility/AccessibilityButtonFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,30 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.settings.datetime.locationtimezone;
+
+package com.android.settings.accessibility;
 
 import android.app.settings.SettingsEnums;
+import android.content.Context;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
 
-/**
- * The controller for the "location time zone detection" screen.
- */
+/** Settings fragment containing accessibility button properties. */
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
-public class TimeZoneDetectionSettings extends DashboardFragment {
-    private static final String TAG = "LTZDetectionSettings";
+public class AccessibilityButtonFragment extends DashboardFragment {
 
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.LOCATION_TIME_ZONE_DETECTION;
-    }
+    private static final String TAG = "AccessibilityButtonFragment";
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.location_time_zone_detection;
+        return R.xml.accessibility_button_settings;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
     }
 
     @Override
@@ -44,9 +45,11 @@
         return TAG;
     }
 
-    /**
-     * For Search.
-     */
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.ACCESSIBILITY_BUTTON_SETTINGS;
+    }
+
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.location_time_zone_detection);
+            new BaseSearchIndexProvider(R.xml.accessibility_button_settings);
 }
diff --git a/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceController.java
new file mode 100644
index 0000000..e9ed19a
--- /dev/null
+++ b/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceController.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.util.ArrayMap;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import com.google.common.primitives.Ints;
+
+/** Preference controller that controls the preferred location in accessibility button page. */
+public class AccessibilityButtonLocationPreferenceController extends BasePreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    private final ArrayMap<String, String> mValueTitleMap = new ArrayMap<>();
+    private int mDefaultLocation;
+
+    public AccessibilityButtonLocationPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        initValueTitleMap();
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AccessibilityUtil.isGestureNavigateEnabled(mContext)
+                ? DISABLED_DEPENDENT_SETTING : AVAILABLE;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final ListPreference listPreference = (ListPreference) preference;
+        final Integer value = Ints.tryParse((String) newValue);
+        if (value != null) {
+            Settings.Secure.putInt(mContext.getContentResolver(),
+                    Settings.Secure.ACCESSIBILITY_BUTTON_MODE, value);
+            updateState(listPreference);
+        }
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        final ListPreference listPreference = (ListPreference) preference;
+
+        listPreference.setValue(getCurrentAccessibilityButtonMode());
+    }
+
+    private String getCurrentAccessibilityButtonMode() {
+        final int mode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, mDefaultLocation);
+        return String.valueOf(mode);
+    }
+
+    private void initValueTitleMap() {
+        if (mValueTitleMap.size() == 0) {
+            final String[] values = mContext.getResources().getStringArray(
+                    R.array.accessibility_button_location_selector_values);
+            final String[] titles = mContext.getResources().getStringArray(
+                    R.array.accessibility_button_location_selector_titles);
+            final int mapSize = values.length;
+
+            mDefaultLocation = Integer.parseInt(values[0]);
+            for (int i = 0; i < mapSize; i++) {
+                mValueTitleMap.put(values[i], titles[i]);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceController.java
new file mode 100644
index 0000000..69a7a46
--- /dev/null
+++ b/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceController.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.graphics.drawable.Drawable;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+import android.widget.ImageView;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.widget.LayoutPreference;
+
+/** Preference controller that controls the preview effect in accessibility button page. */
+public class AccessibilityButtonPreviewPreferenceController extends BasePreferenceController
+        implements LifecycleObserver, OnResume, OnPause {
+
+    private static final int SMALL_SIZE = 0;
+    private static final float DEFAULT_OPACITY = 0.55f;
+    private static final int DEFAULT_SIZE = 0;
+
+    private final ContentResolver mContentResolver;
+    @VisibleForTesting
+    final ContentObserver mContentObserver;
+    private FloatingMenuLayerDrawable mFloatingMenuPreviewDrawable;
+
+    @VisibleForTesting
+    ImageView mPreview;
+
+    public AccessibilityButtonPreviewPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mContentResolver = context.getContentResolver();
+        mContentObserver = new ContentObserver(new Handler(Looper.getMainLooper())) {
+            @Override
+            public void onChange(boolean selfChange) {
+                updatePreviewPreference();
+            }
+        };
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final LayoutPreference preference = screen.findPreference(getPreferenceKey());
+        mPreview = preference.findViewById(R.id.preview_image);
+
+        updatePreviewPreference();
+    }
+
+    @Override
+    public void onResume() {
+        mContentResolver.registerContentObserver(
+                Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_BUTTON_MODE),
+                /* notifyForDescendants= */ false, mContentObserver);
+        mContentResolver.registerContentObserver(
+                Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE),
+                /* notifyForDescendants= */ false, mContentObserver);
+        mContentResolver.registerContentObserver(
+                Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY),
+                /* notifyForDescendants= */ false, mContentObserver);
+    }
+
+    @Override
+    public void onPause() {
+        mContentResolver.unregisterContentObserver(mContentObserver);
+    }
+
+    private void updatePreviewPreference() {
+        if (AccessibilityUtil.isFloatingMenuEnabled(mContext)) {
+            final int size = Settings.Secure.getInt(mContentResolver,
+                    Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE, DEFAULT_SIZE);
+            final int opacity = (int) (Settings.Secure.getFloat(mContentResolver,
+                    Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY, DEFAULT_OPACITY) * 100);
+            final int floatingMenuIconId = (size == SMALL_SIZE)
+                    ? R.drawable.accessibility_button_preview_small_floating_menu
+                    : R.drawable.accessibility_button_preview_large_floating_menu;
+
+            mPreview.setImageDrawable(getFloatingMenuPreviewDrawable(floatingMenuIconId, opacity));
+            // Only change opacity(alpha) would not invoke redraw view, need to invalidate manually.
+            mPreview.invalidate();
+        } else {
+            mPreview.setImageDrawable(
+                    mContext.getDrawable(R.drawable.accessibility_button_navigation));
+        }
+    }
+
+    private Drawable getFloatingMenuPreviewDrawable(int resId, int opacity) {
+        if (mFloatingMenuPreviewDrawable == null) {
+            mFloatingMenuPreviewDrawable = FloatingMenuLayerDrawable.createLayerDrawable(
+                    mContext, resId, opacity);
+        } else {
+            mFloatingMenuPreviewDrawable.updateLayerDrawable(mContext, resId, opacity);
+        }
+
+        return mFloatingMenuPreviewDrawable;
+    }
+}
diff --git a/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java b/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
index f349a12..6b31988 100644
--- a/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
+++ b/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
@@ -17,6 +17,7 @@
 package com.android.settings.accessibility;
 
 import android.app.Dialog;
+import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.TypedArray;
@@ -24,6 +25,7 @@
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
 import android.text.style.ImageSpan;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -40,6 +42,8 @@
 import androidx.core.content.ContextCompat;
 
 import com.android.settings.R;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.utils.AnnotationSpan;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -253,6 +257,8 @@
             summary.setVisibility(View.GONE);
         } else {
             summary.setText(summaryText);
+            summary.setMovementMethod(LinkMovementMethod.getInstance());
+            summary.setFocusable(false);
         }
         final ImageView image = view.findViewById(R.id.image);
         image.setImageResource(imageResId);
@@ -260,10 +266,13 @@
 
     private static void initSoftwareShortcut(Context context, View view) {
         final View dialogView = view.findViewById(R.id.software_shortcut);
+        final CharSequence title = context.getText(
+                R.string.accessibility_shortcut_edit_dialog_title_software);
         final TextView summary = dialogView.findViewById(R.id.summary);
         final int lineHeight = summary.getLineHeight();
-        setupShortcutWidget(dialogView, retrieveTitle(context),
-                retrieveSummary(context, lineHeight), retrieveImageResId(context));
+
+        setupShortcutWidget(dialogView, title, retrieveSummary(context, lineHeight),
+                retrieveImageResId(context));
     }
 
     private static void initHardwareShortcut(Context context, View view) {
@@ -297,35 +306,28 @@
         });
     }
 
-    private static CharSequence retrieveTitle(Context context) {
-        int resId = R.string.accessibility_shortcut_edit_dialog_title_software;
-        if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
-            resId = AccessibilityUtil.isTouchExploreEnabled(context)
-                    ? R.string.accessibility_shortcut_edit_dialog_title_software_gesture_talkback
-                    : R.string.accessibility_shortcut_edit_dialog_title_software_gesture;
-        }
-        return context.getText(resId);
-    }
-
     private static CharSequence retrieveSummary(Context context, int lineHeight) {
-        if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
-            final int resId = AccessibilityUtil.isTouchExploreEnabled(context)
-                    ? R.string.accessibility_shortcut_edit_dialog_summary_software_gesture_talkback
-                    : R.string.accessibility_shortcut_edit_dialog_summary_software_gesture;
-            return context.getText(resId);
-        }
-        return getSummaryStringWithIcon(context, lineHeight);
+        return AccessibilityUtil.isFloatingMenuEnabled(context)
+                ? getSummaryStringWithLink(context) : getSummaryStringWithIcon(context, lineHeight);
     }
 
     private static int retrieveImageResId(Context context) {
-        // TODO(b/142531156): Use vector drawable instead of temporal png file to avoid distorted.
-        int resId = R.drawable.accessibility_shortcut_type_software;
-        if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
-            resId = AccessibilityUtil.isTouchExploreEnabled(context)
-                    ? R.drawable.accessibility_shortcut_type_software_gesture_talkback
-                    : R.drawable.accessibility_shortcut_type_software_gesture;
-        }
-        return resId;
+        return AccessibilityUtil.isFloatingMenuEnabled(context)
+                ? R.drawable.accessibility_shortcut_type_software_floating
+                : R.drawable.accessibility_shortcut_type_software;
+    }
+
+    private static CharSequence getSummaryStringWithLink(Context context) {
+        final View.OnClickListener linkListener = v -> new SubSettingLauncher(context)
+                .setDestination(AccessibilityButtonFragment.class.getName())
+                .setSourceMetricsCategory(
+                        SettingsEnums.SWITCH_SHORTCUT_DIALOG_ACCESSIBILITY_BUTTON_SETTINGS)
+                .launch();
+        final AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan.LinkInfo(
+                AnnotationSpan.LinkInfo.DEFAULT_ANNOTATION, linkListener);
+
+        return AnnotationSpan.linkify(context.getText(
+                R.string.accessibility_shortcut_edit_dialog_summary_software_floating), linkInfo);
     }
 
     private static SpannableString getSummaryStringWithIcon(Context context, int lineHeight) {
diff --git a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java b/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
index 482822e..5ea5462 100644
--- a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
+++ b/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
@@ -333,7 +333,8 @@
     }
 
     private static TutorialPage createSoftwareTutorialPage(@NonNull Context context) {
-        final CharSequence title = getSoftwareTitle(context);
+        final CharSequence title = context.getText(
+                R.string.accessibility_tutorial_dialog_title_button);
         final ImageView image = createSoftwareImage(context);
         final CharSequence instruction = getSoftwareInstruction(context);
         final ImageView indicatorIcon =
@@ -390,44 +391,19 @@
         return tutorialPages;
     }
 
-    private static CharSequence getSoftwareTitle(Context context) {
-        final boolean isGestureNavigationEnabled =
-                AccessibilityUtil.isGestureNavigateEnabled(context);
-        final int resId = isGestureNavigationEnabled
-                ? R.string.accessibility_tutorial_dialog_title_gesture
-                : R.string.accessibility_tutorial_dialog_title_button;
-
-        return context.getText(resId);
-    }
-
     private static ImageView createSoftwareImage(Context context) {
-        int resId = R.drawable.accessibility_shortcut_type_software;
-        if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
-            resId = AccessibilityUtil.isTouchExploreEnabled(context)
-                    ? R.drawable.accessibility_shortcut_type_software_gesture_talkback
-                    : R.drawable.accessibility_shortcut_type_software_gesture;
-        }
+        final int resId = AccessibilityUtil.isFloatingMenuEnabled(context)
+                ? R.drawable.accessibility_shortcut_type_software_floating
+                : R.drawable.accessibility_shortcut_type_software;
 
         return createImageView(context, resId);
     }
 
     private static CharSequence getSoftwareInstruction(Context context) {
-        final boolean isGestureNavigateEnabled =
-                AccessibilityUtil.isGestureNavigateEnabled(context);
-        final boolean isTouchExploreEnabled = AccessibilityUtil.isTouchExploreEnabled(context);
-        int resId = R.string.accessibility_tutorial_dialog_message_button;
-        if (isGestureNavigateEnabled) {
-            resId = isTouchExploreEnabled
-                    ? R.string.accessibility_tutorial_dialog_message_gesture_talkback
-                    : R.string.accessibility_tutorial_dialog_message_gesture;
-        }
-
-        CharSequence text = context.getText(resId);
-        if (resId == R.string.accessibility_tutorial_dialog_message_button) {
-            text = getSoftwareInstructionWithIcon(context, text);
-        }
-
-        return text;
+        return AccessibilityUtil.isFloatingMenuEnabled(context)
+                ? context.getText(R.string.accessibility_tutorial_dialog_message_floating_button)
+                : getSoftwareInstructionWithIcon(context,
+                        context.getText(R.string.accessibility_tutorial_dialog_message_button));
     }
 
     private static CharSequence getSoftwareInstructionWithIcon(Context context, CharSequence text) {
diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
index 2206e81..dcf7897 100644
--- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
+++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
@@ -35,6 +35,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 
@@ -60,11 +61,19 @@
         return false;
     };
 
+    /**
+     * The interface to execute the uninstallation action.
+     */
+    interface UninstallActionPerformer {
+        void uninstallPackage();
+    }
+
     /** Returns a {@link Dialog} to be shown to confirm that they want to enable a service. */
-    public static Dialog createCapabilitiesDialog(Context context,
-            AccessibilityServiceInfo info, View.OnClickListener listener) {
+    public static Dialog createCapabilitiesDialog(@NonNull Context context,
+            @NonNull AccessibilityServiceInfo info, @NonNull View.OnClickListener listener,
+            @NonNull UninstallActionPerformer performer) {
         final AlertDialog ad = new AlertDialog.Builder(context)
-                .setView(createEnableDialogContentView(context, info, listener))
+                .setView(createEnableDialogContentView(context, info, listener, performer))
                 .create();
 
         Window window = ad.getWindow();
@@ -88,7 +97,8 @@
     }
 
     private static View createEnableDialogContentView(Context context,
-            AccessibilityServiceInfo info, View.OnClickListener listener) {
+            @NonNull AccessibilityServiceInfo info, View.OnClickListener listener,
+            UninstallActionPerformer performer) {
         LayoutInflater inflater = (LayoutInflater) context.getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);
 
@@ -129,6 +139,14 @@
         permissionAllowButton.setOnTouchListener(filterTouchListener);
         permissionDenyButton.setOnClickListener(listener);
 
+        final Button uninstallButton = content.findViewById(
+                R.id.permission_enable_uninstall_button);
+        // Shows an uninstall button to help users quickly remove the non-system App due to the
+        // required permissions.
+        if (!AccessibilityUtil.isSystemApp(info)) {
+            uninstallButton.setVisibility(View.VISIBLE);
+            uninstallButton.setOnClickListener(v -> performer.uninstallPackage());
+        }
         return content;
     }
 
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index d510ac7..6b629ac 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.accessibility;
 
-import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;
+import static com.android.settingslib.widget.TwoTargetPreference.ICON_SIZE_MEDIUM;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.accessibilityservice.AccessibilityShortcutInfo;
diff --git a/src/com/android/settings/accessibility/AccessibilityUtil.java b/src/com/android/settings/accessibility/AccessibilityUtil.java
index eb202b5..5c316a4 100644
--- a/src/com/android/settings/accessibility/AccessibilityUtil.java
+++ b/src/com/android/settings/accessibility/AccessibilityUtil.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.accessibility;
 
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
@@ -143,6 +144,13 @@
                 == NAV_BAR_MODE_GESTURAL;
     }
 
+    /** Determines if a accessibility floating menu is being used. */
+    public static boolean isFloatingMenuEnabled(Context context) {
+        return Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, /* def= */ -1)
+                == ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;
+    }
+
     /** Determines if a touch explore is being used. */
     public static boolean isTouchExploreEnabled(Context context) {
         final AccessibilityManager am = context.getSystemService(AccessibilityManager.class);
@@ -381,4 +389,13 @@
         return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, screenHeightDp,
                 resources.getDisplayMetrics()));
     }
+
+    /**
+     * Indicates if the accessibility service belongs to a system App.
+     * @param info AccessibilityServiceInfo
+     * @return {@code true} if the App is a system App.
+     */
+    public static boolean isSystemApp(@NonNull AccessibilityServiceInfo info) {
+        return info.getResolveInfo().serviceInfo.applicationInfo.isSystemApp();
+    }
 }
diff --git a/src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java b/src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java
new file mode 100644
index 0000000..dd419d0
--- /dev/null
+++ b/src/com/android/settings/accessibility/FloatingMenuFadePreferenceController.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+/** Preference controller that controls the fade switch button in accessibility button page. */
+public class FloatingMenuFadePreferenceController extends BasePreferenceController implements
+        Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
+
+    private static final int OFF = 0;
+    private static final int ON = 1;
+
+    private final ContentResolver mContentResolver;
+    @VisibleForTesting
+    final ContentObserver mContentObserver;
+
+    @VisibleForTesting
+    SwitchPreference mPreference;
+
+    public FloatingMenuFadePreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mContentResolver = context.getContentResolver();
+        mContentObserver = new ContentObserver(new Handler(Looper.getMainLooper())) {
+            @Override
+            public void onChange(boolean selfChange) {
+                updateAvailabilityStatus();
+            }
+        };
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AccessibilityUtil.isFloatingMenuEnabled(mContext)
+                ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (boolean) newValue;
+        putFloatingMenuFadeValue(isEnabled);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        final SwitchPreference switchPreference = (SwitchPreference) preference;
+
+        switchPreference.setChecked(getFloatingMenuFadeValue() == ON);
+    }
+
+    @Override
+    public void onResume() {
+        mContentResolver.registerContentObserver(
+                Settings.Secure.getUriFor(
+                        Settings.Secure.ACCESSIBILITY_BUTTON_MODE),
+                        /* notifyForDescendants= */ false, mContentObserver);
+    }
+
+    @Override
+    public void onPause() {
+        mContentResolver.unregisterContentObserver(mContentObserver);
+    }
+
+    private void updateAvailabilityStatus() {
+        mPreference.setEnabled(AccessibilityUtil.isFloatingMenuEnabled(mContext));
+    }
+
+    private int getFloatingMenuFadeValue() {
+        return Settings.Secure.getInt(mContentResolver,
+                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED, ON);
+    }
+
+    private void putFloatingMenuFadeValue(boolean isEnabled) {
+        Settings.Secure.putInt(mContentResolver,
+                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED,
+                isEnabled ? ON : OFF);
+    }
+}
diff --git a/src/com/android/settings/accessibility/FloatingMenuLayerDrawable.java b/src/com/android/settings/accessibility/FloatingMenuLayerDrawable.java
new file mode 100644
index 0000000..bfce114
--- /dev/null
+++ b/src/com/android/settings/accessibility/FloatingMenuLayerDrawable.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+
+import java.util.Objects;
+
+/** LayerDrawable that contains device icon as background and floating menu icon as foreground. */
+public class FloatingMenuLayerDrawable extends LayerDrawable {
+
+    private FloatingMenuLayerDrawableState mState;
+
+    /**
+     * Creates a new layer drawable with the list of specified layers.
+     *
+     * @param layers a list of drawables to use as layers in this new drawable,
+     *               must be non-null
+     */
+    private FloatingMenuLayerDrawable(@NonNull Drawable[] layers) {
+        super(layers);
+    }
+
+    /**
+     * Create the {@link LayerDrawable} that contains device icon as background and floating menu
+     * icon with given {@code opacity} value as foreground.
+     *
+     * @param context the valid context used to get the icon
+     * @param resId the resource ID of the floating menu icon
+     * @param opacity the opacity to apply to the given icon
+     * @return the drawable that combines the device icon and the floating menu icon
+     */
+    public static FloatingMenuLayerDrawable createLayerDrawable(Context context, int resId,
+            int opacity) {
+        final Drawable bg = context.getDrawable(R.drawable.accessibility_button_preview_base);
+        final FloatingMenuLayerDrawable basicDrawable = new FloatingMenuLayerDrawable(
+                new Drawable[]{bg, null});
+
+        basicDrawable.updateLayerDrawable(context, resId, opacity);
+        return basicDrawable;
+    }
+
+    /**
+     * Update the drawable  with given {@code resId} drawable and {@code opacity}(alpha)
+     * value at index 1 layer.
+     *
+     * @param context the valid context used to get the icon
+     * @param resId the resource ID of the floating menu icon
+     * @param opacity the opacity to apply to the given icon
+     */
+    public void updateLayerDrawable(Context context, int resId, int opacity) {
+        final Drawable icon = context.getDrawable(resId);
+        icon.setAlpha(opacity);
+        this.setDrawable(/* index= */ 1, icon);
+        this.setConstantState(context, resId, opacity);
+    }
+
+    @Override
+    public ConstantState getConstantState() {
+        return mState;
+    }
+
+    /** Stores the constant state and data to the given drawable. */
+    private void setConstantState(Context context, int resId, int opacity) {
+        mState = new FloatingMenuLayerDrawableState(context, resId, opacity);
+    }
+
+    /** {@link ConstantState} to store the data of {@link FloatingMenuLayerDrawable}. */
+    @VisibleForTesting
+    static class FloatingMenuLayerDrawableState extends ConstantState {
+
+        private final Context mContext;
+        private final int mResId;
+        private final int mOpacity;
+
+        FloatingMenuLayerDrawableState(Context context, int resId, int opacity) {
+            mContext = context;
+            mResId = resId;
+            mOpacity = opacity;
+        }
+
+        @NonNull
+        @Override
+        public Drawable newDrawable() {
+            return createLayerDrawable(mContext, mResId, mOpacity);
+        }
+
+        @Override
+        public int getChangingConfigurations() {
+            return 0;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            final FloatingMenuLayerDrawableState that = (FloatingMenuLayerDrawableState) o;
+            return mResId == that.mResId
+                    && mOpacity == that.mOpacity
+                    && Objects.equals(mContext, that.mContext);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(mContext, mResId, mOpacity);
+        }
+    }
+}
diff --git a/src/com/android/settings/accessibility/FloatingMenuOpacityPreferenceController.java b/src/com/android/settings/accessibility/FloatingMenuOpacityPreferenceController.java
new file mode 100644
index 0000000..fea6fb6
--- /dev/null
+++ b/src/com/android/settings/accessibility/FloatingMenuOpacityPreferenceController.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.SliderPreferenceController;
+import com.android.settings.widget.SeekBarPreference;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+/** Preference controller that controls the opacity seekbar in accessibility button page. */
+public class FloatingMenuOpacityPreferenceController extends SliderPreferenceController
+        implements LifecycleObserver, OnResume, OnPause {
+
+    @VisibleForTesting
+    static final float DEFAULT_OPACITY = 0.55f;
+    private static final int FADE_ENABLED = 1;
+    private static final float MIN_PROGRESS = 10f;
+    private static final float MAX_PROGRESS = 100f;
+    @VisibleForTesting
+    static final float PRECISION = 100f;
+
+    private final ContentResolver mContentResolver;
+    @VisibleForTesting
+    final ContentObserver mContentObserver;
+
+    @VisibleForTesting
+    SeekBarPreference mPreference;
+
+    public FloatingMenuOpacityPreferenceController(Context context,
+            String preferenceKey) {
+        super(context, preferenceKey);
+        mContentResolver = context.getContentResolver();
+        mContentObserver = new ContentObserver(new Handler(Looper.getMainLooper())) {
+            @Override
+            public void onChange(boolean selfChange) {
+                updateAvailabilityStatus();
+            }
+        };
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AccessibilityUtil.isFloatingMenuEnabled(mContext)
+                ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = screen.findPreference(getPreferenceKey());
+        mPreference.setContinuousUpdates(true);
+        mPreference.setMax(getMax());
+        mPreference.setMin(getMin());
+        mPreference.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_ENDS);
+
+        updateState(mPreference);
+    }
+
+    @Override
+    public void onResume() {
+        mContentResolver.registerContentObserver(
+                Settings.Secure.getUriFor(
+                        Settings.Secure.ACCESSIBILITY_BUTTON_MODE), /* notifyForDescendants= */
+                false, mContentObserver);
+        mContentResolver.registerContentObserver(
+                Settings.Secure.getUriFor(
+                        Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED),
+                        /* notifyForDescendants= */ false, mContentObserver);
+    }
+
+    @Override
+    public void onPause() {
+        mContentResolver.unregisterContentObserver(mContentObserver);
+    }
+
+    @Override
+    public int getSliderPosition() {
+        return convertOpacityFloatToInt(getOpacity());
+    }
+
+    @Override
+    public boolean setSliderPosition(int position) {
+        final float value = convertOpacityIntToFloat(position);
+
+        return Settings.Secure.putFloat(mContentResolver,
+                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY, value);
+    }
+
+    @Override
+    public int getMax() {
+        return (int) MAX_PROGRESS;
+    }
+
+    @Override
+    public int getMin() {
+        return (int) MIN_PROGRESS;
+    }
+
+    private void updateAvailabilityStatus() {
+        final boolean fadeEnabled = Settings.Secure.getInt(mContentResolver,
+                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED, FADE_ENABLED)
+                == FADE_ENABLED;
+
+        mPreference.setEnabled(AccessibilityUtil.isFloatingMenuEnabled(mContext) && fadeEnabled);
+    }
+
+    private int convertOpacityFloatToInt(float value) {
+        return Math.round(value * PRECISION);
+    }
+
+    private float convertOpacityIntToFloat(int value) {
+        return (float) value / PRECISION;
+    }
+
+    private float getOpacity() {
+        float value = Settings.Secure.getFloat(mContentResolver,
+                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY, DEFAULT_OPACITY);
+        final float minValue = MIN_PROGRESS / PRECISION;
+        final float maxValue = MAX_PROGRESS / PRECISION;
+
+        return (value < minValue || value > maxValue) ? DEFAULT_OPACITY : value;
+    }
+}
+
diff --git a/src/com/android/settings/accessibility/FloatingMenuSizePreferenceController.java b/src/com/android/settings/accessibility/FloatingMenuSizePreferenceController.java
new file mode 100644
index 0000000..2f0f833
--- /dev/null
+++ b/src/com/android/settings/accessibility/FloatingMenuSizePreferenceController.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+import android.util.ArrayMap;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+import com.google.common.primitives.Ints;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** Preference controller that controls the preferred size in accessibility button page. */
+public class FloatingMenuSizePreferenceController extends BasePreferenceController
+        implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause {
+
+    private final ContentResolver mContentResolver;
+    @VisibleForTesting
+    final ContentObserver mContentObserver;
+
+    @VisibleForTesting
+    ListPreference mPreference;
+
+    private final ArrayMap<String, String> mValueTitleMap = new ArrayMap<>();
+    private int mDefaultSize;
+
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({
+            Size.SMALL,
+            Size.LARGE,
+    })
+    @VisibleForTesting
+    @interface Size {
+        int SMALL = 0;
+        int LARGE = 1;
+    }
+
+    public FloatingMenuSizePreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mContentResolver = context.getContentResolver();
+        mContentObserver = new ContentObserver(new Handler(Looper.getMainLooper())) {
+            @Override
+            public void onChange(boolean selfChange) {
+                updateAvailabilityStatus();
+            }
+        };
+
+        initValueTitleMap();
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AccessibilityUtil.isFloatingMenuEnabled(mContext)
+                ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final ListPreference listPreference = (ListPreference) preference;
+        final Integer value = Ints.tryParse((String) newValue);
+        if (value != null) {
+            putAccessibilityFloatingMenuSize(value);
+            updateState(listPreference);
+        }
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        final ListPreference listPreference = (ListPreference) preference;
+
+        listPreference.setValue(String.valueOf(getAccessibilityFloatingMenuSize(mDefaultSize)));
+    }
+
+    @Override
+    public void onResume() {
+        mContentResolver.registerContentObserver(
+                Settings.Secure.getUriFor(
+                        Settings.Secure.ACCESSIBILITY_BUTTON_MODE), /* notifyForDescendants= */
+                false, mContentObserver);
+
+    }
+
+    @Override
+    public void onPause() {
+        mContentResolver.unregisterContentObserver(mContentObserver);
+    }
+
+    private void updateAvailabilityStatus() {
+        mPreference.setEnabled(AccessibilityUtil.isFloatingMenuEnabled(mContext));
+    }
+
+    private void initValueTitleMap() {
+        if (mValueTitleMap.size() == 0) {
+            final String[] values = mContext.getResources().getStringArray(
+                    R.array.accessibility_button_size_selector_values);
+            final String[] titles = mContext.getResources().getStringArray(
+                    R.array.accessibility_button_size_selector_titles);
+            final int mapSize = values.length;
+
+            mDefaultSize = Integer.parseInt(values[0]);
+            for (int i = 0; i < mapSize; i++) {
+                mValueTitleMap.put(values[i], titles[i]);
+            }
+        }
+    }
+
+    @Size
+    private int getAccessibilityFloatingMenuSize(@Size int defaultValue) {
+        return Settings.Secure.getInt(mContentResolver,
+                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE, defaultValue);
+    }
+
+    private void putAccessibilityFloatingMenuSize(@Size int value) {
+        Settings.Secure.putInt(mContentResolver,
+                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE, value);
+    }
+}
diff --git a/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
index 6b44a0a..0c1876f 100644
--- a/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java
@@ -38,7 +38,7 @@
     @Override
     protected void onInstallSwitchPreferenceToggleSwitch() {
         super.onInstallSwitchPreferenceToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setVisible(false);
+        mToggleServiceSwitchPreference.setVisible(false);
     }
 
     /**
diff --git a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
index b2c3c4d..4db7857 100644
--- a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
@@ -36,15 +36,14 @@
 import android.view.accessibility.AccessibilityManager;
 
 import androidx.annotation.Nullable;
-import androidx.preference.SwitchPreference;
 
 import com.android.settings.R;
+import com.android.settings.widget.SettingsMainSwitchPreference;
 
 import java.util.List;
 
 /** Fragment for providing open activity button. */
-public class LaunchAccessibilityActivityPreferenceFragment extends
-        ToggleFeaturePreferenceFragment {
+public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeaturePreferenceFragment {
     private static final String TAG = "LaunchA11yActivity";
     private static final String EMPTY_STRING = "";
 
@@ -52,7 +51,7 @@
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        mToggleServiceDividerSwitchPreference.setSwitchVisibility(View.GONE);
+        mToggleServiceSwitchPreference.hide();
     }
 
     @Override
@@ -62,16 +61,6 @@
     }
 
     @Override
-    protected void onInstallSwitchPreferenceToggleSwitch() {
-        super.onInstallSwitchPreferenceToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener((preference) -> {
-            final boolean checked = ((DividerSwitchPreference) preference).isChecked();
-            onPreferenceToggled(mPreferenceKey, checked);
-            return false;
-        });
-    }
-
-    @Override
     protected void onProcessArguments(Bundle arguments) {
         super.onProcessArguments(arguments);
 
@@ -111,7 +100,7 @@
     }
 
     @Override
-    protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
+    protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {
         final AccessibilityShortcutInfo info = getAccessibilityShortcutInfo();
         final String switchBarText = (info == null) ? EMPTY_STRING : getString(
                 R.string.accessibility_service_primary_open_title,
diff --git a/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceController.java b/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceController.java
index ea7fb7c..3b220e4 100644
--- a/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceController.java
+++ b/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceController.java
@@ -29,8 +29,11 @@
 /** PreferenceController for feature intensity. */
 public class ReduceBrightColorsIntensityPreferenceController extends SliderPreferenceController {
 
+    private final ColorDisplayManager mColorDisplayManager;
+
     public ReduceBrightColorsIntensityPreferenceController(Context context, String key) {
         super(context, key);
+        mColorDisplayManager = context.getSystemService(ColorDisplayManager.class);
     }
 
     @Override
@@ -59,31 +62,26 @@
     @Override
     public final void updateState(Preference preference) {
         super.updateState(preference);
-        preference.setEnabled(Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED, 0) == 1);
+        preference.setEnabled(mColorDisplayManager.isReduceBrightColorsActivated());
     }
 
     @Override
     public int getSliderPosition() {
-        return Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.REDUCE_BRIGHT_COLORS_LEVEL, 0);
+        return mColorDisplayManager.getReduceBrightColorsStrength();
     }
 
     @Override
     public boolean setSliderPosition(int position) {
-        return Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.REDUCE_BRIGHT_COLORS_LEVEL, position);
+        return mColorDisplayManager.setReduceBrightColorsStrength(position);
     }
 
     @Override
     public int getMax() {
-        // TODO(b/170970675): Call into CDS to get config max intensity
-        return 100;
+        return ColorDisplayManager.getMaximumReduceBrightColorsStrength(mContext);
     }
 
     @Override
     public int getMin() {
-        // TODO(b/170970675): Call into CDS to get config min intensity
-        return 0;
+        return ColorDisplayManager.getMinimumReduceBrightColorsStrength(mContext);
     }
 }
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 04491cc..7902ec6 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -24,10 +24,14 @@
 import android.app.Dialog;
 import android.app.admin.DevicePolicyManager;
 import android.app.settings.SettingsEnums;
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.net.Uri;
@@ -37,18 +41,21 @@
 import android.os.storage.StorageManager;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.accessibility.AccessibilityManager;
+import android.widget.Switch;
 
+import androidx.annotation.Nullable;
 import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
 import com.android.settings.password.ConfirmDeviceCredentialActivity;
+import com.android.settings.widget.SettingsMainSwitchPreference;
 import com.android.settingslib.accessibility.AccessibilityUtils;
 
 import java.util.List;
@@ -58,7 +65,8 @@
 public class ToggleAccessibilityServicePreferenceFragment extends
         ToggleFeaturePreferenceFragment {
 
-    public static final int ACTIVITY_REQUEST_CONFIRM_CREDENTIAL_FOR_WEAKER_ENCRYPTION = 1;
+    private static final String TAG = "ToggleAccessibilityServicePreferenceFragment";
+    private static final int ACTIVITY_REQUEST_CONFIRM_CREDENTIAL_FOR_WEAKER_ENCRYPTION = 1;
     private LockPatternUtils mLockPatternUtils;
     private AtomicBoolean mIsDialogShown = new AtomicBoolean(/* initialValue= */ false);
 
@@ -73,6 +81,7 @@
             };
 
     private Dialog mDialog;
+    private BroadcastReceiver mPackageRemovedReceiver;
 
     @Override
     public int getMetricsCategory() {
@@ -93,6 +102,17 @@
     }
 
     @Override
+    public void onStart() {
+        super.onStart();
+        final AccessibilityServiceInfo serviceInfo = getAccessibilityServiceInfo();
+        if (serviceInfo == null) {
+            getActivity().finishAndRemoveTask();
+        } else if (!AccessibilityUtil.isSystemApp(serviceInfo)) {
+            registerPackageRemoveReceiver();
+        }
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         updateSwitchBarToggleSwitch();
@@ -110,6 +130,7 @@
     // capabilities. For
     // example, before JellyBean MR2 the user was granting the explore by touch
     // one.
+    @Nullable
     AccessibilityServiceInfo getAccessibilityServiceInfo() {
         final List<AccessibilityServiceInfo> infos = AccessibilityManager.getInstance(
                 getPrefContext()).getInstalledAccessibilityServiceList();
@@ -135,7 +156,8 @@
                 }
                 mDialog = AccessibilityServiceWarning
                         .createCapabilitiesDialog(getPrefContext(), info,
-                                this::onDialogButtonFromEnableToggleClicked);
+                                this::onDialogButtonFromEnableToggleClicked,
+                                this::onDialogButtonFromUninstallClicked);
                 break;
             }
             case DialogEnums.ENABLE_WARNING_FROM_SHORTCUT_TOGGLE: {
@@ -145,7 +167,8 @@
                 }
                 mDialog = AccessibilityServiceWarning
                         .createCapabilitiesDialog(getPrefContext(), info,
-                                this::onDialogButtonFromShortcutToggleClicked);
+                                this::onDialogButtonFromShortcutToggleClicked,
+                                this::onDialogButtonFromUninstallClicked);
                 break;
             }
             case DialogEnums.ENABLE_WARNING_FROM_SHORTCUT: {
@@ -155,7 +178,8 @@
                 }
                 mDialog = AccessibilityServiceWarning
                         .createCapabilitiesDialog(getPrefContext(), info,
-                                this::onDialogButtonFromShortcutClicked);
+                                this::onDialogButtonFromShortcutClicked,
+                                this::onDialogButtonFromUninstallClicked);
                 break;
             }
             case DialogEnums.DISABLE_WARNING_FROM_TOGGLE: {
@@ -198,7 +222,7 @@
     }
 
     @Override
-    protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
+    protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {
         final AccessibilityServiceInfo info = getAccessibilityServiceInfo();
         final String switchBarText = (info == null) ? "" :
                 getString(R.string.accessibility_service_primary_switch_title,
@@ -206,13 +230,14 @@
         switchPreference.setTitle(switchBarText);
     }
 
-    private void updateSwitchBarToggleSwitch() {
+    @Override
+    protected void updateSwitchBarToggleSwitch() {
         final boolean checked = AccessibilityUtils.getEnabledServicesFromSettings(getPrefContext())
                 .contains(mComponentName);
-        if (mToggleServiceDividerSwitchPreference.isChecked() == checked) {
+        if (mToggleServiceSwitchPreference.isChecked() == checked) {
             return;
         }
-        mToggleServiceDividerSwitchPreference.setChecked(checked);
+        mToggleServiceSwitchPreference.setChecked(checked);
     }
 
     /**
@@ -244,6 +269,32 @@
         }
     }
 
+    private void registerPackageRemoveReceiver() {
+        if (mPackageRemovedReceiver != null || getContext() == null) {
+            return;
+        }
+        mPackageRemovedReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                final String packageName = intent.getData().getSchemeSpecificPart();
+                if (TextUtils.equals(mComponentName.getPackageName(), packageName)) {
+                    getActivity().finishAndRemoveTask();
+                }
+            }
+        };
+        final IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_REMOVED);
+        filter.addDataScheme("package");
+        getContext().registerReceiver(mPackageRemovedReceiver, filter);
+    }
+
+    private void unregisterPackageRemoveReceiver() {
+        if (mPackageRemovedReceiver == null || getContext() == null) {
+            return;
+        }
+        getContext().unregisterReceiver(mPackageRemovedReceiver);
+        mPackageRemovedReceiver = null;
+    }
+
     private boolean isServiceSupportAccessibilityButton() {
         final AccessibilityManager ams = getPrefContext().getSystemService(
                 AccessibilityManager.class);
@@ -263,7 +314,7 @@
     }
 
     private void handleConfirmServiceEnabled(boolean confirmed) {
-        mToggleServiceDividerSwitchPreference.setChecked(confirmed);
+        mToggleServiceSwitchPreference.setChecked(confirmed);
         getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, confirmed);
         onPreferenceToggled(mPreferenceKey, confirmed);
     }
@@ -286,9 +337,10 @@
     }
 
     @Override
-    protected void onInstallSwitchPreferenceToggleSwitch() {
-        super.onInstallSwitchPreferenceToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener(this::onPreferenceClick);
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        if (isChecked != mToggleServiceSwitchPreference.isChecked()) {
+            onPreferenceClick(mToggleServiceSwitchPreference);
+        }
     }
 
     @Override
@@ -296,7 +348,7 @@
         final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
                 mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         if (preference.isChecked()) {
-            if (!mToggleServiceDividerSwitchPreference.isChecked()) {
+            if (!mToggleServiceSwitchPreference.isChecked()) {
                 preference.setChecked(false);
                 showPopupDialog(DialogEnums.ENABLE_WARNING_FROM_SHORTCUT_TOGGLE);
             } else {
@@ -314,7 +366,7 @@
     @Override
     public void onSettingsClicked(ShortcutPreference preference) {
         final boolean isServiceOnOrShortcutAdded = mShortcutPreference.isChecked()
-                || mToggleServiceDividerSwitchPreference.isChecked();
+                || mToggleServiceSwitchPreference.isChecked();
         showPopupDialog(isServiceOnOrShortcutAdded ? DialogEnums.EDIT_SHORTCUT
                 : DialogEnums.ENABLE_WARNING_FROM_SHORTCUT);
     }
@@ -375,6 +427,35 @@
         }
     }
 
+    private void onDialogButtonFromUninstallClicked() {
+        mDialog.dismiss();
+        final Intent uninstallIntent = createUninstallPackageActivityIntent();
+        if (uninstallIntent == null) {
+            return;
+        }
+        startActivity(uninstallIntent);
+    }
+
+    @Nullable
+    private Intent createUninstallPackageActivityIntent() {
+        final AccessibilityServiceInfo a11yServiceInfo = getAccessibilityServiceInfo();
+        if (a11yServiceInfo == null) {
+            Log.w(TAG, "createUnInstallIntent -- invalid a11yServiceInfo");
+            return null;
+        }
+        final ApplicationInfo appInfo =
+                a11yServiceInfo.getResolveInfo().serviceInfo.applicationInfo;
+        final Uri packageUri = Uri.parse("package:" + appInfo.packageName);
+        final Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageUri);
+        return uninstallIntent;
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        unregisterPackageRemoveReceiver();
+    }
+
     private void onAllowButtonFromEnableToggleClicked() {
         if (isFullDiskEncrypted()) {
             final String title = createConfirmCredentialReasonMessage();
@@ -453,9 +534,14 @@
     }
 
     private boolean onPreferenceClick(Preference preference) {
-        boolean checked = ((DividerSwitchPreference) preference).isChecked();
+        boolean checked = ((SettingsMainSwitchPreference) preference).isChecked();
         if (checked) {
-            mToggleServiceDividerSwitchPreference.setChecked(false);
+            mToggleServiceSwitchPreference.setChecked(true);
+            getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED,
+                    /* enableService */ true);
+            showDialog(DialogEnums.DISABLE_WARNING_FROM_TOGGLE);
+        } else {
+            mToggleServiceSwitchPreference.setChecked(false);
             getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED,
                     /* disableService */ false);
             if (!mShortcutPreference.isChecked()) {
@@ -466,11 +552,6 @@
                     showPopupDialog(DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL);
                 }
             }
-        } else {
-            mToggleServiceDividerSwitchPreference.setChecked(true);
-            getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED,
-                    /* enableService */ true);
-            showDialog(DialogEnums.DISABLE_WARNING_FROM_TOGGLE);
         }
         return true;
     }
diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
index a45cd49..7fd30c6 100644
--- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
@@ -31,15 +31,15 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.preference.SwitchPreference;
-
 import com.android.settings.R;
+import com.android.settings.widget.SettingsMainSwitchPreference;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /** Settings page for color inversion. */
-public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePreferenceFragment {
+public class ToggleColorInversionPreferenceFragment extends
+        ToggleFeaturePreferenceFragment {
 
     private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED;
     private final Handler mHandler = new Handler();
@@ -64,26 +64,15 @@
     @Override
     protected void onRemoveSwitchPreferenceToggleSwitch() {
         super.onRemoveSwitchPreferenceToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener(null);
+        mToggleServiceSwitchPreference.setOnPreferenceClickListener(null);
     }
 
     @Override
-    protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
+    protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {
         switchPreference.setTitle(R.string.accessibility_display_inversion_switch_title);
     }
 
     @Override
-    protected void onInstallSwitchPreferenceToggleSwitch() {
-        super.onInstallSwitchPreferenceToggleSwitch();
-        updateSwitchBarToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener((preference) -> {
-            boolean checked = ((SwitchPreference) preference).isChecked();
-            onPreferenceToggled(mPreferenceKey, checked);
-            return false;
-        });
-    }
-
-    @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         mComponentName = COLOR_INVERSION_COMPONENT_NAME;
@@ -128,11 +117,12 @@
                 mComponentName);
     }
 
-    private void updateSwitchBarToggleSwitch() {
+    @Override
+    protected void updateSwitchBarToggleSwitch() {
         final boolean checked = Settings.Secure.getInt(getContentResolver(), ENABLED, OFF) == ON;
-        if (mToggleServiceDividerSwitchPreference.isChecked() == checked) {
+        if (mToggleServiceSwitchPreference.isChecked() == checked) {
             return;
         }
-        mToggleServiceDividerSwitchPreference.setChecked(checked);
+        mToggleServiceSwitchPreference.setChecked(checked);
     }
 }
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 3fb9b38..c12884b 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -33,11 +33,10 @@
 import android.view.ViewGroup;
 
 import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
 
 import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.SettingsMainSwitchPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.search.SearchIndexable;
@@ -99,34 +98,19 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        updatePreferenceOrder();
     }
 
     /** Customizes the order by preference key. */
-    private List<String> getPreferenceOrderList() {
-        List<String> lists = new ArrayList<>();
-        lists.add(KEY_PREVIEW);
+    protected List<String> getPreferenceOrderList() {
+        final List<String> lists = new ArrayList<>();
         lists.add(KEY_USE_SERVICE_PREFERENCE);
+        lists.add(KEY_PREVIEW);
         lists.add(KEY_CATEGORY_MODE);
         lists.add(KEY_GENERAL_CATEGORY);
         lists.add(KEY_INTRODUCTION_CATEGORY);
         return lists;
     }
 
-    private void updatePreferenceOrder() {
-        List<String> lists = getPreferenceOrderList();
-        final PreferenceScreen preferenceScreen = getPreferenceScreen();
-        preferenceScreen.setOrderingAsAdded(false);
-
-        final int size = lists.size();
-        for (int i = 0; i < size; i++) {
-            final Preference preference = preferenceScreen.findPreference(lists.get(i));
-            if (preference != null) {
-                preference.setOrder(i);
-            }
-        }
-    }
-
     @Override
     public void onResume() {
         super.onResume();
@@ -175,37 +159,27 @@
     @Override
     protected void onRemoveSwitchPreferenceToggleSwitch() {
         super.onRemoveSwitchPreferenceToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener(null);
+        mToggleServiceSwitchPreference.setOnPreferenceClickListener(null);
     }
 
     @Override
-    protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
+    protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {
         switchPreference.setTitle(R.string.accessibility_daltonizer_primary_switch_title);
     }
 
     @Override
-    protected void onInstallSwitchPreferenceToggleSwitch() {
-        super.onInstallSwitchPreferenceToggleSwitch();
-        updateSwitchBarToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener((preference) -> {
-            boolean checked = ((SwitchPreference) preference).isChecked();
-            onPreferenceToggled(mPreferenceKey, checked);
-            return false;
-        });
-    }
-
-    @Override
     int getUserShortcutTypes() {
         return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
                 mComponentName);
     }
 
-    private void updateSwitchBarToggleSwitch() {
+    @Override
+    protected void updateSwitchBarToggleSwitch() {
         final boolean checked = Settings.Secure.getInt(getContentResolver(), ENABLED, OFF) == ON;
-        if (mToggleServiceDividerSwitchPreference.isChecked() == checked) {
+        if (mToggleServiceSwitchPreference.isChecked() == checked) {
             return;
         }
-        mToggleServiceDividerSwitchPreference.setChecked(checked);
+        mToggleServiceSwitchPreference.setChecked(checked);
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 87d07a8..cf9c08b 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -40,20 +40,22 @@
 import android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener;
 import android.widget.CheckBox;
 import android.widget.ImageView;
+import android.widget.Switch;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
 import com.android.settings.widget.SettingsMainSwitchBar;
+import com.android.settings.widget.SettingsMainSwitchPreference;
 import com.android.settingslib.accessibility.AccessibilityUtils;
 import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -66,9 +68,9 @@
  * and dialog management.
  */
 public abstract class ToggleFeaturePreferenceFragment extends SettingsPreferenceFragment
-        implements ShortcutPreference.OnClickCallback {
+        implements ShortcutPreference.OnClickCallback, OnMainSwitchChangeListener {
 
-    protected DividerSwitchPreference mToggleServiceDividerSwitchPreference;
+    protected SettingsMainSwitchPreference mToggleServiceSwitchPreference;
     protected ShortcutPreference mShortcutPreference;
     protected Preference mSettingsPreference;
     protected String mPreferenceKey;
@@ -88,6 +90,7 @@
     protected static final String KEY_INTRODUCTION_CATEGORY = "introduction_categories";
     private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
     protected static final String KEY_SAVED_USER_SHORTCUT_TYPE = "shortcut_type";
+    protected static final String KEY_ANIMATED_IMAGE = "animated_image";
 
     private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
     private SettingsContentObserver mSettingsContentObserver;
@@ -153,7 +156,7 @@
         onProcessArguments(getArguments());
 
         initAnimatedImagePreference();
-        initToggleServiceDividerSwitchPreference();
+        initToggleServiceSwitchPreference();
         initGeneralCategory();
         initShortcutPreference();
         initSettingsPreference();
@@ -162,7 +165,7 @@
 
         installActionBarToggleSwitch();
 
-        updateToggleServiceTitle(mToggleServiceDividerSwitchPreference);
+        updateToggleServiceTitle(mToggleServiceSwitchPreference);
 
         mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> {
             removeDialog(DialogEnums.EDIT_SHORTCUT);
@@ -178,6 +181,8 @@
         final SettingsActivity activity = (SettingsActivity) getActivity();
         final SettingsMainSwitchBar switchBar = activity.getSwitchBar();
         switchBar.hide();
+
+        updatePreferenceOrder();
     }
 
     @Override
@@ -305,12 +310,17 @@
         removeActionBarToggleSwitch();
     }
 
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        onPreferenceToggled(mPreferenceKey, isChecked);
+    }
+
     /**
      * Returns the shortcut type list which has been checked by user.
      */
     abstract int getUserShortcutTypes();
 
-    protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
+    protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {
         switchPreference.setTitle(R.string.accessibility_service_primary_switch_title);
     }
 
@@ -318,18 +328,24 @@
 
     protected void onInstallSwitchPreferenceToggleSwitch() {
         // Implement this to set a checked listener.
+        updateSwitchBarToggleSwitch();
+        mToggleServiceSwitchPreference.addOnSwitchChangeListener(this);
     }
 
     protected void onRemoveSwitchPreferenceToggleSwitch() {
         // Implement this to reset a checked listener.
     }
 
+    protected void updateSwitchBarToggleSwitch() {
+        // Implement this to update the state of switch.
+    }
+
     private void installActionBarToggleSwitch() {
         onInstallSwitchPreferenceToggleSwitch();
     }
 
     private void removeActionBarToggleSwitch() {
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener(null);
+        mToggleServiceSwitchPreference.setOnPreferenceClickListener(null);
         onRemoveSwitchPreferenceToggleSwitch();
     }
 
@@ -361,6 +377,31 @@
         }
     }
 
+    /** Customizes the order by preference key. */
+    protected List<String> getPreferenceOrderList() {
+        final List<String> lists = new ArrayList<>();
+        lists.add(KEY_USE_SERVICE_PREFERENCE);
+        lists.add(KEY_ANIMATED_IMAGE);
+        lists.add(KEY_GENERAL_CATEGORY);
+        lists.add(KEY_INTRODUCTION_CATEGORY);
+        return lists;
+    }
+
+    private void updatePreferenceOrder() {
+        final List<String> lists = getPreferenceOrderList();
+
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        preferenceScreen.setOrderingAsAdded(false);
+
+        final int size = lists.size();
+        for (int i = 0; i < size; i++) {
+            final Preference preference = preferenceScreen.findPreference(lists.get(i));
+            if (preference != null) {
+                preference.setOrder(i);
+            }
+        }
+    }
+
     private Drawable getDrawableFromUri(Uri imageUri) {
         if (mImageGetterCacheView == null) {
             mImageGetterCacheView = new ImageView(getPrefContext());
@@ -401,19 +442,20 @@
         animatedImagePreference.setImageUri(mImageUri);
         animatedImagePreference.setSelectable(false);
         animatedImagePreference.setMaxHeight(screenHalfHeight);
+        animatedImagePreference.setKey(KEY_ANIMATED_IMAGE);
 
         getPreferenceScreen().addPreference(animatedImagePreference);
     }
 
-    private void initToggleServiceDividerSwitchPreference() {
-        mToggleServiceDividerSwitchPreference = new DividerSwitchPreference(getPrefContext());
-        mToggleServiceDividerSwitchPreference.setKey(KEY_USE_SERVICE_PREFERENCE);
+    private void initToggleServiceSwitchPreference() {
+        mToggleServiceSwitchPreference = new SettingsMainSwitchPreference(getPrefContext());
+        mToggleServiceSwitchPreference.setKey(KEY_USE_SERVICE_PREFERENCE);
         if (getArguments().containsKey(AccessibilitySettings.EXTRA_CHECKED)) {
             final boolean enabled = getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED);
-            mToggleServiceDividerSwitchPreference.setChecked(enabled);
+            mToggleServiceSwitchPreference.setChecked(enabled);
         }
 
-        getPreferenceScreen().addPreference(mToggleServiceDividerSwitchPreference);
+        getPreferenceScreen().addPreference(mToggleServiceSwitchPreference);
     }
 
     private void initGeneralCategory() {
@@ -566,19 +608,15 @@
 
         final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(context,
                 mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
-        int resId = R.string.accessibility_shortcut_edit_summary_software;
-        if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
-            resId = AccessibilityUtil.isTouchExploreEnabled(context)
-                    ? R.string.accessibility_shortcut_edit_dialog_title_software_gesture_talkback
-                    : R.string.accessibility_shortcut_edit_dialog_title_software_gesture;
-        }
-        final CharSequence softwareTitle = context.getText(resId);
 
-        List<CharSequence> list = new ArrayList<>();
-        if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
+        final List<CharSequence> list = new ArrayList<>();
+        final CharSequence softwareTitle = context.getText(
+                R.string.accessibility_shortcut_edit_summary_software);
+
+        if (hasShortcutType(shortcutTypes, UserShortcutType.SOFTWARE)) {
             list.add(softwareTitle);
         }
-        if ((shortcutTypes & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE) {
+        if (hasShortcutType(shortcutTypes, UserShortcutType.HARDWARE)) {
             final CharSequence hardwareTitle = context.getText(
                     R.string.accessibility_shortcut_hardware_keyword);
             list.add(hardwareTitle);
@@ -598,7 +636,7 @@
      * This method will be invoked when a button in the edit shortcut dialog is clicked.
      *
      * @param dialog The dialog that received the click
-     * @param which The button that was clicked
+     * @param which  The button that was clicked
      */
     protected void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
         if (mComponentName == null) {
@@ -676,7 +714,7 @@
     }
 
     /**
-     *  Setups a configurable default if the setting has never been set.
+     * Setups a configurable default if the setting has never been set.
      */
     private static void setupDefaultShortcutIfNecessary(Context context) {
         final String targetKey = Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;
diff --git a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
index ca19681..61459c4 100644
--- a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
@@ -29,13 +29,14 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceCategory;
 import androidx.preference.SwitchPreference;
 
 import com.android.internal.accessibility.AccessibilityShortcutController;
 import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.SeekBarPreference;
+import com.android.settings.widget.SettingsMainSwitchPreference;
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
@@ -44,6 +45,7 @@
 /** Settings for reducing brightness. */
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class ToggleReduceBrightColorsPreferenceFragment extends ToggleFeaturePreferenceFragment {
+
     private static final String REDUCE_BRIGHT_COLORS_ACTIVATED_KEY =
             Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED;
     private static final String KEY_INTENSITY = "rbc_intensity";
@@ -73,42 +75,32 @@
         mSettingsContentObserver = new SettingsContentObserver(mHandler, enableServiceFeatureKeys) {
             @Override
             public void onChange(boolean selfChange, Uri uri) {
-                    updateSwitchBarToggleSwitch();
+                updateSwitchBarToggleSwitch();
             }
         };
 
-        return super.onCreateView(inflater, container, savedInstanceState);
+        final View view = super.onCreateView(inflater, container, savedInstanceState);
+        // Parent sets the title when creating the view, so set it after calling super
+        mToggleServiceSwitchPreference.setTitle(R.string.reduce_bright_colors_switch_title);
+        updateGeneralCategoryOrder();
+        return view;
+    }
+
+    private void updateGeneralCategoryOrder() {
+        final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
+        final SeekBarPreference intensity = findPreference(KEY_INTENSITY);
+        getPreferenceScreen().removePreference(intensity);
+        intensity.setOrder(mShortcutPreference.getOrder() - 2);
+        generalCategory.addPreference(intensity);
+        final SwitchPreference persist = findPreference(KEY_PERSIST);
+        getPreferenceScreen().removePreference(persist);
+        persist.setOrder(mShortcutPreference.getOrder() - 1);
+        generalCategory.addPreference(persist);
     }
 
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        updatePreferenceOrder();
-    }
-
-    /** Customizes the order by preference key. */
-    private List<String> getPreferenceOrderList() {
-        final List<String> lists = new ArrayList<>();
-        lists.add(KEY_USE_SERVICE_PREFERENCE);
-        lists.add(KEY_INTENSITY);
-        lists.add(KEY_GENERAL_CATEGORY);
-        lists.add(KEY_PERSIST);
-        lists.add(KEY_INTRODUCTION_CATEGORY);
-        return lists;
-    }
-
-    private void updatePreferenceOrder() {
-        final List<String> lists = getPreferenceOrderList();
-        final PreferenceScreen preferenceScreen = getPreferenceScreen();
-        preferenceScreen.setOrderingAsAdded(false);
-
-        final int size = lists.size();
-        for (int i = 0; i < size; i++) {
-            final Preference preference = preferenceScreen.findPreference(lists.get(i));
-            if (preference != null) {
-                preference.setOrder(i);
-            }
-        }
     }
 
     @Override
@@ -151,41 +143,31 @@
     @Override
     protected void onRemoveSwitchPreferenceToggleSwitch() {
         super.onRemoveSwitchPreferenceToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener(
+        mToggleServiceSwitchPreference.setOnPreferenceClickListener(
                 /* onPreferenceClickListener= */ null);
     }
 
     @Override
-    protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
+    protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {
         switchPreference.setTitle(R.string.reduce_bright_colors_preference_title);
     }
 
     @Override
-    protected void onInstallSwitchPreferenceToggleSwitch() {
-        super.onInstallSwitchPreferenceToggleSwitch();
-        updateSwitchBarToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener((preference) -> {
-            boolean checked = ((SwitchPreference) preference).isChecked();
-            onPreferenceToggled(mPreferenceKey, checked);
-            return false;
-        });
-    }
-
-    @Override
     int getUserShortcutTypes() {
         return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
                 mComponentName);
     }
 
-    private void updateSwitchBarToggleSwitch() {
+    @Override
+    protected void updateSwitchBarToggleSwitch() {
         final boolean checked = Settings.Secure.getInt(getContentResolver(),
                 REDUCE_BRIGHT_COLORS_ACTIVATED_KEY, OFF) == ON;
         mRbcIntensityPreferenceController.updateState(getPreferenceScreen()
                 .findPreference(KEY_INTENSITY));
         mRbcPersistencePreferenceController.updateState(getPreferenceScreen()
                 .findPreference(KEY_PERSIST));
-        if (mToggleServiceDividerSwitchPreference.isChecked() != checked) {
-            mToggleServiceDividerSwitchPreference.setChecked(checked);
+        if (mToggleServiceSwitchPreference.isChecked() != checked) {
+            mToggleServiceSwitchPreference.setChecked(checked);
         }
     }
 
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index 8e14e5a..738d284 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -128,8 +128,15 @@
 
     @Override
     protected void initSettingsPreference() {
+        // If the device doesn't support magnification area, it should hide the settings preference.
+        if (!getContext().getResources().getBoolean(
+                com.android.internal.R.bool.config_magnification_area)) {
+            return;
+        }
         mSettingsPreference = new Preference(getPrefContext());
         mSettingsPreference.setTitle(R.string.accessibility_menu_item_settings);
+        // TODO(b/177371954): "magnification area" should be brought up to the highest level of the
+        // settings UI so that it appears below "shortcut" to replace "settings.
         mSettingsPreference.setFragment(MagnificationSettingsFragment.class.getName());
         mSettingsPreference.setPersistent(false);
 
@@ -219,27 +226,23 @@
             return context.getText(R.string.switch_off_text);
         }
 
-        final int shortcutType = PreferredShortcuts.retrieveUserShortcutType(context,
+        final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(context,
                 MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
-        int resId = R.string.accessibility_shortcut_edit_summary_software;
-        if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
-            resId = AccessibilityUtil.isTouchExploreEnabled(context)
-                    ? R.string.accessibility_shortcut_edit_dialog_title_software_gesture_talkback
-                    : R.string.accessibility_shortcut_edit_dialog_title_software_gesture;
-        }
-        final CharSequence softwareTitle = context.getText(resId);
 
-        List<CharSequence> list = new ArrayList<>();
-        if ((shortcutType & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
+        final List<CharSequence> list = new ArrayList<>();
+        final CharSequence softwareTitle = context.getText(
+                R.string.accessibility_shortcut_edit_summary_software);
+
+        if (hasShortcutType(shortcutTypes, UserShortcutType.SOFTWARE)) {
             list.add(softwareTitle);
         }
-        if ((shortcutType & UserShortcutType.HARDWARE) == UserShortcutType.HARDWARE) {
+        if (hasShortcutType(shortcutTypes, UserShortcutType.HARDWARE)) {
             final CharSequence hardwareTitle = context.getText(
                     R.string.accessibility_shortcut_hardware_keyword);
             list.add(hardwareTitle);
         }
 
-        if ((shortcutType & UserShortcutType.TRIPLETAP) == UserShortcutType.TRIPLETAP) {
+        if (hasShortcutType(shortcutTypes, UserShortcutType.TRIPLETAP)) {
             final CharSequence tripleTapTitle = context.getText(
                     R.string.accessibility_shortcut_triple_tap_keyword);
             list.add(tripleTapTitle);
@@ -304,8 +307,7 @@
 
     @Override
     protected void onInstallSwitchPreferenceToggleSwitch() {
-        super.onInstallSwitchPreferenceToggleSwitch();
-        mToggleServiceDividerSwitchPreference.setVisible(false);
+        mToggleServiceSwitchPreference.setVisible(false);
     }
 
     @Override
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
index bea528a..86ead5c 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
@@ -33,12 +33,12 @@
         // Log the final choice in value if it's different from the previous value.
         Bundle args = getArguments();
         if ((args != null) && args.containsKey(AccessibilitySettings.EXTRA_CHECKED)) {
-            if (mToggleServiceDividerSwitchPreference.isChecked() != args.getBoolean(
+            if (mToggleServiceSwitchPreference.isChecked() != args.getBoolean(
                     AccessibilitySettings.EXTRA_CHECKED)) {
                 // TODO: Distinguish between magnification modes
                 mMetricsFeatureProvider.action(getContext(),
                         SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION,
-                        mToggleServiceDividerSwitchPreference.isChecked());
+                        mToggleServiceSwitchPreference.isChecked());
             }
         }
         super.onStop();
diff --git a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
index 4d7b653..c0d54e8 100644
--- a/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleScreenReaderPreferenceFragmentForSetupWizard.java
@@ -28,7 +28,7 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mToggleSwitchWasInitiallyChecked = mToggleServiceDividerSwitchPreference.isChecked();
+        mToggleSwitchWasInitiallyChecked = mToggleServiceSwitchPreference.isChecked();
     }
 
     @Override
@@ -39,10 +39,10 @@
     @Override
     public void onStop() {
         // Log the final choice in value if it's different from the previous value.
-        if (mToggleServiceDividerSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
+        if (mToggleServiceSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
             mMetricsFeatureProvider.action(getContext(),
                     SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER,
-                    mToggleServiceDividerSwitchPreference.isChecked());
+                    mToggleServiceSwitchPreference.isChecked());
         }
         super.onStop();
     }
diff --git a/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
index 87b8469..4334cd0 100644
--- a/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
@@ -28,7 +28,7 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mToggleSwitchWasInitiallyChecked = mToggleServiceDividerSwitchPreference.isChecked();
+        mToggleSwitchWasInitiallyChecked = mToggleServiceSwitchPreference.isChecked();
     }
 
     @Override
@@ -39,10 +39,10 @@
     @Override
     public void onStop() {
         // Log the final choice in value if it's different from the previous value.
-        if (mToggleServiceDividerSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
+        if (mToggleServiceSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
             mMetricsFeatureProvider.action(getContext(),
                     SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SELECT_TO_SPEAK,
-                    mToggleServiceDividerSwitchPreference.isChecked());
+                    mToggleServiceSwitchPreference.isChecked());
         }
 
         super.onStop();
diff --git a/src/com/android/settings/accessibility/VolumeShortcutToggleScreenReaderPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/VolumeShortcutToggleScreenReaderPreferenceFragmentForSetupWizard.java
index 6e4a233..4337177 100644
--- a/src/com/android/settings/accessibility/VolumeShortcutToggleScreenReaderPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/VolumeShortcutToggleScreenReaderPreferenceFragmentForSetupWizard.java
@@ -29,7 +29,7 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mToggleSwitchWasInitiallyChecked = mToggleServiceDividerSwitchPreference.isChecked();
+        mToggleSwitchWasInitiallyChecked = mToggleServiceSwitchPreference.isChecked();
     }
 
     @Override
@@ -40,10 +40,10 @@
     @Override
     public void onStop() {
         // Log the final choice in value if it's different from the previous value.
-        if (mToggleServiceDividerSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
+        if (mToggleServiceSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
             mMetricsFeatureProvider.action(getContext(),
                     SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SCREEN_READER,
-                    mToggleServiceDividerSwitchPreference.isChecked());
+                    mToggleServiceSwitchPreference.isChecked());
         }
 
         super.onStop();
diff --git a/src/com/android/settings/accessibility/VolumeShortcutToggleSelectToSpeakPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/VolumeShortcutToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
index 3dd648c..acdfdc9 100644
--- a/src/com/android/settings/accessibility/VolumeShortcutToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/VolumeShortcutToggleSelectToSpeakPreferenceFragmentForSetupWizard.java
@@ -29,7 +29,7 @@
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        mToggleSwitchWasInitiallyChecked = mToggleServiceDividerSwitchPreference.isChecked();
+        mToggleSwitchWasInitiallyChecked = mToggleServiceSwitchPreference.isChecked();
     }
 
     @Override
@@ -40,10 +40,10 @@
     @Override
     public void onStop() {
         // Log the final choice in value if it's different from the previous value.
-        if (mToggleServiceDividerSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
+        if (mToggleServiceSwitchPreference.isChecked() != mToggleSwitchWasInitiallyChecked) {
             mMetricsFeatureProvider.action(getContext(),
                     SettingsEnums.SUW_ACCESSIBILITY_TOGGLE_SELECT_TO_SPEAK,
-                    mToggleServiceDividerSwitchPreference.isChecked());
+                    mToggleServiceSwitchPreference.isChecked());
         }
 
         super.onStop();
diff --git a/src/com/android/settings/applications/AppDashboardFragment.java b/src/com/android/settings/applications/AppDashboardFragment.java
index fc4bcd0..3b1a977 100644
--- a/src/com/android/settings/applications/AppDashboardFragment.java
+++ b/src/com/android/settings/applications/AppDashboardFragment.java
@@ -48,7 +48,7 @@
 
     @Override
     public int getMetricsCategory() {
-        return SettingsEnums.SETTINGS_APP_NOTIF_CATEGORY;
+        return SettingsEnums.MANAGE_APPLICATIONS;
     }
 
     @Override
diff --git a/src/com/android/settings/applications/AppStateAlarmsAndRemindersBridge.java b/src/com/android/settings/applications/AppStateAlarmsAndRemindersBridge.java
new file mode 100644
index 0000000..ccfc87e
--- /dev/null
+++ b/src/com/android/settings/applications/AppStateAlarmsAndRemindersBridge.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.Manifest;
+import android.app.AppOpsManager;
+import android.content.Context;
+
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.ApplicationsState.AppFilter;
+
+import java.util.List;
+
+/**
+ * Connects app op info to the ApplicationsState. Extends {@link AppStateAppOpsBridge} to tailor
+ * to the semantics of {@link Manifest.permission#SCHEDULE_EXACT_ALARM}.
+ * Also provides app filters that can use the info.
+ */
+public class AppStateAlarmsAndRemindersBridge extends AppStateAppOpsBridge {
+
+    private AppOpsManager mAppOpsManager;
+
+    public AppStateAlarmsAndRemindersBridge(Context context, ApplicationsState appState,
+            Callback callback) {
+        super(context, appState, callback,
+                AppOpsManager.strOpToOp(AppOpsManager.OPSTR_SCHEDULE_EXACT_ALARM),
+                new String[]{Manifest.permission.SCHEDULE_EXACT_ALARM});
+
+        mAppOpsManager = context.getSystemService(AppOpsManager.class);
+    }
+
+    /**
+     * Returns information regarding {@link Manifest.permission#SCHEDULE_EXACT_ALARM} for the given
+     * package and uid.
+     */
+    public PermissionState createPermissionState(String packageName, int uid) {
+        final PermissionState permState = getPermissionInfo(packageName, uid);
+        permState.appOpMode = mAppOpsManager.unsafeCheckOpRawNoThrow(
+                AppOpsManager.OPSTR_SCHEDULE_EXACT_ALARM, uid, packageName);
+        return permState;
+    }
+
+    @Override
+    protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
+        app.extraInfo = createPermissionState(pkg, uid);
+    }
+
+    @Override
+    protected void loadAllExtraInfo() {
+        final List<AppEntry> allApps = mAppSession.getAllApps();
+        for (int i = 0; i < allApps.size(); i++) {
+            final AppEntry currentEntry = allApps.get(i);
+            updateExtraInfo(currentEntry, currentEntry.info.packageName, currentEntry.info.uid);
+        }
+    }
+
+    public static final AppFilter FILTER_CLOCK_APPS = new AppFilter() {
+
+        @Override
+        public void init() {
+        }
+
+        @Override
+        public boolean filterApp(AppEntry info) {
+            if (info.extraInfo instanceof PermissionState) {
+                final PermissionState permissionState = (PermissionState) info.extraInfo;
+                return permissionState.permissionDeclared;
+            }
+            return false;
+        }
+    };
+
+}
diff --git a/src/com/android/settings/applications/AppStateAppOpsBridge.java b/src/com/android/settings/applications/AppStateAppOpsBridge.java
index b4f6e48..2ccdc78 100755
--- a/src/com/android/settings/applications/AppStateAppOpsBridge.java
+++ b/src/com/android/settings/applications/AppStateAppOpsBridge.java
@@ -277,7 +277,7 @@
             if (pe == null) {
                 Log.w(TAG, "AppOp permission exists for package " + packageOp.getPackageName()
                         + " of user " + userId + " but package doesn't exist or did not request "
-                        + mPermissions + " access");
+                        + Arrays.toString(mPermissions) + " access");
                 continue;
             }
 
diff --git a/src/com/android/settings/applications/AppStateMediaManagementAppsBridge.java b/src/com/android/settings/applications/AppStateMediaManagementAppsBridge.java
new file mode 100644
index 0000000..ff2b4d8
--- /dev/null
+++ b/src/com/android/settings/applications/AppStateMediaManagementAppsBridge.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.Manifest;
+import android.app.AppOpsManager;
+import android.content.Context;
+
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+import com.android.settingslib.applications.ApplicationsState.AppFilter;
+
+import java.util.List;
+
+/**
+ * Retrieves information from {@link AppOpsManager} and {@link android.content.pm.PackageManager}
+ * regarding {@link AppOpsManager#OP_MANAGE_MEDIA} and
+ * {@link Manifest.permission#MANAGE_MEDIA}.
+ */
+public class AppStateMediaManagementAppsBridge extends AppStateAppOpsBridge {
+
+    private final AppOpsManager mAppOpsManager;
+
+    public AppStateMediaManagementAppsBridge(Context context, ApplicationsState appState,
+            Callback callback) {
+        super(context, appState, callback,
+                AppOpsManager.strOpToOp(AppOpsManager.OPSTR_MANAGE_MEDIA),
+                new String[]{Manifest.permission.MANAGE_MEDIA});
+
+        mAppOpsManager = context.getSystemService(AppOpsManager.class);
+    }
+
+    @Override
+    protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
+        app.extraInfo = createPermissionState(pkg, uid);
+    }
+
+    @Override
+    protected void loadAllExtraInfo() {
+        super.loadAllExtraInfo();
+        final List<AppEntry> allApps = mAppSession.getAllApps();
+        final int appCount = allApps.size();
+        for (int i = 0; i < appCount; i++) {
+            final AppEntry appEntry = allApps.get(i);
+            if (appEntry.extraInfo instanceof PermissionState) {
+                updateExtraInfo(appEntry, appEntry.info.packageName, appEntry.info.uid);
+            }
+        }
+    }
+
+    /**
+     * Returns information regarding {@link Manifest.permission#MANAGE_MEDIA} for the given
+     * package and uid.
+     */
+    public PermissionState createPermissionState(String packageName, int uid) {
+        final PermissionState permissionState = getPermissionInfo(packageName, uid);
+        permissionState.appOpMode = mAppOpsManager.unsafeCheckOpNoThrow(
+                AppOpsManager.OPSTR_MANAGE_MEDIA, uid, packageName);
+        return permissionState;
+    }
+
+    /**
+     * Used by {@link com.android.settings.applications.manageapplications.AppFilterRegistry} to
+     * determine which apps get to appear on the Special App Access list.
+     */
+    public static final AppFilter FILTER_MEDIA_MANAGEMENT_APPS = new AppFilter() {
+        @Override
+        public void init() {
+        }
+
+        @Override
+        public boolean filterApp(AppEntry info) {
+            return info.extraInfo != null;
+        }
+    };
+}
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index 52b1a8d..5b74a88 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -180,6 +180,9 @@
         // Keep Package Installer enabled.
         keepEnabledPackages.add(mContext.getString(R.string.config_package_installer_package_name));
 
+        if (mPm.getWellbeingPackageName() != null) {
+            keepEnabledPackages.add(mPm.getWellbeingPackageName());
+        }
         return keepEnabledPackages;
     }
 
diff --git a/src/com/android/settings/applications/HibernatedAppsPreferenceController.java b/src/com/android/settings/applications/HibernatedAppsPreferenceController.java
new file mode 100644
index 0000000..40cbb2e
--- /dev/null
+++ b/src/com/android/settings/applications/HibernatedAppsPreferenceController.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import static android.provider.DeviceConfig.NAMESPACE_APP_HIBERNATION;
+
+import static com.android.settings.Utils.PROPERTY_APP_HIBERNATION_ENABLED;
+
+import android.content.Context;
+import android.provider.DeviceConfig;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * A preference controller handling the logic for updating summary of hibernated apps.
+ * TODO(b/181172051): add intent to launch Auto Revoke UI in app_and_notification.xml
+ */
+public final class HibernatedAppsPreferenceController extends BasePreferenceController {
+    private static final String TAG = "HibernatedAppsPrefController";
+
+    public HibernatedAppsPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return isHibernationEnabled() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        final int numHibernated = getNumHibernated();
+        return mContext.getResources().getQuantityString(
+                R.plurals.unused_apps_summary, numHibernated, numHibernated);
+    }
+
+    private int getNumHibernated() {
+        //TODO(b/181172051): hook into hibernation service to get the number of hibernated apps.
+        return 0;
+    }
+
+    private static boolean isHibernationEnabled() {
+        return DeviceConfig.getBoolean(
+                NAMESPACE_APP_HIBERNATION, PROPERTY_APP_HIBERNATION_ENABLED, false);
+    }
+}
diff --git a/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetails.java b/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetails.java
new file mode 100644
index 0000000..95835cb
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetails.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.applications.appinfo;
+
+import static android.app.Activity.RESULT_CANCELED;
+import static android.app.Activity.RESULT_OK;
+
+import android.app.AppOpsManager;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+
+import com.android.settings.R;
+import com.android.settings.Settings;
+import com.android.settings.applications.AppInfoWithHeader;
+import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
+import com.android.settings.applications.AppStateAppOpsBridge;
+import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+
+/**
+ * App specific activity to show details about
+ * {@link android.Manifest.permission#SCHEDULE_EXACT_ALARM}.
+ */
+public class AlarmsAndRemindersDetails extends AppInfoWithHeader
+        implements OnPreferenceChangeListener {
+
+    private static final String KEY_SWITCH = "alarms_and_reminders_switch";
+
+    private AppStateAlarmsAndRemindersBridge mAppBridge;
+    private AppOpsManager mAppOpsManager;
+    private RestrictedSwitchPreference mSwitchPref;
+    private AppStateAppOpsBridge.PermissionState mPermissionState;
+
+    /**
+     * Returns the string that states whether the app has access to
+     * {@link android.Manifest.permission#SCHEDULE_EXACT_ALARM}.
+     */
+    public static int getSummary(Context context, AppEntry entry) {
+        final AppStateAppOpsBridge.PermissionState state;
+        if (entry.extraInfo instanceof AppStateAppOpsBridge.PermissionState) {
+            state = (AppStateAppOpsBridge.PermissionState) entry.extraInfo;
+        } else {
+            state = new AppStateAlarmsAndRemindersBridge(context, /*appState=*/null,
+                    /*callback=*/null).createPermissionState(entry.info.packageName,
+                    entry.info.uid);
+        }
+
+        return state.isPermissible() ? R.string.app_permission_summary_allowed
+                : R.string.app_permission_summary_not_allowed;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final Context context = getActivity();
+        mAppBridge = new AppStateAlarmsAndRemindersBridge(context, mState, /*callback=*/null);
+        mAppOpsManager = context.getSystemService(AppOpsManager.class);
+
+        addPreferencesFromResource(R.xml.alarms_and_reminders);
+        mSwitchPref = findPreference(KEY_SWITCH);
+        mSwitchPref.setOnPreferenceChangeListener(this);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean checked = (Boolean) newValue;
+        if (preference == mSwitchPref) {
+            if (mPermissionState != null && checked != mPermissionState.isPermissible()) {
+                if (Settings.AlarmsAndRemindersAppActivity.class.getName().equals(
+                        getIntent().getComponent().getClassName())) {
+                    setResult(checked ? RESULT_OK : RESULT_CANCELED);
+                }
+                setCanScheduleAlarms(checked);
+                logPermissionChange(checked, mPackageName);
+                refreshUi();
+            }
+            return true;
+        }
+        return false;
+    }
+
+    private void setCanScheduleAlarms(boolean newState) {
+        mAppOpsManager.setUidMode(AppOpsManager.OPSTR_SCHEDULE_EXACT_ALARM,
+                mPackageInfo.applicationInfo.uid,
+                newState ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);
+    }
+
+    private void logPermissionChange(boolean newState, String packageName) {
+        mMetricsFeatureProvider.action(
+                mMetricsFeatureProvider.getAttribution(getActivity()),
+                SettingsEnums.ACTION_ALARMS_AND_REMINDERS_TOGGLE,
+                getMetricsCategory(),
+                packageName,
+                newState ? 1 : 0);
+    }
+
+    @Override
+    protected boolean refreshUi() {
+        if (mPackageInfo == null || mPackageInfo.applicationInfo == null) {
+            return false;
+        }
+        mPermissionState = mAppBridge.createPermissionState(mPackageName,
+                mPackageInfo.applicationInfo.uid);
+        mSwitchPref.setEnabled(mPermissionState.permissionDeclared);
+        mSwitchPref.setChecked(mPermissionState.isPermissible());
+        return true;
+    }
+
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        return null;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.ALARMS_AND_REMINDERS;
+    }
+}
diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
index 83b4241..6d515a3 100644
--- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
-import android.os.BatteryStats;
 import android.os.BatteryUsageStats;
 import android.os.Bundle;
 import android.os.UidBatteryConsumer;
@@ -31,14 +30,11 @@
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;
 import com.android.settings.fuelgauge.BatteryEntry;
-import com.android.settings.fuelgauge.BatteryStatsHelperLoader;
 import com.android.settings.fuelgauge.BatteryUsageStatsLoader;
 import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -46,7 +42,6 @@
 import com.android.settingslib.core.lifecycle.events.OnPause;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class AppBatteryPreferenceController extends BasePreferenceController
@@ -54,22 +49,11 @@
 
     private static final String KEY_BATTERY = "battery";
 
-    // TODO(b/180630447): switch to BatteryUsageStatsLoader and remove all references to
-    // BatteryStatsHelper and BatterySipper
-    @VisibleForTesting
-    final BatteryStatsHelperLoaderCallbacks mBatteryStatsHelperLoaderCallbacks =
-            new BatteryStatsHelperLoaderCallbacks();
     @VisibleForTesting
     final BatteryUsageStatsLoaderCallbacks mBatteryUsageStatsLoaderCallbacks =
             new BatteryUsageStatsLoaderCallbacks();
-
-    @VisibleForTesting
-    BatterySipper mSipper;
-    @VisibleForTesting
-    BatteryStatsHelper mBatteryHelper;
     @VisibleForTesting
     BatteryUtils mBatteryUtils;
-
     @VisibleForTesting
     BatteryUsageStats mBatteryUsageStats;
     @VisibleForTesting
@@ -113,11 +97,10 @@
         if (isBatteryStatsAvailable()) {
             final UserManager userManager =
                     (UserManager) mContext.getSystemService(Context.USER_SERVICE);
-            final BatteryEntry entry = new BatteryEntry(mContext, null, userManager, mSipper,
-                    mUidBatteryConsumer);
-            entry.defaultPackageName = mPackageName;
+            final BatteryEntry entry = new BatteryEntry(mContext, /* handler */null, userManager,
+                    mUidBatteryConsumer, /* isHidden */ false, /* packages */ null, mPackageName);
             AdvancedPowerUsageDetail.startBatteryDetailPage(mParent.getActivity(), mParent,
-                    mBatteryHelper, BatteryStats.STATS_SINCE_CHARGED, entry, mBatteryPercent);
+                    entry, mBatteryPercent);
         } else {
             AdvancedPowerUsageDetail.startBatteryDetailPage(mParent.getActivity(), mParent,
                     mPackageName);
@@ -128,29 +111,23 @@
     @Override
     public void onResume() {
         mParent.getLoaderManager().restartLoader(
-                AppInfoDashboardFragment.LOADER_BATTERY, Bundle.EMPTY,
-                mBatteryStatsHelperLoaderCallbacks);
-        mParent.getLoaderManager().restartLoader(
                 AppInfoDashboardFragment.LOADER_BATTERY_USAGE_STATS, Bundle.EMPTY,
                 mBatteryUsageStatsLoaderCallbacks);
     }
 
     @Override
     public void onPause() {
-        mParent.getLoaderManager().destroyLoader(AppInfoDashboardFragment.LOADER_BATTERY);
         mParent.getLoaderManager().destroyLoader(
                 AppInfoDashboardFragment.LOADER_BATTERY_USAGE_STATS);
     }
 
     private void onLoadFinished() {
-        // Wait for both loaders to finish before proceeding.
-        if (mBatteryHelper == null || mBatteryUsageStats == null) {
+        if (mBatteryUsageStats == null) {
             return;
         }
 
         final PackageInfo packageInfo = mParent.getPackageInfo();
         if (packageInfo != null) {
-            mSipper = findTargetSipper(mBatteryHelper, packageInfo.applicationInfo.uid);
             mUidBatteryConsumer = findTargetUidBatteryConsumer(mBatteryUsageStats,
                     packageInfo.applicationInfo.uid);
             if (mParent.getActivity() != null) {
@@ -163,13 +140,9 @@
     void updateBattery() {
         mPreference.setEnabled(true);
         if (isBatteryStatsAvailable()) {
-            final int dischargePercentage = mBatteryUsageStats.getDischargePercentage();
-
-            final List<BatterySipper> usageList = new ArrayList<>(mBatteryHelper.getUsageList());
-            final double hiddenAmount = mBatteryUtils.removeHiddenBatterySippers(usageList);
             final int percentOfMax = (int) mBatteryUtils.calculateBatteryPercent(
                     mUidBatteryConsumer.getConsumedPower(), mBatteryUsageStats.getConsumedPower(),
-                    hiddenAmount, dischargePercentage);
+                    mBatteryUsageStats.getDischargePercentage());
             mBatteryPercent = Utils.formatPercentage(percentOfMax);
             mPreference.setSummary(mContext.getString(R.string.battery_summary, mBatteryPercent));
         } else {
@@ -179,19 +152,7 @@
 
     @VisibleForTesting
     boolean isBatteryStatsAvailable() {
-        return mBatteryHelper != null && mSipper != null && mUidBatteryConsumer != null;
-    }
-
-    @VisibleForTesting
-    BatterySipper findTargetSipper(BatteryStatsHelper batteryHelper, int uid) {
-        final List<BatterySipper> usageList = batteryHelper.getUsageList();
-        for (int i = 0, size = usageList.size(); i < size; i++) {
-            final BatterySipper sipper = usageList.get(i);
-            if (sipper.getUid() == uid) {
-                return sipper;
-            }
-        }
-        return null;
+        return mUidBatteryConsumer != null;
     }
 
     @VisibleForTesting
@@ -206,31 +167,12 @@
         return null;
     }
 
-    private class BatteryStatsHelperLoaderCallbacks
-            implements LoaderManager.LoaderCallbacks<BatteryStatsHelper> {
-        @Override
-        public Loader<BatteryStatsHelper> onCreateLoader(int id, Bundle args) {
-            return new BatteryStatsHelperLoader(mContext);
-        }
-
-        @Override
-        public void onLoadFinished(Loader<BatteryStatsHelper> loader,
-                BatteryStatsHelper batteryHelper) {
-            mBatteryHelper = batteryHelper;
-            AppBatteryPreferenceController.this.onLoadFinished();
-        }
-
-        @Override
-        public void onLoaderReset(Loader<BatteryStatsHelper> loader) {
-        }
-    }
-
     private class BatteryUsageStatsLoaderCallbacks
             implements LoaderManager.LoaderCallbacks<BatteryUsageStats> {
         @Override
         @NonNull
         public Loader<BatteryUsageStats> onCreateLoader(int id, Bundle args) {
-            return new BatteryUsageStatsLoader(mContext);
+            return new BatteryUsageStatsLoader(mContext, /* includeBatteryHistory */ false);
         }
 
         @Override
diff --git a/src/com/android/settings/applications/appinfo/AppHibernationPreferenceCategoryController.java b/src/com/android/settings/applications/appinfo/AppHibernationPreferenceCategoryController.java
new file mode 100644
index 0000000..ef89168
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/AppHibernationPreferenceCategoryController.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import android.content.Context;
+
+import com.android.settings.widget.PreferenceCategoryController;
+
+/**
+ * A preference category controller serves as the parent for app hibernation related preference.
+ */
+public final class AppHibernationPreferenceCategoryController extends PreferenceCategoryController {
+    public AppHibernationPreferenceCategoryController(Context context, String key) {
+        super(context, key);
+    }
+}
diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
index 6a86c71c..6a5c5df 100755
--- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
+++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
@@ -166,6 +166,16 @@
         use(AppStoragePreferenceController.class).setParentFragment(this);
         use(AppVersionPreferenceController.class).setParentFragment(this);
         use(InstantAppDomainsPreferenceController.class).setParentFragment(this);
+        if (FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME)) {
+            use(ExtraAppInfoPreferenceController.class).setPackageName(packageName);
+        }
+
+        final HibernationSwitchPreferenceController appHibernationSettings =
+                use(HibernationSwitchPreferenceController.class);
+        appHibernationSettings.setParentFragment(this);
+        appHibernationSettings.setPackage(packageName);
+        use(AppHibernationPreferenceCategoryController.class).setChildren(
+                Arrays.asList(appHibernationSettings));
 
         final WriteSystemSettingsPreferenceController writeSystemSettings =
                 use(WriteSystemSettingsPreferenceController.class);
diff --git a/src/com/android/settings/applications/appinfo/AppVersionPreferenceController.java b/src/com/android/settings/applications/appinfo/AppVersionPreferenceController.java
index 205b6d2..23dd960 100644
--- a/src/com/android/settings/applications/appinfo/AppVersionPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppVersionPreferenceController.java
@@ -17,6 +17,7 @@
 package com.android.settings.applications.appinfo;
 
 import android.content.Context;
+import android.content.pm.PackageInfo;
 import android.text.BidiFormatter;
 
 import com.android.settings.R;
@@ -29,7 +30,13 @@
 
     @Override
     public CharSequence getSummary() {
+        // TODO(b/168333280): Review the null case in detail since this is just a quick
+        // workaround to fix NPE.
+        final PackageInfo packageInfo = mParent.getPackageInfo();
+        if (packageInfo == null) {
+            return null;
+        }
         return mContext.getString(R.string.version_text,
-                BidiFormatter.getInstance().unicodeWrap(mParent.getPackageInfo().versionName));
+                BidiFormatter.getInstance().unicodeWrap(packageInfo.versionName));
     }
 }
diff --git a/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProvider.java b/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProvider.java
new file mode 100644
index 0000000..20938d1
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProvider.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import android.content.Context;
+
+/**
+ * Provider for Extra App Info related feature
+ */
+public interface ExtraAppInfoFeatureProvider {
+    /** Returns true if the feature is supported. */
+    boolean isSupported(Context context);
+
+    /**
+     * Launch ExtraAppInfoSettings
+     */
+    void launchExtraAppInfoSettings(Context context);
+
+    /**
+     * Sets the package name
+     */
+    void setPackageName(String packageName);
+}
diff --git a/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProviderImpl.java b/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProviderImpl.java
new file mode 100644
index 0000000..3e5ef78
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/ExtraAppInfoFeatureProviderImpl.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import android.content.Context;
+
+/**
+ * Provider for Extra App Info related feature
+ */
+public class ExtraAppInfoFeatureProviderImpl implements
+        ExtraAppInfoFeatureProvider {
+    @Override
+    public boolean isSupported(Context context) {
+        return false;
+    }
+
+    @Override
+    public void launchExtraAppInfoSettings(Context context) {
+        return;
+    }
+
+    @Override
+    public void setPackageName(String packageName) {
+        return;
+    }
+}
diff --git a/src/com/android/settings/applications/appinfo/ExtraAppInfoPreferenceController.java b/src/com/android/settings/applications/appinfo/ExtraAppInfoPreferenceController.java
new file mode 100644
index 0000000..0c1b3e3
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/ExtraAppInfoPreferenceController.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import androidx.preference.Preference;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+
+/** Contains logic that deals with showing extra app info in app settings. */
+public class ExtraAppInfoPreferenceController extends BasePreferenceController {
+
+    private final ExtraAppInfoFeatureProvider mExtraAppInfoFeatureProvider;
+
+    public ExtraAppInfoPreferenceController(Context context, String key) {
+        super(context, key);
+        mExtraAppInfoFeatureProvider =
+                FeatureFactory.getFactory(context).getExtraAppInfoFeatureProvider();
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mExtraAppInfoFeatureProvider.isSupported(mContext)
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (TextUtils.equals(getPreferenceKey(), preference.getKey())) {
+            mExtraAppInfoFeatureProvider.launchExtraAppInfoSettings(mContext);
+            return true;
+        }
+        return super.handlePreferenceTreeClick(preference);
+    }
+
+    /**
+     * Set the local package name
+     */
+    public void setPackageName(String packageName) {
+        if (mExtraAppInfoFeatureProvider != null) {
+            mExtraAppInfoFeatureProvider.setPackageName(packageName);
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/appinfo/HibernationSwitchPreferenceController.java b/src/com/android/settings/applications/appinfo/HibernationSwitchPreferenceController.java
new file mode 100644
index 0000000..8ab2c9d
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/HibernationSwitchPreferenceController.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import static android.app.AppOpsManager.MODE_ALLOWED;
+import static android.app.AppOpsManager.MODE_DEFAULT;
+import static android.app.AppOpsManager.MODE_IGNORED;
+import static android.app.AppOpsManager.OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED;
+import static android.provider.DeviceConfig.NAMESPACE_APP_HIBERNATION;
+
+import static com.android.settings.Utils.PROPERTY_APP_HIBERNATION_ENABLED;
+
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.provider.DeviceConfig;
+import android.text.TextUtils;
+import android.util.Slog;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+import com.google.common.annotations.VisibleForTesting;
+
+/**
+ * A PreferenceController handling the logic for exempting hibernation of app
+ */
+public final class HibernationSwitchPreferenceController extends AppInfoPreferenceControllerBase
+        implements LifecycleObserver, AppOpsManager.OnOpChangedListener,
+        Preference.OnPreferenceChangeListener {
+    private static final String TAG = "HibernationSwitchPrefController";
+    private String mPackageName;
+    private final AppOpsManager mAppOpsManager;
+    private int mPackageUid;
+    @VisibleForTesting
+    boolean mIsPackageSet;
+    private boolean mIsPackageExemptByDefault;
+
+    public HibernationSwitchPreferenceController(Context context,
+            String preferenceKey) {
+        super(context, preferenceKey);
+        mAppOpsManager = context.getSystemService(AppOpsManager.class);
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
+    public void onResume() {
+        if (mIsPackageSet) {
+            mAppOpsManager.startWatchingMode(
+                    OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED, mPackageName, this);
+        }
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+    public void onPause() {
+        mAppOpsManager.stopWatchingMode(this);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return isHibernationEnabled() && mIsPackageSet ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    /**
+     * Set the package. And also retrieve details from package manager. Some packages may be
+     * exempted from hibernation by default.
+     * @param packageName The name of the package whose hibernation state to be managed.
+     */
+    void setPackage(@NonNull String packageName) {
+        mPackageName = packageName;
+        final PackageManager packageManager = mContext.getPackageManager();
+
+        // Q- packages exempt by default, except R- on Auto since Auto-Revoke was skipped in R
+        final int maxTargetSdkVersionForExemptApps =
+                packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)
+                        ? android.os.Build.VERSION_CODES.R
+                        : android.os.Build.VERSION_CODES.Q;
+        try {
+            mPackageUid = packageManager.getPackageUidAsUser(
+                    packageName, mContext.getUserId());
+            mIsPackageExemptByDefault = packageManager.getTargetSdkVersion(packageName)
+                    <= maxTargetSdkVersionForExemptApps;
+            mIsPackageSet = true;
+        } catch (PackageManager.NameNotFoundException e) {
+            Slog.w(TAG, "Package [" + mPackageName + "] is not found!");
+            mIsPackageSet = false;
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        ((SwitchPreference) preference).setChecked(!isPackageHibernationExemptByUser());
+    }
+
+    @VisibleForTesting
+    boolean isPackageHibernationExemptByUser() {
+        if (!mIsPackageSet) return true;
+        final int mode = mAppOpsManager.unsafeCheckOpNoThrow(
+                OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED, mPackageUid, mPackageName);
+
+        return mode == MODE_DEFAULT ? mIsPackageExemptByDefault : mode != MODE_ALLOWED;
+    }
+
+    @Override
+    public void onOpChanged(String op, String packageName) {
+        if (OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED.equals(op)
+                && TextUtils.equals(mPackageName, packageName)) {
+            updateState(mPreference);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object isChecked) {
+        try {
+            mAppOpsManager.setUidMode(OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED, mPackageUid,
+                    (boolean) isChecked ? MODE_ALLOWED : MODE_IGNORED);
+        } catch (RuntimeException e) {
+            return false;
+        }
+        return true;
+    }
+
+    private static boolean isHibernationEnabled() {
+        return DeviceConfig.getBoolean(
+                NAMESPACE_APP_HIBERNATION, PROPERTY_APP_HIBERNATION_ENABLED, false);
+    }
+}
diff --git a/src/com/android/settings/applications/appinfo/MediaManagementAppsDetails.java b/src/com/android/settings/applications/appinfo/MediaManagementAppsDetails.java
new file mode 100644
index 0000000..f60fb4f
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/MediaManagementAppsDetails.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.applications.appinfo;
+
+import android.app.AppOpsManager;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.R;
+import com.android.settings.applications.AppInfoWithHeader;
+import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
+import com.android.settings.applications.AppStateMediaManagementAppsBridge;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+
+/**
+ * Class for displaying app info related to {@link AppOpsManager#OP_MANAGE_MEDIA}.
+ */
+public class MediaManagementAppsDetails extends AppInfoWithHeader implements
+        OnPreferenceChangeListener {
+
+    private static final String KEY_SWITCH_PREF = "media_management_apps_toggle";
+
+    private AppStateMediaManagementAppsBridge mAppBridge;
+    private AppOpsManager mAppOpsManager;
+    private SwitchPreference mSwitchPref;
+    private PermissionState mPermissionState;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final Context context = getActivity();
+        mAppBridge = new AppStateMediaManagementAppsBridge(context, mState, null /* callback */);
+        mAppOpsManager = context.getSystemService(AppOpsManager.class);
+
+        // initialize preferences
+        addPreferencesFromResource(R.xml.media_management_apps);
+        mSwitchPref = findPreference(KEY_SWITCH_PREF);
+
+        // install event listeners
+        mSwitchPref.setOnPreferenceChangeListener(this);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean value = (Boolean) newValue;
+        if (preference == mSwitchPref) {
+            if (mPermissionState != null && value != mPermissionState.isPermissible()) {
+                setCanManageMedia(value);
+                logPermissionChange(value, mPackageName);
+                refreshUi();
+            }
+            return true;
+        }
+        return false;
+    }
+
+    private void setCanManageMedia(boolean newState) {
+        mAppOpsManager.setUidMode(AppOpsManager.OP_MANAGE_MEDIA, mPackageInfo.applicationInfo.uid,
+                newState ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);
+    }
+
+    private void logPermissionChange(boolean newState, String packageName) {
+        mMetricsFeatureProvider.action(
+                mMetricsFeatureProvider.getAttribution(getActivity()),
+                SettingsEnums.ACTION_MEDIA_MANAGEMENT_APPS_TOGGLE,
+                getMetricsCategory(),
+                packageName,
+                newState ? 1 : 0);
+    }
+
+    @Override
+    protected boolean refreshUi() {
+        if (mPackageInfo == null || mPackageInfo.applicationInfo == null) {
+            return false;
+        }
+
+        mPermissionState = mAppBridge.createPermissionState(mPackageName,
+                mPackageInfo.applicationInfo.uid);
+        mSwitchPref.setEnabled(mPermissionState.permissionDeclared);
+        mSwitchPref.setChecked(mPermissionState.isPermissible());
+        return true;
+    }
+
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        return null;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.MEDIA_MANAGEMENT_APPS;
+    }
+
+    /**
+     * Returns the string that states whether the app has access to
+     * {@link android.Manifest.permission#MANAGE_MEDIA}.
+     */
+    public static int getSummary(Context context, AppEntry entry) {
+        final PermissionState state;
+        if (entry.extraInfo instanceof PermissionState) {
+            state = (PermissionState) entry.extraInfo;
+        } else {
+            state = new AppStateMediaManagementAppsBridge(context, null /* appState */,
+                    null /* callback */).createPermissionState(entry.info.packageName,
+                    entry.info.uid);
+        }
+
+        return state.isPermissible() ? R.string.app_permission_summary_allowed
+                : R.string.app_permission_summary_not_allowed;
+    }
+}
diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
index e5953db..d4ea4a9 100644
--- a/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
+++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPicker.java
@@ -24,7 +24,6 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 
-import com.android.internal.app.AssistUtils;
 import com.android.settings.R;
 import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
 import com.android.settingslib.applications.DefaultAppInfo;
@@ -35,8 +34,6 @@
 public class DefaultVoiceInputPicker extends DefaultAppPickerFragment {
 
     private VoiceInputHelper mHelper;
-    private AssistUtils mAssistUtils;
-    private String mAssistRestrict;
 
     @Override
     public int getMetricsCategory() {
@@ -46,13 +43,8 @@
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        mAssistUtils = new AssistUtils(context);
         mHelper = new VoiceInputHelper(context);
         mHelper.buildUi();
-        final ComponentName assist = getCurrentAssist();
-        if (isCurrentAssistVoiceService(assist, getCurrentService(mHelper))) {
-            mAssistRestrict = assist.flattenToShortString();
-        }
     }
 
     @Override
@@ -64,16 +56,9 @@
     protected List<VoiceInputDefaultAppInfo> getCandidates() {
         final List<VoiceInputDefaultAppInfo> candidates = new ArrayList<>();
         final Context context = getContext();
-        boolean hasEnabled = true;
-        for (VoiceInputHelper.InteractionInfo info : mHelper.mAvailableInteractionInfos) {
-            final boolean enabled = TextUtils.equals(info.key, mAssistRestrict);
-            hasEnabled |= enabled;
-            candidates.add(new VoiceInputDefaultAppInfo(context, mPm, mUserId, info, enabled));
-        }
 
-        final boolean assistIsService = !hasEnabled;
         for (VoiceInputHelper.RecognizerInfo info : mHelper.mAvailableRecognizerInfos) {
-            final boolean enabled = !assistIsService;
+            final boolean enabled = true;
             candidates.add(new VoiceInputDefaultAppInfo(context, mPm, mUserId, info, enabled));
         }
         return candidates;
@@ -90,24 +75,9 @@
 
     @Override
     protected boolean setDefaultKey(String value) {
-        for (VoiceInputHelper.InteractionInfo info : mHelper.mAvailableInteractionInfos) {
-            if (TextUtils.equals(value, info.key)) {
-                Settings.Secure.putString(getContext().getContentResolver(),
-                        Settings.Secure.VOICE_INTERACTION_SERVICE, value);
-                Settings.Secure.putString(getContext().getContentResolver(),
-                        Settings.Secure.VOICE_RECOGNITION_SERVICE,
-                        new ComponentName(info.service.packageName,
-                                info.serviceInfo.getRecognitionService())
-                                .flattenToShortString());
-                return true;
-            }
-        }
-
         for (VoiceInputHelper.RecognizerInfo info : mHelper.mAvailableRecognizerInfos) {
             if (TextUtils.equals(value, info.key)) {
                 Settings.Secure.putString(getContext().getContentResolver(),
-                        Settings.Secure.VOICE_INTERACTION_SERVICE, "");
-                Settings.Secure.putString(getContext().getContentResolver(),
                         Settings.Secure.VOICE_RECOGNITION_SERVICE, value);
                 return true;
             }
@@ -116,23 +86,7 @@
     }
 
     public static ComponentName getCurrentService(VoiceInputHelper helper) {
-        if (helper.mCurrentVoiceInteraction != null) {
-            return helper.mCurrentVoiceInteraction;
-        } else if (helper.mCurrentRecognizer != null) {
-            return helper.mCurrentRecognizer;
-        } else {
-            return null;
-        }
-    }
-
-    private ComponentName getCurrentAssist() {
-        return mAssistUtils.getAssistComponentForUser(mUserId);
-    }
-
-    public static boolean isCurrentAssistVoiceService(ComponentName currentAssist,
-            ComponentName currentVoiceService) {
-        return currentAssist == null && currentVoiceService == null ||
-                currentAssist != null && currentAssist.equals(currentVoiceService);
+        return helper.mCurrentRecognizer;
     }
 
     public static class VoiceInputDefaultAppInfo extends DefaultAppInfo {
@@ -152,11 +106,7 @@
 
         @Override
         public CharSequence loadLabel() {
-            if (mInfo instanceof VoiceInputHelper.InteractionInfo) {
-                return mInfo.appLabel;
-            } else {
-                return mInfo.label;
-            }
+            return mInfo.label;
         }
 
         public Intent getSettingIntent() {
diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
index e53334d..59f5731 100644
--- a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
+++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
@@ -26,7 +26,6 @@
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
-import com.android.internal.app.AssistUtils;
 import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
 import com.android.settingslib.applications.DefaultAppInfo;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -42,17 +41,13 @@
     private static final String KEY_VOICE_INPUT = "voice_input_settings";
 
     private VoiceInputHelper mHelper;
-    private AssistUtils mAssistUtils;
     private PreferenceScreen mScreen;
     private Preference mPreference;
-    private SettingObserver mSettingObserver;
     private Context mContext;
 
     public DefaultVoiceInputPreferenceController(Context context, Lifecycle lifecycle) {
         super(context);
         mContext = context;
-        mSettingObserver = new SettingObserver();
-        mAssistUtils = new AssistUtils(context);
         mHelper = new VoiceInputHelper(context);
         mHelper.buildUi();
         if (lifecycle != null) {
@@ -80,7 +75,6 @@
 
     @Override
     public void onResume() {
-        mSettingObserver.register(mContext.getContentResolver(), true);
         updatePreference();
     }
 
@@ -91,9 +85,7 @@
     }
 
     @Override
-    public void onPause() {
-        mSettingObserver.register(mContext.getContentResolver(), false);
-    }
+    public void onPause() {}
 
     @Override
     protected DefaultAppInfo getDefaultAppInfo() {
@@ -101,12 +93,6 @@
         if (defaultKey == null) {
             return null;
         }
-        for (VoiceInputHelper.InteractionInfo info : mHelper.mAvailableInteractionInfos) {
-            if (TextUtils.equals(defaultKey, info.key)) {
-                return new DefaultVoiceInputPicker.VoiceInputDefaultAppInfo(mContext,
-                        mPackageManager, mUserId, info, true /* enabled */);
-            }
-        }
 
         for (VoiceInputHelper.RecognizerInfo info : mHelper.mAvailableRecognizerInfos) {
             if (TextUtils.equals(defaultKey, info.key)) {
@@ -149,16 +135,4 @@
         }
         return currentService.flattenToShortString();
     }
-
-    class SettingObserver extends AssistSettingObserver {
-        @Override
-        protected List<Uri> getSettingUris() {
-            return null;
-        }
-
-        @Override
-        public void onSettingChange() {
-            updatePreference();
-        }
-    }
 }
diff --git a/src/com/android/settings/applications/assist/OWNERS b/src/com/android/settings/applications/assist/OWNERS
new file mode 100644
index 0000000..22e486d
--- /dev/null
+++ b/src/com/android/settings/applications/assist/OWNERS
@@ -0,0 +1,9 @@
+# Default reviewers for this and subdirectories.
+adamhe@google.com
+augale@google.com
+joannechung@google.com
+lpeter@google.com
+svetoslavganov@google.com
+tymtsai@google.com
+
+# Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/applications/assist/VoiceInputHelper.java b/src/com/android/settings/applications/assist/VoiceInputHelper.java
index 58c0d49..285f4f7 100644
--- a/src/com/android/settings/applications/assist/VoiceInputHelper.java
+++ b/src/com/android/settings/applications/assist/VoiceInputHelper.java
@@ -26,10 +26,7 @@
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
 import android.provider.Settings;
-import android.service.voice.VoiceInteractionService;
-import android.service.voice.VoiceInteractionServiceInfo;
 import android.speech.RecognitionService;
-import android.util.ArraySet;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Xml;
@@ -46,9 +43,9 @@
     static final String TAG = "VoiceInputHelper";
     final Context mContext;
 
-    final List<ResolveInfo> mAvailableVoiceInteractions;
     final List<ResolveInfo> mAvailableRecognition;
 
+    // TODO: Remove this superclass as we only have 1 class now (RecognizerInfo).
     static public class BaseInfo implements Comparable {
         public final ServiceInfo service;
         public final ComponentName componentName;
@@ -75,71 +72,33 @@
         }
     }
 
-    static public class InteractionInfo extends BaseInfo {
-        public final VoiceInteractionServiceInfo serviceInfo;
-
-        public InteractionInfo(PackageManager pm, VoiceInteractionServiceInfo _service) {
-            super(pm, _service.getServiceInfo(), _service.getSettingsActivity());
-            serviceInfo = _service;
-        }
-    }
-
     static public class RecognizerInfo extends BaseInfo {
-        public RecognizerInfo(PackageManager pm, ServiceInfo _service, String _settings) {
-            super(pm, _service, _settings);
+        public final boolean mSelectableAsDefault;
+
+        public RecognizerInfo(PackageManager pm,
+                ServiceInfo serviceInfo,
+                String settings,
+                boolean selectableAsDefault) {
+            super(pm, serviceInfo, settings);
+            this.mSelectableAsDefault = selectableAsDefault;
         }
     }
 
-    final ArrayList<InteractionInfo> mAvailableInteractionInfos = new ArrayList<>();
     final ArrayList<RecognizerInfo> mAvailableRecognizerInfos = new ArrayList<>();
 
-    ComponentName mCurrentVoiceInteraction;
     ComponentName mCurrentRecognizer;
 
     public VoiceInputHelper(Context context) {
         mContext = context;
 
-        mAvailableVoiceInteractions = mContext.getPackageManager().queryIntentServices(
-                new Intent(VoiceInteractionService.SERVICE_INTERFACE),
-                PackageManager.GET_META_DATA);
         mAvailableRecognition = mContext.getPackageManager().queryIntentServices(
                 new Intent(RecognitionService.SERVICE_INTERFACE),
                 PackageManager.GET_META_DATA);
     }
 
     public void buildUi() {
-        // Get the currently selected interactor from the secure setting.
-        String currentSetting = Settings.Secure.getString(
-                mContext.getContentResolver(), Settings.Secure.VOICE_INTERACTION_SERVICE);
-        if (currentSetting != null && !currentSetting.isEmpty()) {
-            mCurrentVoiceInteraction = ComponentName.unflattenFromString(currentSetting);
-        } else {
-            mCurrentVoiceInteraction = null;
-        }
-
-        ArraySet<ComponentName> interactorRecognizers = new ArraySet<>();
-
-        // Iterate through all the available interactors and load up their info to show
-        // in the preference.
-        int size = mAvailableVoiceInteractions.size();
-        for (int i = 0; i < size; i++) {
-            ResolveInfo resolveInfo = mAvailableVoiceInteractions.get(i);
-            VoiceInteractionServiceInfo info = new VoiceInteractionServiceInfo(
-                    mContext.getPackageManager(), resolveInfo.serviceInfo);
-            if (info.getParseError() != null) {
-                Log.w("VoiceInteractionService", "Error in VoiceInteractionService "
-                        + resolveInfo.serviceInfo.packageName + "/"
-                        + resolveInfo.serviceInfo.name + ": " + info.getParseError());
-                continue;
-            }
-            mAvailableInteractionInfos.add(new InteractionInfo(mContext.getPackageManager(), info));
-            interactorRecognizers.add(new ComponentName(resolveInfo.serviceInfo.packageName,
-                    info.getRecognitionService()));
-        }
-        Collections.sort(mAvailableInteractionInfos);
-
         // Get the currently selected recognizer from the secure setting.
-        currentSetting = Settings.Secure.getString(
+        String currentSetting = Settings.Secure.getString(
                 mContext.getContentResolver(), Settings.Secure.VOICE_RECOGNITION_SERVICE);
         if (currentSetting != null && !currentSetting.isEmpty()) {
             mCurrentRecognizer = ComponentName.unflattenFromString(currentSetting);
@@ -149,20 +108,17 @@
 
         // Iterate through all the available recognizers and load up their info to show
         // in the preference.
-        size = mAvailableRecognition.size();
+        int size = mAvailableRecognition.size();
         for (int i = 0; i < size; i++) {
             ResolveInfo resolveInfo = mAvailableRecognition.get(i);
             ComponentName comp = new ComponentName(resolveInfo.serviceInfo.packageName,
                     resolveInfo.serviceInfo.name);
-            if (interactorRecognizers.contains(comp)) {
-                //continue;
-            }
             ServiceInfo si = resolveInfo.serviceInfo;
-            XmlResourceParser parser = null;
             String settingsActivity = null;
-            try {
-                parser = si.loadXmlMetaData(mContext.getPackageManager(),
-                        RecognitionService.SERVICE_META_DATA);
+            // Always show in voice input settings unless specifically set to False.
+            boolean selectableAsDefault = true;
+            try (XmlResourceParser parser = si.loadXmlMetaData(mContext.getPackageManager(),
+                    RecognitionService.SERVICE_META_DATA)) {
                 if (parser == null) {
                     throw new XmlPullParserException("No " + RecognitionService.SERVICE_META_DATA +
                             " meta-data for " + si.packageName);
@@ -188,6 +144,9 @@
                         com.android.internal.R.styleable.RecognitionService);
                 settingsActivity = array.getString(
                         com.android.internal.R.styleable.RecognitionService_settingsActivity);
+                selectableAsDefault = array.getBoolean(
+                        com.android.internal.R.styleable.RecognitionService_selectableAsDefault,
+                        true);
                 array.recycle();
             } catch (XmlPullParserException e) {
                 Log.e(TAG, "error parsing recognition service meta-data", e);
@@ -195,11 +154,13 @@
                 Log.e(TAG, "error parsing recognition service meta-data", e);
             } catch (PackageManager.NameNotFoundException e) {
                 Log.e(TAG, "error parsing recognition service meta-data", e);
-            } finally {
-                if (parser != null) parser.close();
             }
-            mAvailableRecognizerInfos.add(new RecognizerInfo(mContext.getPackageManager(),
-                    resolveInfo.serviceInfo, settingsActivity));
+            // The current recognizer must always be shown in the settings, whatever its
+            // selectableAsDefault value is.
+            if (selectableAsDefault || comp.equals(mCurrentRecognizer)) {
+                mAvailableRecognizerInfos.add(new RecognizerInfo(mContext.getPackageManager(),
+                        resolveInfo.serviceInfo, settingsActivity, selectableAsDefault));
+            }
         }
         Collections.sort(mAvailableRecognizerInfos);
     }
diff --git a/src/com/android/settings/applications/autofill/OWNERS b/src/com/android/settings/applications/autofill/OWNERS
new file mode 100644
index 0000000..22e486d
--- /dev/null
+++ b/src/com/android/settings/applications/autofill/OWNERS
@@ -0,0 +1,9 @@
+# Default reviewers for this and subdirectories.
+adamhe@google.com
+augale@google.com
+joannechung@google.com
+lpeter@google.com
+svetoslavganov@google.com
+tymtsai@google.com
+
+# Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/applications/autofill/PasswordsPreferenceController.java b/src/com/android/settings/applications/autofill/PasswordsPreferenceController.java
new file mode 100644
index 0000000..f27530e
--- /dev/null
+++ b/src/com/android/settings/applications/autofill/PasswordsPreferenceController.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.autofill;
+
+import android.annotation.UserIdInt;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
+import android.graphics.drawable.Drawable;
+import android.os.UserHandle;
+import android.service.autofill.AutofillServiceInfo;
+import android.text.TextUtils;
+import android.util.IconDrawableFactory;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.Utils;
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.List;
+
+/**
+ * Queries available autofill services and adds preferences for those that declare passwords
+ * settings.
+ */
+public class PasswordsPreferenceController extends BasePreferenceController {
+
+    private final PackageManager mPm;
+    private final IconDrawableFactory mIconFactory;
+    private final List<AutofillServiceInfo> mServices;
+
+    public PasswordsPreferenceController(Context context, String preferenceKey) {
+        this(context, preferenceKey,
+                AutofillServiceInfo.getAvailableServices(context, UserHandle.myUserId()));
+    }
+
+    @VisibleForTesting
+    public PasswordsPreferenceController(
+            Context context, String preferenceKey, List<AutofillServiceInfo> availableServices) {
+        super(context, preferenceKey);
+        mPm = context.getPackageManager();
+        mIconFactory = IconDrawableFactory.newInstance(mContext);
+        for (int i = availableServices.size() - 1; i >= 0; i--) {
+            final String passwordsActivity = availableServices.get(i).getPasswordsActivity();
+            if (TextUtils.isEmpty(passwordsActivity)) {
+                availableServices.remove(i);
+            }
+        }
+        mServices = availableServices;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mServices.isEmpty() ? CONDITIONALLY_UNAVAILABLE : AVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final PreferenceGroup group = screen.findPreference(getPreferenceKey());
+        // TODO(b/169455298): Show work profile passwords too.
+        addPasswordPreferences(screen.getContext(), UserHandle.myUserId(), group);
+    }
+
+    private void addPasswordPreferences(
+            Context prefContext, @UserIdInt int user, PreferenceGroup group) {
+        for (int i = 0; i < mServices.size(); i++) {
+            final AutofillServiceInfo service = mServices.get(i);
+            final Preference pref = new Preference(prefContext);
+            final ServiceInfo serviceInfo = service.getServiceInfo();
+            pref.setTitle(serviceInfo.loadLabel(mPm));
+            final Drawable icon =
+                    mIconFactory.getBadgedIcon(
+                            serviceInfo,
+                            serviceInfo.applicationInfo,
+                            user);
+            Utils.setSafeIcon(pref, icon);
+            pref.setIntent(
+                    new Intent(Intent.ACTION_MAIN)
+                            .setClassName(serviceInfo.packageName, service.getPasswordsActivity()));
+            group.addPreference(pref);
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
index 73d80a3..8e8e072 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.applications.defaultapps;
 
-import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;
+import static com.android.settingslib.widget.TwoTargetPreference.ICON_SIZE_MEDIUM;
 
 import android.content.Context;
 import android.content.Intent;
@@ -33,9 +33,9 @@
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.widget.GearPreference;
-import com.android.settingslib.TwoTargetPreference;
 import com.android.settingslib.applications.DefaultAppInfo;
 import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.widget.TwoTargetPreference;
 
 public abstract class DefaultAppPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
index b370ad2..d1d4f62 100644
--- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
+++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
@@ -19,8 +19,10 @@
 import androidx.annotation.IntDef;
 
 import com.android.settings.R;
+import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
 import com.android.settings.applications.AppStateInstallAppsBridge;
 import com.android.settings.applications.AppStateManageExternalStorageBridge;
+import com.android.settings.applications.AppStateMediaManagementAppsBridge;
 import com.android.settings.applications.AppStateNotificationBridge;
 import com.android.settings.applications.AppStateOverlayBridge;
 import com.android.settings.applications.AppStatePowerBridge;
@@ -50,6 +52,8 @@
             FILTER_APPS_WRITE_SETTINGS,
             FILTER_APPS_INSTALL_SOURCES,
             FILTER_APPS_BLOCKED,
+            FILTER_ALARMS_AND_REMINDERS,
+            FILTER_APPS_MEDIA_MANAGEMENT,
     })
     @interface FilterType {
     }
@@ -73,14 +77,16 @@
     public static final int FILTER_APP_CAN_CHANGE_WIFI_STATE = 15;
     public static final int FILTER_APPS_BLOCKED = 16;
     public static final int FILTER_MANAGE_EXTERNAL_STORAGE = 17;
-    // Next id: 18. If you add an entry here, length of mFilters should be updated
+    public static final int FILTER_ALARMS_AND_REMINDERS = 18;
+    public static final int FILTER_APPS_MEDIA_MANAGEMENT = 19;
+    // Next id: 20. If you add an entry here, length of mFilters should be updated
 
     private static AppFilterRegistry sRegistry;
 
     private final AppFilterItem[] mFilters;
 
     private AppFilterRegistry() {
-        mFilters = new AppFilterItem[18];
+        mFilters = new AppFilterItem[20];
 
         // High power allowlist, on
         mFilters[FILTER_APPS_POWER_ALLOWLIST] = new AppFilterItem(
@@ -185,6 +191,18 @@
                 AppStateManageExternalStorageBridge.FILTER_MANAGE_EXTERNAL_STORAGE,
                 FILTER_MANAGE_EXTERNAL_STORAGE,
                 R.string.filter_manage_external_storage);
+
+        // Apps that can schedule alarms and reminders
+        mFilters[FILTER_ALARMS_AND_REMINDERS] = new AppFilterItem(
+                AppStateAlarmsAndRemindersBridge.FILTER_CLOCK_APPS,
+                FILTER_ALARMS_AND_REMINDERS,
+                R.string.alarms_and_reminders_title);
+
+        // Apps that can manage media files
+        mFilters[FILTER_APPS_MEDIA_MANAGEMENT] = new AppFilterItem(
+                AppStateMediaManagementAppsBridge.FILTER_MEDIA_MANAGEMENT_APPS,
+                FILTER_APPS_MEDIA_MANAGEMENT,
+                R.string.media_management_apps_title);
     }
 
     public static AppFilterRegistry getInstance() {
@@ -213,6 +231,10 @@
                 return FILTER_APPS_RECENT;
             case ManageApplications.LIST_MANAGE_EXTERNAL_STORAGE:
                 return FILTER_MANAGE_EXTERNAL_STORAGE;
+            case ManageApplications.LIST_TYPE_ALARMS_AND_REMINDERS:
+                return FILTER_ALARMS_AND_REMINDERS;
+            case ManageApplications.LIST_TYPE_MEDIA_MANAGEMENT_APPS:
+                return FILTER_APPS_MEDIA_MANAGEMENT;
             default:
                 return FILTER_APPS_ALL;
         }
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index 707e6f4..e98555b 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -91,10 +91,12 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
+import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
 import com.android.settings.applications.AppStateAppOpsBridge.PermissionState;
 import com.android.settings.applications.AppStateBaseBridge;
 import com.android.settings.applications.AppStateInstallAppsBridge;
 import com.android.settings.applications.AppStateManageExternalStorageBridge;
+import com.android.settings.applications.AppStateMediaManagementAppsBridge;
 import com.android.settings.applications.AppStateNotificationBridge;
 import com.android.settings.applications.AppStateNotificationBridge.NotificationsSentState;
 import com.android.settings.applications.AppStateOverlayBridge;
@@ -104,10 +106,12 @@
 import com.android.settings.applications.AppStateWriteSettingsBridge;
 import com.android.settings.applications.AppStorageSettings;
 import com.android.settings.applications.UsageAccessDetails;
+import com.android.settings.applications.appinfo.AlarmsAndRemindersDetails;
 import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
 import com.android.settings.applications.appinfo.DrawOverlayDetails;
 import com.android.settings.applications.appinfo.ExternalSourcesDetails;
 import com.android.settings.applications.appinfo.ManageExternalStorageDetails;
+import com.android.settings.applications.appinfo.MediaManagementAppsDetails;
 import com.android.settings.applications.appinfo.WriteSettingsDetails;
 import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.InstrumentedFragment;
@@ -230,6 +234,8 @@
     public static final int LIST_TYPE_PHOTOGRAPHY = 11;
     public static final int LIST_TYPE_WIFI_ACCESS = 13;
     public static final int LIST_MANAGE_EXTERNAL_STORAGE = 14;
+    public static final int LIST_TYPE_ALARMS_AND_REMINDERS = 15;
+    public static final int LIST_TYPE_MEDIA_MANAGEMENT_APPS = 16;
 
     // List types that should show instant apps.
     public static final Set<Integer> LIST_TYPES_WITH_INSTANT = new ArraySet<>(Arrays.asList(
@@ -321,6 +327,12 @@
         } else if (className.equals(Settings.ManageExternalStorageActivity.class.getName())) {
             mListType = LIST_MANAGE_EXTERNAL_STORAGE;
             screenTitle = R.string.manage_external_storage_title;
+        }  else if (className.equals(Settings.MediaManagementAppsActivity.class.getName())) {
+            mListType = LIST_TYPE_MEDIA_MANAGEMENT_APPS;
+            screenTitle = R.string.media_management_apps_title;
+        } else if (className.equals(Settings.AlarmsAndRemindersActivity.class.getName())) {
+            mListType = LIST_TYPE_ALARMS_AND_REMINDERS;
+            screenTitle = R.string.alarms_and_reminders_title;
         } else if (className.equals(Settings.NotificationAppListActivity.class.getName())) {
             mListType = LIST_TYPE_NOTIFICATION;
             mUsageStatsManager = IUsageStatsManager.Stub.asInterface(
@@ -545,6 +557,10 @@
                 return SettingsEnums.CONFIGURE_WIFI;
             case LIST_MANAGE_EXTERNAL_STORAGE:
                 return SettingsEnums.MANAGE_EXTERNAL_STORAGE;
+            case LIST_TYPE_ALARMS_AND_REMINDERS:
+                return SettingsEnums.ALARMS_AND_REMINDERS;
+            case LIST_TYPE_MEDIA_MANAGEMENT_APPS:
+                return SettingsEnums.MEDIA_MANAGEMENT_APPS;
             default:
                 return SettingsEnums.PAGE_UNKNOWN;
         }
@@ -666,6 +682,14 @@
                 startAppInfoFragment(ManageExternalStorageDetails.class,
                         R.string.manage_external_storage_title);
                 break;
+            case LIST_TYPE_ALARMS_AND_REMINDERS:
+                startAppInfoFragment(AlarmsAndRemindersDetails.class,
+                        R.string.alarms_and_reminders_label);
+                break;
+            case LIST_TYPE_MEDIA_MANAGEMENT_APPS:
+                startAppInfoFragment(MediaManagementAppsDetails.class,
+                        R.string.media_management_apps_title);
+                break;
             // TODO: Figure out if there is a way where we can spin up the profile's settings
             // process ahead of time, to avoid a long load of data when user clicks on a managed
             // app. Maybe when they load the list of apps that contains managed profile apps.
@@ -744,6 +768,10 @@
                 return R.string.help_uri_apps_wifi_access;
             case LIST_MANAGE_EXTERNAL_STORAGE:
                 return R.string.help_uri_manage_external_storage;
+            case LIST_TYPE_ALARMS_AND_REMINDERS:
+                return R.string.help_uri_alarms_and_reminders;
+            case LIST_TYPE_MEDIA_MANAGEMENT_APPS:
+                return R.string.help_uri_media_management_apps;
             default:
             case LIST_TYPE_MAIN:
                 return R.string.help_uri_apps;
@@ -1066,6 +1094,10 @@
                 mExtraInfoBridge = new AppStateChangeWifiStateBridge(mContext, mState, this);
             } else if (mManageApplications.mListType == LIST_MANAGE_EXTERNAL_STORAGE) {
                 mExtraInfoBridge = new AppStateManageExternalStorageBridge(mContext, mState, this);
+            } else if (mManageApplications.mListType == LIST_TYPE_ALARMS_AND_REMINDERS) {
+                mExtraInfoBridge = new AppStateAlarmsAndRemindersBridge(mContext, mState, this);
+            } else if (mManageApplications.mListType == LIST_TYPE_MEDIA_MANAGEMENT_APPS) {
+                mExtraInfoBridge = new AppStateMediaManagementAppsBridge(mContext, mState, this);
             } else {
                 mExtraInfoBridge = null;
             }
@@ -1527,6 +1559,12 @@
                 case LIST_MANAGE_EXTERNAL_STORAGE:
                     holder.setSummary(ManageExternalStorageDetails.getSummary(mContext, entry));
                     break;
+                case LIST_TYPE_ALARMS_AND_REMINDERS:
+                    holder.setSummary(AlarmsAndRemindersDetails.getSummary(mContext, entry));
+                    break;
+                case LIST_TYPE_MEDIA_MANAGEMENT_APPS:
+                    holder.setSummary(MediaManagementAppsDetails.getSummary(mContext, entry));
+                    break;
                 default:
                     holder.updateSizeText(entry, mManageApplications.mInvalidSizeStr, mWhichSize);
                     break;
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
index 7c8b96f..1fe3f17 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.applications.specialaccess.deviceadmin;
 
+import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_FINANCED;
+
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AppOpsManager;
@@ -661,7 +663,11 @@
                     mAdminWarning.setText(R.string.admin_profile_owner_user_message);
                 } else {
                     // Show device owner description.
-                    mAdminWarning.setText(R.string.admin_device_owner_message);
+                    if (isFinancedDevice()) {
+                        mAdminWarning.setText(R.string.admin_financed_message);
+                    } else {
+                        mAdminWarning.setText(R.string.admin_device_owner_message);
+                    }
                 }
                 mActionButton.setText(R.string.remove_device_admin);
                 mActionButton.setEnabled(false);
@@ -759,6 +765,11 @@
         return info != null ? info.isManagedProfile() : false;
     }
 
+    private boolean isFinancedDevice() {
+        return mDPM.isDeviceManaged() && mDPM.getDeviceOwnerType(
+                mDPM.getDeviceOwnerComponentOnAnyUser()) == DEVICE_OWNER_TYPE_FINANCED;
+    }
+
     /**
      * @return an {@link Optional} containing the admin with a given package name, if it exists,
      *         or {@link Optional#empty()} otherwise.
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/AlertingTypeFilterPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/AlertingTypeFilterPreferenceController.java
new file mode 100644
index 0000000..4fc5fc6
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/AlertingTypeFilterPreferenceController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING;
+
+import android.content.Context;
+
+public class AlertingTypeFilterPreferenceController extends TypeFilterPreferenceController {
+
+    private static final String TAG = "AlertFilterPrefCntlr";
+
+    public AlertingTypeFilterPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    protected int getType() {
+        return FLAG_FILTER_TYPE_ALERTING;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceController.java
index 9186bdb1..7ff3c9c 100644
--- a/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceController.java
@@ -20,6 +20,7 @@
 import android.service.notification.NotificationListenerFilter;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.preference.CheckBoxPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
@@ -130,9 +131,9 @@
             }
             final String prefKey = entry.info.packageName + "|" + entry.info.uid;
             appsKeySet.add(prefKey);
-            SwitchPreference preference = mScreen.findPreference(prefKey);
+            CheckBoxPreference preference = mScreen.findPreference(prefKey);
             if (preference == null) {
-                preference = new SwitchPreference(mScreen.getContext());
+                preference = new CheckBoxPreference(mScreen.getContext());
                 preference.setIcon(entry.icon);
                 preference.setTitle(entry.label);
                 preference.setKey(prefKey);
@@ -172,7 +173,7 @@
     }
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference instanceof SwitchPreference) {
+        if (preference instanceof CheckBoxPreference) {
             String packageName = preference.getKey().substring(0, preference.getKey().indexOf("|"));
             int uid = Integer.parseInt(preference.getKey().substring(
                     preference.getKey().indexOf("|") + 1));
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/ConversationTypeFilterPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/ConversationTypeFilterPreferenceController.java
new file mode 100644
index 0000000..5a463ed
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/ConversationTypeFilterPreferenceController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_CONVERSATIONS;
+
+import android.content.Context;
+
+public class ConversationTypeFilterPreferenceController extends TypeFilterPreferenceController {
+
+    private static final String TAG = "ConvFilterPrefCntlr";
+
+    public ConversationTypeFilterPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    protected int getType() {
+        return FLAG_FILTER_TYPE_CONVERSATIONS;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java
index 94736e4..1144f12 100644
--- a/src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.applications.specialaccess.notificationaccess;
 
+import android.companion.ICompanionDeviceManager;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -30,8 +32,10 @@
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.notification.NotificationBackend;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.widget.LayoutPreference;
 
@@ -43,6 +47,10 @@
     private PackageInfo mPackageInfo;
     private PackageManager mPm;
     private CharSequence mServiceName;
+    private ICompanionDeviceManager mCdm;
+    private LocalBluetoothManager mBm;
+    private ComponentName mCn;
+    private int mUserId;
 
     public HeaderPreferenceController(Context context, String key) {
         super(context, key);
@@ -68,6 +76,26 @@
         return this;
     }
 
+    public HeaderPreferenceController setCdm(ICompanionDeviceManager cdm) {
+        mCdm = cdm;
+        return this;
+    }
+
+    public HeaderPreferenceController setBluetoothManager(LocalBluetoothManager bm) {
+        mBm = bm;
+        return this;
+    }
+
+    public HeaderPreferenceController setCn(ComponentName cn) {
+        mCn = cn;
+        return this;
+    }
+
+    public HeaderPreferenceController setUserId(int userId) {
+        mUserId = userId;
+        return this;
+    }
+
     @Override
     public int getAvailabilityStatus() {
         return AVAILABLE;
@@ -88,6 +116,8 @@
                         .getBadgedIcon(mPackageInfo.applicationInfo))
                 .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
                 .setSummary(mServiceName)
+                .setSecondSummary(new NotificationBackend().getDeviceList(
+                        mCdm, mBm, mCn.getPackageName(), mUserId))
                 .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))
                 .setPackageName(mPackageInfo.packageName)
                 .setUid(mPackageInfo.applicationInfo.uid)
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
index 41a6efa..1ac578d 100644
--- a/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
@@ -21,6 +21,7 @@
 import android.app.Activity;
 import android.app.NotificationManager;
 import android.app.settings.SettingsEnums;
+import android.companion.ICompanionDeviceManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -29,6 +30,7 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.os.Bundle;
+import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -44,6 +46,7 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.applications.manageapplications.ManageApplications;
+import com.android.settings.bluetooth.Utils;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.notification.NotificationBackend;
@@ -57,9 +60,9 @@
     private static final String TAG = "NotifAccessDetails";
 
     private NotificationBackend mNm = new NotificationBackend();
-    private NotificationListenerFilter mNlf;
     private ComponentName mComponentName;
     private CharSequence mServiceName;
+    protected ServiceInfo mServiceInfo;
     protected PackageInfo mPackageInfo;
     protected int mUserId;
     protected String mPackageName;
@@ -95,11 +98,24 @@
                 .setFragment(this)
                 .setPackageInfo(mPackageInfo)
                 .setPm(context.getPackageManager())
-                .setServiceName(mServiceName);
-        use(TypeFilterPreferenceController.class)
-                .setNm(new NotificationBackend())
+                .setServiceName(mServiceName)
+                .setBluetoothManager(Utils.getLocalBtManager(context))
+                .setCdm(ICompanionDeviceManager.Stub.asInterface(
+                        ServiceManager.getService(Context.COMPANION_DEVICE_SERVICE)))
                 .setCn(mComponentName)
                 .setUserId(mUserId);
+        getPreferenceControllers().forEach(controllers -> {
+            controllers.forEach(controller -> {
+                if (controller instanceof TypeFilterPreferenceController) {
+                    TypeFilterPreferenceController tfpc =
+                            (TypeFilterPreferenceController) controller;
+                    tfpc.setNm(new NotificationBackend())
+                            .setCn(mComponentName)
+                            .setServiceInfo(mServiceInfo)
+                            .setUserId(mUserId);
+                }
+            });
+        });
     }
 
     @Override
@@ -140,13 +156,6 @@
         Preference apps = getPreferenceScreen().findPreference(
                 use(BridgedAppsPreferenceController.class).getPreferenceKey());
         if (apps != null) {
-            mNlf = mNm.getListenerFilter(mComponentName, mUserId);
-            int nonBridgedCount = mNlf.getDisallowedPackages().size();
-            apps.setSummary(nonBridgedCount == 0 ?
-                    getString(R.string.notif_listener_excluded_summary_zero)
-                    : getResources().getQuantityString(
-                            R.plurals.notif_listener_excluded_summary_nonzero,
-                            nonBridgedCount, nonBridgedCount));
 
             apps.setOnPreferenceClickListener(preference -> {
                 final Bundle args = new Bundle();
@@ -157,7 +166,7 @@
                 new SubSettingLauncher(getContext())
                         .setDestination(BridgedAppsSettings.class.getName())
                         .setSourceMetricsCategory(getMetricsCategory())
-                        .setTitleRes(R.string.notif_listener_excluded_app_title)
+                        .setTitleRes(R.string.notif_listener_excluded_app_screen_title)
                         .setArguments(args)
                         .setUserHandle(UserHandle.of(mUserId))
                         .launch();
@@ -205,20 +214,34 @@
     // along to keep business logic out of this file
     public void disable(final ComponentName cn) {
         final PreferenceScreen screen = getPreferenceScreen();
-        ApprovalPreferenceController controller = use(ApprovalPreferenceController.class);
-        controller.disable(cn);
-        controller.updateState(screen.findPreference(controller.getPreferenceKey()));
-        TypeFilterPreferenceController dependent1 = use(TypeFilterPreferenceController.class);
-        dependent1.updateState(screen.findPreference(dependent1.getPreferenceKey()));
+        ApprovalPreferenceController apc = use(ApprovalPreferenceController.class);
+        apc.disable(cn);
+        apc.updateState(screen.findPreference(apc.getPreferenceKey()));
+        getPreferenceControllers().forEach(controllers -> {
+            controllers.forEach(controller -> {
+                if (controller instanceof TypeFilterPreferenceController) {
+                    TypeFilterPreferenceController tfpc =
+                            (TypeFilterPreferenceController) controller;
+                    tfpc.updateState(screen.findPreference(tfpc.getPreferenceKey()));
+                }
+            });
+        });
     }
 
     protected void enable(ComponentName cn) {
         final PreferenceScreen screen = getPreferenceScreen();
-        ApprovalPreferenceController controller = use(ApprovalPreferenceController.class);
-        controller.enable(cn);
-        controller.updateState(screen.findPreference(controller.getPreferenceKey()));
-        TypeFilterPreferenceController dependent1 = use(TypeFilterPreferenceController.class);
-        dependent1.updateState(screen.findPreference(dependent1.getPreferenceKey()));
+        ApprovalPreferenceController apc = use(ApprovalPreferenceController.class);
+        apc.enable(cn);
+        apc.updateState(screen.findPreference(apc.getPreferenceKey()));
+        getPreferenceControllers().forEach(controllers -> {
+            controllers.forEach(controller -> {
+                if (controller instanceof TypeFilterPreferenceController) {
+                    TypeFilterPreferenceController tfpc =
+                            (TypeFilterPreferenceController) controller;
+                    tfpc.updateState(screen.findPreference(tfpc.getPreferenceKey()));
+                }
+            });
+        });
     }
 
     // To save binder calls, load this in the fragment rather than each preference controller
@@ -239,6 +262,7 @@
                 if (Objects.equals(mComponentName, info.getComponentName())) {
                     mIsNls = true;
                     mServiceName = info.loadLabel(mPm);
+                    mServiceInfo = info;
                     break;
                 }
             }
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/OWNERS b/src/com/android/settings/applications/specialaccess/notificationaccess/OWNERS
new file mode 100644
index 0000000..4338198
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/OWNERS
@@ -0,0 +1,4 @@
+# Default reviewers for this and subdirectories.
+beverlyt@google.com
+dsandler@android.com
+juliacr@google.com
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/OngoingTypeFilterPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/OngoingTypeFilterPreferenceController.java
new file mode 100644
index 0000000..6192a04
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/OngoingTypeFilterPreferenceController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ONGOING;
+
+import android.content.Context;
+
+public class OngoingTypeFilterPreferenceController extends TypeFilterPreferenceController {
+
+    private static final String TAG = "OngoingFilterPrefCntlr";
+
+    public OngoingTypeFilterPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    protected int getType() {
+        return FLAG_FILTER_TYPE_ONGOING;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/SilentTypeFilterPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/SilentTypeFilterPreferenceController.java
new file mode 100644
index 0000000..fab3b7b
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/SilentTypeFilterPreferenceController.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_SILENT;
+
+import android.content.Context;
+
+public class SilentTypeFilterPreferenceController extends TypeFilterPreferenceController {
+
+    private static final String TAG = "SilentFilterPrefCntlr";
+
+    public SilentTypeFilterPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    protected int getType() {
+        return FLAG_FILTER_TYPE_SILENT;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceController.java
index 9d7fcc1..a5ac1e1 100644
--- a/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceController.java
@@ -16,35 +16,31 @@
 
 package com.android.settings.applications.specialaccess.notificationaccess;
 
-import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING;
-import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_CONVERSATIONS;
-import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ONGOING;
-import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_SILENT;
-
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.ServiceInfo;
 import android.service.notification.NotificationListenerFilter;
+import android.service.notification.NotificationListenerService;
+import android.text.TextUtils;
 
-import androidx.preference.MultiSelectListPreference;
+import androidx.preference.CheckBoxPreference;
 import androidx.preference.Preference;
 
-import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.notification.NotificationBackend;
 
-import java.util.HashSet;
-import java.util.Set;
-
-public class TypeFilterPreferenceController extends BasePreferenceController implements
+public abstract class TypeFilterPreferenceController extends BasePreferenceController implements
         PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
     private static final String TAG = "TypeFilterPrefCntlr";
+    private static final String XML_SEPARATOR = ",";
 
     private ComponentName mCn;
     private int mUserId;
     private NotificationBackend mNm;
     private NotificationListenerFilter mNlf;
+    private ServiceInfo mSi;
 
     public TypeFilterPreferenceController(Context context, String key) {
         super(context, key);
@@ -65,6 +61,13 @@
         return this;
     }
 
+    public TypeFilterPreferenceController setServiceInfo(ServiceInfo si) {
+        mSi = si;
+        return this;
+    }
+
+    abstract protected int getType();
+
     @Override
     public int getAvailabilityStatus() {
         if (mNm.isNotificationListenerAccessGranted(mCn)) {
@@ -74,71 +77,62 @@
         }
     }
 
-    @Override
-    public void updateState(Preference pref) {
-        mNlf = mNm.getListenerFilter(mCn, mUserId);
-        Set<String> values = new HashSet<>();
-        Set<String> entries = new HashSet<>();
-
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_ONGOING)) {
-            values.add(String.valueOf(FLAG_FILTER_TYPE_ONGOING));
-            entries.add(mContext.getString(R.string.notif_type_ongoing));
-        }
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_CONVERSATIONS)) {
-            values.add(String.valueOf(FLAG_FILTER_TYPE_CONVERSATIONS));
-            entries.add(mContext.getString(R.string.notif_type_conversation));
-        }
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_ALERTING)) {
-            values.add(String.valueOf(FLAG_FILTER_TYPE_ALERTING));
-            entries.add(mContext.getString(R.string.notif_type_alerting));
-        }
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_SILENT)) {
-            values.add(String.valueOf(FLAG_FILTER_TYPE_SILENT));
-            entries.add(mContext.getString(R.string.notif_type_silent));
-        }
-
-        final MultiSelectListPreference preference = (MultiSelectListPreference) pref;
-        preference.setValues(values);
-        super.updateState(preference);
-        pref.setEnabled(getAvailabilityStatus() == AVAILABLE);
-    }
-
     private boolean hasFlag(int value, int flag) {
         return (value & flag) != 0;
     }
 
-    public CharSequence getSummary() {
-        Set<String> entries = new HashSet<>();
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_ONGOING)) {
-            entries.add(mContext.getString(R.string.notif_type_ongoing));
-        }
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_CONVERSATIONS)) {
-            entries.add(mContext.getString(R.string.notif_type_conversation));
-        }
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_ALERTING)) {
-            entries.add(mContext.getString(R.string.notif_type_alerting));
-        }
-        if (hasFlag(mNlf.getTypes(), FLAG_FILTER_TYPE_SILENT)) {
-            entries.add(mContext.getString(R.string.notif_type_silent));
-        }
-        return String.join(System.lineSeparator(), entries);
-    }
-
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         // retrieve latest in case the package filter has changed
         mNlf = mNm.getListenerFilter(mCn, mUserId);
 
-        Set<String> set = (Set<String>) newValue;
+        boolean enabled = (boolean) newValue;
 
-        int newFilter = 0;
-        for (String filterType : set) {
-            newFilter |= Integer.parseInt(filterType);
+        int newFilter = mNlf.getTypes();
+        if (enabled) {
+            newFilter |= getType();
+        } else {
+            newFilter &= ~getType();
         }
         mNlf.setTypes(newFilter);
-        preference.setSummary(getSummary());
         mNm.setListenerFilter(mCn, mUserId, mNlf);
         return true;
     }
 
+    @Override
+    public void updateState(Preference pref) {
+        mNlf = mNm.getListenerFilter(mCn, mUserId);
+
+        CheckBoxPreference check = (CheckBoxPreference) pref;
+        check.setChecked(hasFlag(mNlf.getTypes(), getType()));
+
+        boolean disableRequestedByApp = false;
+        if (mSi != null) {
+            if (mSi.metaData != null && mSi.metaData.containsKey(
+                    NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES)) {
+                String typeList = mSi.metaData.get(
+                        NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES).toString();
+                if (typeList != null) {
+                    int types = 0;
+                    String[] typeStrings = typeList.split(XML_SEPARATOR);
+                    for (int i = 0; i < typeStrings.length; i++) {
+                        if (TextUtils.isEmpty(typeStrings[i])) {
+                            continue;
+                        }
+                        try {
+                            types |= Integer.parseInt(typeStrings[i]);
+                        } catch (NumberFormatException e) {
+                            // skip
+                        }
+                    }
+                    if (hasFlag(types, getType())) {
+                        disableRequestedByApp = true;
+                    }
+                }
+            }
+        }
+        // Apps can prevent a category from being turned on, but not turned off
+        boolean disabledByApp = disableRequestedByApp && !check.isChecked();
+        pref.setEnabled(getAvailabilityStatus() == AVAILABLE && !disabledByApp);
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java
index 7936f66..67148d1 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollBase.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java
@@ -48,6 +48,8 @@
     public static final String EXTRA_KEY_LAUNCHED_CONFIRM = "launched_confirm_lock";
     public static final String EXTRA_KEY_REQUIRE_VISION = "accessibility_vision";
     public static final String EXTRA_KEY_REQUIRE_DIVERSITY = "accessibility_diversity";
+    public static final String EXTRA_KEY_SENSOR_ID = "sensor_id";
+    public static final String EXTRA_KEY_CHALLENGE = "challenge";
 
     /**
      * Used by the choose fingerprint wizard to indicate the wizard is
@@ -90,12 +92,16 @@
     protected boolean mLaunchedConfirmLock;
     protected byte[] mToken;
     protected int mUserId;
+    protected int mSensorId;
+    protected long mChallenge;
     protected boolean mFromSettingsSummary;
     protected FooterBarMixin mFooterBarMixin;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        mChallenge = getIntent().getLongExtra(EXTRA_KEY_CHALLENGE, -1L);
+        mSensorId = getIntent().getIntExtra(EXTRA_KEY_SENSOR_ID, -1);
         // Don't need to retrieve the HAT if it already exists. In some cases, the extras do not
         // contain EXTRA_KEY_CHALLENGE_TOKEN but contain EXTRA_KEY_GK_PW, in which case enrollment
         // classes may request a HAT to be created (as opposed to being passed in)
@@ -110,6 +116,8 @@
                     ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
             mFromSettingsSummary =
                     savedInstanceState.getBoolean(EXTRA_FROM_SETTINGS_SUMMARY, false);
+            mChallenge = savedInstanceState.getLong(EXTRA_KEY_CHALLENGE);
+            mSensorId = savedInstanceState.getInt(EXTRA_KEY_SENSOR_ID);
         }
         mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
     }
@@ -127,6 +135,8 @@
         outState.putBoolean(EXTRA_KEY_LAUNCHED_CONFIRM, mLaunchedConfirmLock);
         outState.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
         outState.putBoolean(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);
+        outState.putLong(EXTRA_KEY_CHALLENGE, mChallenge);
+        outState.putInt(EXTRA_KEY_SENSOR_ID, mSensorId);
     }
 
     @Override
@@ -173,6 +183,18 @@
         setHeaderText(resId, false /* force */);
     }
 
+    protected void setHeaderText(CharSequence title) {
+        getLayout().setHeaderText(title);
+    }
+
+    protected void setDescriptionText(int resId) {
+        getLayout().setDescriptionText(resId);
+    }
+
+    protected void setDescriptionText(CharSequence descriptionText) {
+        getLayout().setDescriptionText(descriptionText);
+    }
+
     protected FooterButton getNextButton() {
         if (mFooterBarMixin != null) {
             return mFooterBarMixin.getPrimaryButton();
@@ -188,6 +210,8 @@
         intent.setClassName(SETTINGS_PACKAGE_NAME, FingerprintEnrollEnrolling.class.getName());
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
         intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);
+        intent.putExtra(EXTRA_KEY_CHALLENGE, mChallenge);
+        intent.putExtra(EXTRA_KEY_SENSOR_ID, mSensorId);
         if (mUserId != UserHandle.USER_NULL) {
             intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
         }
diff --git a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
index 26df474..b44c2c9 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
@@ -243,6 +243,8 @@
         }
         BiometricUtils.copyMultiBiometricExtras(getIntent(), intent);
         intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);
+        intent.putExtra(EXTRA_KEY_CHALLENGE, mChallenge);
+        intent.putExtra(EXTRA_KEY_SENSOR_ID, mSensorId);
         startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);
     }
 
@@ -262,6 +264,8 @@
                 overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
                 getNextButton().setEnabled(false);
                 getChallenge(((sensorId, challenge) -> {
+                    mSensorId = sensorId;
+                    mChallenge = challenge;
                     mToken = BiometricUtils.requestGatekeeperHat(this, data, mUserId, challenge);
                     BiometricUtils.removeGatekeeperPasswordHandle(this, data);
                     getNextButton().setEnabled(true);
@@ -276,6 +280,8 @@
                 overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
                 getNextButton().setEnabled(false);
                 getChallenge(((sensorId, challenge) -> {
+                    mSensorId = sensorId;
+                    mChallenge = challenge;
                     mToken = BiometricUtils.requestGatekeeperHat(this, data, mUserId, challenge);
                     BiometricUtils.removeGatekeeperPasswordHandle(this, data);
                     getNextButton().setEnabled(true);
@@ -309,9 +315,8 @@
     protected void initViews() {
         super.initViews();
 
-        TextView description = (TextView) findViewById(R.id.sud_layout_description);
         if (mBiometricUnlockDisabledByAdmin) {
-            description.setText(getDescriptionResDisabledByAdmin());
+            setDescriptionText(getDescriptionResDisabledByAdmin());
         }
     }
 }
diff --git a/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java b/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java
index 9b86e78..0bfe56e 100644
--- a/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java
@@ -121,6 +121,8 @@
                 | Intent.FLAG_ACTIVITY_CLEAR_TOP
                 | Intent.FLAG_ACTIVITY_SINGLE_TOP);
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+        intent.putExtra(BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, mSensorId);
+        intent.putExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, mChallenge);
         intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);
         if (mUserId != UserHandle.USER_NULL) {
             intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
diff --git a/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java b/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
index 1ea6b08..84128e2 100644
--- a/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
+++ b/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
@@ -72,6 +72,8 @@
                     mGkPwHandle, mUserId, challenge);
             final Intent faceIntent = BiometricUtils.getFaceIntroIntent(mActivity,
                     mActivity.getIntent());
+            faceIntent.putExtra(BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, sensorId);
+            faceIntent.putExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, challenge);
 
             if (mRequestEnrollFingerprint) {
                 // Give FaceEnroll a pendingIntent pointing to fingerprint enrollment, so that it
@@ -97,6 +99,8 @@
                     mGkPwHandle, mUserId, challenge);
             final Intent intent = BiometricUtils.getFingerprintIntroIntent(mActivity,
                     mActivity.getIntent());
+            intent.putExtra(BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, sensorId);
+            intent.putExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, challenge);
             BiometricUtils.launchEnrollForResult(mActivity, intent, REQUEST_FINGERPRINT_ENROLL,
                     hardwareAuthToken, mGkPwHandle, mUserId);
         }));
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
index 3e9fba2..6c5a4b4 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
@@ -183,6 +183,8 @@
         if (mUserId != UserHandle.USER_NULL) {
             intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
         }
+        intent.putExtra(EXTRA_KEY_CHALLENGE, mChallenge);
+        intent.putExtra(EXTRA_KEY_SENSOR_ID, mSensorId);
         intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);
         BiometricUtils.copyMultiBiometricExtras(getIntent(), intent);
         final String flattenedString = getString(R.string.config_face_enroll);
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index 3bffbbf..9110292 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -112,6 +112,8 @@
             // the challenge is ready. Let's just do this for now.
             mFaceManager.generateChallenge((sensorId, challenge) -> {
                 mToken = BiometricUtils.requestGatekeeperHat(this, getIntent(), mUserId, challenge);
+                mSensorId = sensorId;
+                mChallenge = challenge;
                 if (BiometricUtils.isMultiBiometricEnrollmentFlow(this)) {
                     BiometricUtils.removeGatekeeperPasswordHandle(this, getIntent());
                 }
diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index 7751485..038d448 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -37,6 +37,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
+import com.android.settings.biometrics.BiometricEnrollBase;
 import com.android.settings.biometrics.BiometricUtils;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
@@ -67,6 +68,8 @@
     private UserManager mUserManager;
     private FaceManager mFaceManager;
     private int mUserId;
+    private int mSensorId;
+    private long mChallenge;
     private byte[] mToken;
     private FaceSettingsAttentionPreferenceController mAttentionController;
     private FaceSettingsRemoveButtonPreferenceController mRemoveController;
@@ -147,6 +150,8 @@
         mUserManager = context.getSystemService(UserManager.class);
         mFaceManager = context.getSystemService(FaceManager.class);
         mToken = getIntent().getByteArrayExtra(KEY_TOKEN);
+        mSensorId = getIntent().getIntExtra(BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, -1);
+        mChallenge = getIntent().getLongExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, 0L);
 
         mUserId = getActivity().getIntent().getIntExtra(
                 Intent.EXTRA_USER_ID, UserHandle.myUserId());
@@ -247,6 +252,8 @@
                 mFaceManager.generateChallenge((sensorId, challenge) -> {
                     mToken = BiometricUtils.requestGatekeeperHat(getPrefContext(), data, mUserId,
                             challenge);
+                    mSensorId = sensorId;
+                    mChallenge = challenge;
                     BiometricUtils.removeGatekeeperPasswordHandle(getPrefContext(), data);
                     mAttentionController.setToken(mToken);
                     mEnrollController.setToken(mToken);
@@ -269,7 +276,7 @@
                 && !mConfirmingPassword) {
             // Revoke challenge and finish
             if (mToken != null) {
-                mFaceManager.revokeChallenge();
+                mFaceManager.revokeChallenge(mSensorId, mUserId, mChallenge);
                 mToken = null;
             }
             finish();
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 78abb58..10b31e3 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -52,7 +52,6 @@
 
 import com.google.android.setupcompat.template.FooterBarMixin;
 import com.google.android.setupcompat.template.FooterButton;
-import com.google.android.setupdesign.util.DescriptionStyler;
 
 import java.util.List;
 
@@ -66,6 +65,10 @@
 
     private static final int PROGRESS_BAR_MAX = 10000;
     private static final int FINISH_DELAY = 250;
+    /**
+     * Enroll with two center touches before going to guided enrollment.
+     */
+    private static final int NUM_CENTER_TOUCHES = 2;
 
     /**
      * If we don't see progress during this time, we show an error message to remind the users that
@@ -95,8 +98,6 @@
     private boolean mCanAssumeUdfps;
     @Nullable private ProgressBar mProgressBar;
     private ObjectAnimator mProgressAnim;
-    private TextView mStartMessage;
-    private TextView mRepeatMessage;
     private TextView mErrorText;
     private Interpolator mFastOutSlowInInterpolator;
     private Interpolator mLinearOutSlowInInterpolator;
@@ -144,29 +145,19 @@
         mCanAssumeUdfps = props.size() == 1 && props.get(0).isAnyUdfpsType();
 
         if (mCanAssumeUdfps) {
-            // Use a custom layout since animations, etc must be based off of the sensor's physical
-            // location.
             setContentView(R.layout.udfps_enroll_enrolling);
-            final UdfpsEnrollLayout udfpsEnrollLayout = (UdfpsEnrollLayout) getLayoutInflater()
-                    .inflate(R.layout.udfps_enroll_layout, null /* root */);
-            getLayout().addView(udfpsEnrollLayout);
+            setDescriptionText(R.string.security_settings_udfps_enroll_start_message);
         } else {
             setContentView(R.layout.fingerprint_enroll_enrolling);
+            setDescriptionText(R.string.security_settings_fingerprint_enroll_start_message);
         }
 
         setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title);
 
-        mStartMessage = findViewById(R.id.sud_layout_description);
-        mRepeatMessage = findViewById(R.id.repeat_message);
         mErrorText = findViewById(R.id.error_text);
         mProgressBar = findViewById(R.id.fingerprint_progress_bar);
         mVibrator = getSystemService(Vibrator.class);
 
-        if (getLayout().shouldApplyPartnerHeavyThemeResource()) {
-            DescriptionStyler.applyPartnerCustomizationHeavyStyle(mRepeatMessage);
-        } else if (getLayout().shouldApplyPartnerResource()) {
-            DescriptionStyler.applyPartnerCustomizationLightStyle(mRepeatMessage);
-        }
         mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
         mFooterBarMixin.setSecondaryButton(
                 new FooterButton.Builder(this)
@@ -234,7 +225,7 @@
     protected void onStart() {
         super.onStart();
         updateProgress(false /* animate */);
-        updateDescription();
+        updateTitleAndDescription();
         if (mRestoring) {
             startIconAnimation();
         }
@@ -302,20 +293,40 @@
         return new Intent(this, FingerprintEnrollFinish.class);
     }
 
-    private void updateDescription() {
+    private void updateTitleAndDescription() {
         if (mSidecar == null || mSidecar.getEnrollmentSteps() == -1) {
-            mStartMessage.setVisibility(View.VISIBLE);
-            mRepeatMessage.setVisibility(View.INVISIBLE);
+            if (mCanAssumeUdfps) {
+                setDescriptionText(R.string.security_settings_udfps_enroll_start_message);
+            } else {
+                setDescriptionText(R.string.security_settings_fingerprint_enroll_start_message);
+            }
+        } else if (mCanAssumeUdfps && !isCenterEnrollmentComplete()) {
+            setHeaderText(R.string.security_settings_udfps_enroll_title_one_more_time);
+            setDescriptionText(R.string.security_settings_udfps_enroll_start_message);
         } else {
-            mStartMessage.setVisibility(View.INVISIBLE);
-            mRepeatMessage.setVisibility(View.VISIBLE);
+            if (mCanAssumeUdfps) {
+                setHeaderText(R.string.security_settings_udfps_enroll_repeat_title_touch_icon);
+                setDescriptionText(R.string.security_settings_udfps_enroll_repeat_message);
+            } else {
+                setDescriptionText(R.string.security_settings_fingerprint_enroll_repeat_message);
+            }
         }
     }
 
+    private boolean isCenterEnrollmentComplete() {
+        if (mSidecar == null || mSidecar.getEnrollmentSteps() == -1) {
+            return false;
+        }
+        final int stepsEnrolled = mSidecar.getEnrollmentSteps() - mSidecar.getEnrollmentRemaining();
+        return stepsEnrolled >= NUM_CENTER_TOUCHES;
+    }
+
     @Override
     public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) {
         if (!TextUtils.isEmpty(helpString)) {
-            mErrorText.removeCallbacks(mTouchAgainRunnable);
+            if (!mCanAssumeUdfps) {
+                mErrorText.removeCallbacks(mTouchAgainRunnable);
+            }
             showError(helpString);
         }
     }
@@ -336,17 +347,21 @@
         }
         showErrorDialog(getText(msgId), errMsgId);
         stopIconAnimation();
-        mErrorText.removeCallbacks(mTouchAgainRunnable);
+        if (!mCanAssumeUdfps) {
+            mErrorText.removeCallbacks(mTouchAgainRunnable);
+        }
     }
 
     @Override
     public void onEnrollmentProgressChange(int steps, int remaining) {
         updateProgress(true /* animate */);
-        updateDescription();
+        updateTitleAndDescription();
         clearError();
         animateFlash();
-        mErrorText.removeCallbacks(mTouchAgainRunnable);
-        mErrorText.postDelayed(mTouchAgainRunnable, HINT_TIMEOUT_DURATION);
+        if (!mCanAssumeUdfps) {
+            mErrorText.removeCallbacks(mTouchAgainRunnable);
+            mErrorText.postDelayed(mTouchAgainRunnable, HINT_TIMEOUT_DURATION);
+        }
     }
 
     private void updateProgress(boolean animate) {
@@ -388,22 +403,28 @@
     }
 
     private void showError(CharSequence error) {
-        mErrorText.setText(error);
-        if (mErrorText.getVisibility() == View.INVISIBLE) {
-            mErrorText.setVisibility(View.VISIBLE);
-            mErrorText.setTranslationY(getResources().getDimensionPixelSize(
-                    R.dimen.fingerprint_error_text_appear_distance));
-            mErrorText.setAlpha(0f);
-            mErrorText.animate()
-                    .alpha(1f)
-                    .translationY(0f)
-                    .setDuration(200)
-                    .setInterpolator(mLinearOutSlowInInterpolator)
-                    .start();
+        if (mCanAssumeUdfps) {
+            setHeaderText(error);
+            // Show nothing for subtitle when getting an error message.
+            setDescriptionText("");
         } else {
-            mErrorText.animate().cancel();
-            mErrorText.setAlpha(1f);
-            mErrorText.setTranslationY(0f);
+            mErrorText.setText(error);
+            if (mErrorText.getVisibility() == View.INVISIBLE) {
+                mErrorText.setVisibility(View.VISIBLE);
+                mErrorText.setTranslationY(getResources().getDimensionPixelSize(
+                        R.dimen.fingerprint_error_text_appear_distance));
+                mErrorText.setAlpha(0f);
+                mErrorText.animate()
+                        .alpha(1f)
+                        .translationY(0f)
+                        .setDuration(200)
+                        .setInterpolator(mLinearOutSlowInInterpolator)
+                        .start();
+            } else {
+                mErrorText.animate().cancel();
+                mErrorText.setAlpha(1f);
+                mErrorText.setTranslationY(0f);
+            }
         }
         if (isResumed()) {
             mVibrator.vibrate(VIBRATE_EFFECT_ERROR, FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES);
@@ -411,7 +432,7 @@
     }
 
     private void clearError() {
-        if (mErrorText.getVisibility() == View.VISIBLE) {
+        if (!mCanAssumeUdfps && mErrorText.getVisibility() == View.VISIBLE) {
             mErrorText.animate()
                     .alpha(0f)
                     .translationY(getResources().getDimensionPixelSize(
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index 89cd442..94eb278 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -68,13 +68,21 @@
                         .build()
         );
 
-        setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);
+        if (mCanAssumeUdfps) {
+            setHeaderText(R.string.security_settings_udfps_enroll_find_sensor_title);
+            setDescriptionText(R.string.security_settings_udfps_enroll_find_sensor_message);
+        } else {
+            setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);
+            setDescriptionText(R.string.security_settings_fingerprint_enroll_find_sensor_message);
+        }
 
         // This is an entry point for SetNewPasswordController, e.g.
         // adb shell am start -a android.app.action.SET_NEW_PASSWORD
         if (mToken == null && BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) {
             final FingerprintManager fpm = getSystemService(FingerprintManager.class);
             fpm.generateChallenge(mUserId, (sensorId, challenge) -> {
+                mChallenge = challenge;
+                mSensorId = sensorId;
                 mToken = BiometricUtils.requestGatekeeperHat(this, getIntent(), mUserId, challenge);
                 BiometricUtils.removeGatekeeperPasswordHandle(this, getIntent());
 
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
index 3adbd0d..a989eef 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
@@ -55,6 +55,7 @@
         super.onCreate(savedInstanceState);
         setContentView(R.layout.fingerprint_enroll_finish);
         setHeaderText(R.string.security_settings_fingerprint_enroll_finish_title);
+        setDescriptionText(R.string.security_settings_fingerprint_enroll_finish_message);
 
         mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
         mFooterBarMixin.setSecondaryButton(
@@ -140,7 +141,7 @@
     private void postEnroll() {
         final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(this);
         if (fpm != null) {
-            fpm.revokeChallenge(mUserId);
+            fpm.revokeChallenge(mUserId, mChallenge);
         }
     }
 
@@ -150,6 +151,7 @@
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
         intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
+        intent.putExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, mChallenge);
         startActivity(intent);
     }
 
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index 23a1133..0996a58 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -57,6 +57,8 @@
 
         super.onCreate(savedInstanceState);
 
+        setDescriptionText(R.string.security_settings_fingerprint_enroll_introduction_message);
+
         mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
         mFooterBarMixin.setSecondaryButton(
                 new FooterButton.Builder(this)
@@ -69,7 +71,7 @@
 
         mFooterBarMixin.setPrimaryButton(
                 new FooterButton.Builder(this)
-                        .setText(R.string.wizard_next)
+                        .setText(R.string.security_settings_fingerprint_enroll_introduction_agree)
                         .setListener(this::onNextButtonClick)
                         .setButtonType(FooterButton.ButtonType.NEXT)
                         .setTheme(R.style.SudGlifButton_Primary)
@@ -78,7 +80,7 @@
     }
 
     int getNegativeButtonTextId() {
-        return R.string.security_settings_fingerprint_enroll_introduction_no_thanks;
+        return R.string.security_settings_fingerprint_enroll_introduction_skip;
     }
 
     @Override
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 88920ad..5e6f7e9 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -63,8 +63,8 @@
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.TwoTargetPreference;
 import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.TwoTargetPreference;
 
 import java.util.HashMap;
 import java.util.List;
@@ -138,6 +138,8 @@
         private CharSequence mFooterTitle;
         private boolean mEnrollClicked;
 
+        private long mChallenge;
+
         private static final String TAG_AUTHENTICATE_SIDECAR = "authenticate_sidecar";
         private static final String TAG_REMOVAL_SIDECAR = "removal_sidecar";
         private FingerprintAuthenticateSidecar mAuthenticateSidecar;
@@ -230,7 +232,10 @@
         protected void handleError(int errMsgId, CharSequence msg) {
             switch (errMsgId) {
                 case FingerprintManager.FINGERPRINT_ERROR_CANCELED:
-                    return; // Only happens if we get preempted by another activity. Ignored.
+                case FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED:
+                    // Only happens if we get preempted by another activity, or canceled by the
+                    // user (e.g. swipe up to home). Ignored.
+                    return;
                 case FingerprintManager.FINGERPRINT_ERROR_LOCKOUT:
                     mInFingerprintLockout = true;
                     // We've been locked out.  Reset after 30s.
@@ -284,6 +289,8 @@
 
             mToken = getIntent().getByteArrayExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+            mChallenge = activity.getIntent()
+                    .getLongExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, -1L);
 
             mAuthenticateSidecar = (FingerprintAuthenticateSidecar)
                     getFragmentManager().findFragmentByTag(TAG_AUTHENTICATE_SIDECAR);
@@ -574,6 +581,7 @@
                         mFingerprintManager.generateChallenge(mUserId, (sensorId, challenge) -> {
                             mToken = BiometricUtils.requestGatekeeperHat(getActivity(), data,
                                     mUserId, challenge);
+                            mChallenge = challenge;
                             BiometricUtils.removeGatekeeperPasswordHandle(getActivity(), data);
                             updateAddPreference();
                         });
@@ -599,7 +607,7 @@
         public void onDestroy() {
             super.onDestroy();
             if (getActivity().isFinishing()) {
-                mFingerprintManager.revokeChallenge(mUserId);
+                mFingerprintManager.revokeChallenge(mUserId, mChallenge);
             }
         }
 
diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
index 8097adc..5f2fbb5 100644
--- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -37,14 +37,11 @@
 public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor {
 
     @Override
-    protected int getContentView() {
-        return R.layout.fingerprint_enroll_find_sensor;
-    }
-
-    @Override
     protected Intent getFingerprintEnrollingIntent() {
         Intent intent = new Intent(this, SetupFingerprintEnrollEnrolling.class);
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
+        intent.putExtra(EXTRA_KEY_CHALLENGE, mChallenge);
+        intent.putExtra(EXTRA_KEY_SENSOR_ID, mSensorId);
         if (mUserId != UserHandle.USER_NULL) {
             intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
         }
diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
index c8a4c05..d767d53 100644
--- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -18,22 +18,18 @@
 
 import android.app.Activity;
 import android.app.KeyguardManager;
-import android.app.admin.DevicePolicyManager;
 import android.app.settings.SettingsEnums;
 import android.content.Intent;
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.os.UserHandle;
-import android.os.storage.StorageManager;
 import android.view.View;
-import android.widget.TextView;
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
 import com.android.settings.Utils;
 import com.android.settings.biometrics.BiometricUtils;
-import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.password.SetupChooseLockGeneric;
 import com.android.settings.password.SetupSkipDialog;
@@ -86,8 +82,7 @@
     protected void initViews() {
         super.initViews();
 
-        TextView description = (TextView) findViewById(R.id.sud_layout_description);
-        description.setText(
+        setDescriptionText(
                 R.string.security_settings_fingerprint_enroll_introduction_message_setup);
 
         FooterButton nextButton = getNextButton();
diff --git a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollLayout.java b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollLayout.java
deleted file mode 100644
index 7923d27..0000000
--- a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollLayout.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.biometrics.fingerprint;
-
-import android.content.Context;
-import android.hardware.fingerprint.FingerprintManager;
-import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.WindowInsets;
-import android.view.WindowManager;
-import android.widget.LinearLayout;
-
-import com.android.settings.R;
-
-public class UdfpsEnrollLayout extends LinearLayout {
-
-    private static final String TAG = "UdfpsEnrollLayout";
-
-    public UdfpsEnrollLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-    }
-}
diff --git a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
index 7f8ade1..096c2c5 100644
--- a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
@@ -29,9 +29,10 @@
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
-import android.provider.DeviceConfig;
 import android.provider.MediaStore;
+import android.text.TextUtils;
 import android.util.Log;
+import android.util.Pair;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -43,7 +44,6 @@
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.core.SettingsUIDeviceConfig;
 import com.android.settings.fuelgauge.BatteryMeterView;
 import com.android.settingslib.bluetooth.BluetoothUtils;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -84,6 +84,7 @@
     private static final int LEFT_DEVICE_ID = 1;
     private static final int RIGHT_DEVICE_ID = 2;
     private static final int CASE_DEVICE_ID = 3;
+    private static final int MAIN_DEVICE_ID = 4;
 
     @VisibleForTesting
     LayoutPreference mLayoutPreference;
@@ -115,13 +116,11 @@
 
     @Override
     public int getAvailabilityStatus() {
-        final boolean advancedEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI,
-                SettingsUIDeviceConfig.BT_ADVANCED_HEADER_ENABLED, true);
-        final boolean untetheredHeadset = mCachedDevice != null
-                && BluetoothUtils.getBooleanMetaData(
-                mCachedDevice.getDevice(), BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET);
-        Log.d(TAG, "getAvailabilityStatus() is untethered : " + untetheredHeadset);
-        return advancedEnabled && untetheredHeadset ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+        if (mCachedDevice == null) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        return Utils.isAdvancedDetailsHeader(mCachedDevice.getDevice())
+                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
     @Override
@@ -182,27 +181,45 @@
                 updateDisconnectLayout();
                 return;
             }
+            final BluetoothDevice device = mCachedDevice.getDevice();
+            final String deviceType = BluetoothUtils.getStringMetaData(device,
+                    BluetoothDevice.METADATA_DEVICE_TYPE);
+            if (TextUtils.equals(deviceType, BluetoothDevice.DEVICE_TYPE_WATCH)
+                    || TextUtils.equals(deviceType, BluetoothDevice.DEVICE_TYPE_DEFAULT)) {
+                mLayoutPreference.findViewById(R.id.layout_left).setVisibility(View.GONE);
+                mLayoutPreference.findViewById(R.id.layout_right).setVisibility(View.GONE);
 
-            updateSubLayout(mLayoutPreference.findViewById(R.id.layout_left),
-                    BluetoothDevice.METADATA_UNTETHERED_LEFT_ICON,
-                    BluetoothDevice.METADATA_UNTETHERED_LEFT_BATTERY,
-                    BluetoothDevice.METADATA_UNTETHERED_LEFT_CHARGING,
-                    R.string.bluetooth_left_name,
-                    LEFT_DEVICE_ID);
+                updateSubLayout(mLayoutPreference.findViewById(R.id.layout_middle),
+                        BluetoothDevice.METADATA_MAIN_ICON,
+                        BluetoothDevice.METADATA_MAIN_BATTERY,
+                        BluetoothDevice.METADATA_MAIN_CHARGING,
+                        /* titleResId */ 0,
+                        MAIN_DEVICE_ID);
+            } else if (TextUtils.equals(deviceType,
+                    BluetoothDevice.DEVICE_TYPE_UNTETHERED_HEADSET)
+                    || BluetoothUtils.getBooleanMetaData(device,
+                    BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET)) {
+                updateSubLayout(mLayoutPreference.findViewById(R.id.layout_left),
+                        BluetoothDevice.METADATA_UNTETHERED_LEFT_ICON,
+                        BluetoothDevice.METADATA_UNTETHERED_LEFT_BATTERY,
+                        BluetoothDevice.METADATA_UNTETHERED_LEFT_CHARGING,
+                        R.string.bluetooth_left_name,
+                        LEFT_DEVICE_ID);
 
-            updateSubLayout(mLayoutPreference.findViewById(R.id.layout_middle),
-                    BluetoothDevice.METADATA_UNTETHERED_CASE_ICON,
-                    BluetoothDevice.METADATA_UNTETHERED_CASE_BATTERY,
-                    BluetoothDevice.METADATA_UNTETHERED_CASE_CHARGING,
-                    R.string.bluetooth_middle_name,
-                    CASE_DEVICE_ID);
+                updateSubLayout(mLayoutPreference.findViewById(R.id.layout_middle),
+                        BluetoothDevice.METADATA_UNTETHERED_CASE_ICON,
+                        BluetoothDevice.METADATA_UNTETHERED_CASE_BATTERY,
+                        BluetoothDevice.METADATA_UNTETHERED_CASE_CHARGING,
+                        R.string.bluetooth_middle_name,
+                        CASE_DEVICE_ID);
 
-            updateSubLayout(mLayoutPreference.findViewById(R.id.layout_right),
-                    BluetoothDevice.METADATA_UNTETHERED_RIGHT_ICON,
-                    BluetoothDevice.METADATA_UNTETHERED_RIGHT_BATTERY,
-                    BluetoothDevice.METADATA_UNTETHERED_RIGHT_CHARGING,
-                    R.string.bluetooth_right_name,
-                    RIGHT_DEVICE_ID);
+                updateSubLayout(mLayoutPreference.findViewById(R.id.layout_right),
+                        BluetoothDevice.METADATA_UNTETHERED_RIGHT_ICON,
+                        BluetoothDevice.METADATA_UNTETHERED_RIGHT_BATTERY,
+                        BluetoothDevice.METADATA_UNTETHERED_RIGHT_CHARGING,
+                        R.string.bluetooth_right_name,
+                        RIGHT_DEVICE_ID);
+            }
         }
     }
 
@@ -226,17 +243,21 @@
     }
 
     private void updateSubLayout(LinearLayout linearLayout, int iconMetaKey, int batteryMetaKey,
-            int chargeMetaKey, int titleResId, int batteryId) {
+            int chargeMetaKey, int titleResId, int deviceId) {
         if (linearLayout == null) {
             return;
         }
         final BluetoothDevice bluetoothDevice = mCachedDevice.getDevice();
         final String iconUri = BluetoothUtils.getStringMetaData(bluetoothDevice, iconMetaKey);
+        final ImageView imageView = linearLayout.findViewById(R.id.header_icon);
         if (iconUri != null) {
-            final ImageView imageView = linearLayout.findViewById(R.id.header_icon);
             updateIcon(imageView, iconUri);
+        } else {
+            final Pair<Drawable, String> pair =
+                    BluetoothUtils.getBtRainbowDrawableWithDescription(mContext, mCachedDevice);
+            imageView.setImageDrawable(pair.first);
+            imageView.setContentDescription(pair.second);
         }
-
         final int batteryLevel = BluetoothUtils.getIntMetaData(bluetoothDevice, batteryMetaKey);
         final boolean charging = BluetoothUtils.getBooleanMetaData(bluetoothDevice, chargeMetaKey);
         if (DEBUG) {
@@ -244,24 +265,35 @@
                     + ", charge : " + chargeMetaKey + ", batteryLevel : " + batteryLevel
                     + ", charging : " + charging + ", iconUri : " + iconUri);
         }
-
-        if (batteryId != CASE_DEVICE_ID) {
-            showBatteryPredictionIfNecessary(linearLayout, batteryId, batteryLevel);
+        if (deviceId == LEFT_DEVICE_ID || deviceId == RIGHT_DEVICE_ID) {
+            showBatteryPredictionIfNecessary(linearLayout, deviceId, batteryLevel);
         }
+        final TextView batterySummaryView = linearLayout.findViewById(R.id.bt_battery_summary);
         if (batteryLevel != BluetoothUtils.META_INT_ERROR) {
             linearLayout.setVisibility(View.VISIBLE);
-            final TextView textView = linearLayout.findViewById(R.id.bt_battery_summary);
-            textView.setText(com.android.settings.Utils.formatPercentage(batteryLevel));
-            textView.setVisibility(View.VISIBLE);
+            batterySummaryView.setText(com.android.settings.Utils.formatPercentage(batteryLevel));
+            batterySummaryView.setVisibility(View.VISIBLE);
             showBatteryIcon(linearLayout, batteryLevel, charging, batteryMetaKey);
         } else {
-            // Hide it if it doesn't have battery information
-            linearLayout.setVisibility(View.GONE);
+            if (deviceId == MAIN_DEVICE_ID) {
+                linearLayout.setVisibility(View.VISIBLE);
+                batterySummaryView.setText(com.android.settings.Utils.formatPercentage(
+                        bluetoothDevice.getBatteryLevel()));
+                batterySummaryView.setVisibility(View.VISIBLE);
+                linearLayout.findViewById(R.id.bt_battery_icon).setVisibility(View.GONE);
+            } else {
+                // Hide it if it doesn't have battery information
+                linearLayout.setVisibility(View.GONE);
+            }
         }
 
         final TextView textView = linearLayout.findViewById(R.id.header_title);
-        textView.setText(titleResId);
-        textView.setVisibility(View.VISIBLE);
+        if (deviceId == MAIN_DEVICE_ID) {
+            textView.setVisibility(View.GONE);
+        } else {
+            textView.setText(titleResId);
+            textView.setVisibility(View.VISIBLE);
+        }
     }
 
     private void showBatteryPredictionIfNecessary(LinearLayout linearLayout, int batteryId,
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
index fc74004..9f5e78e 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
@@ -16,10 +16,8 @@
 
 package com.android.settings.bluetooth;
 
-import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.provider.DeviceConfig;
 import android.text.TextUtils;
 import android.util.Pair;
 
@@ -27,7 +25,6 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.core.SettingsUIDeviceConfig;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.bluetooth.BluetoothUtils;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -56,11 +53,7 @@
 
     @Override
     public boolean isAvailable() {
-        final boolean advancedEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI,
-                SettingsUIDeviceConfig.BT_ADVANCED_HEADER_ENABLED, true);
-        return !advancedEnabled
-                || !BluetoothUtils.getBooleanMetaData(mCachedDevice.getDevice(),
-                        BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET);
+        return !Utils.isAdvancedDetailsHeader(mCachedDevice.getDevice());
     }
 
     @Override
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
index dcaeffe..aacf41f 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
@@ -297,6 +297,7 @@
             preference.setEnabled(false);
             preference.setKey(KEY_BOTTOM_PREFERENCE);
             preference.setOrder(ORDINAL);
+            preference.setSelectable(false);
             mProfilesContainer.addPreference(preference);
         }
     }
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index f895032..373d929 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -175,7 +175,7 @@
         mHideSecondTarget = hideSecondTarget;
     }
 
-    private void onPreferenceAttributesChanged() {
+    void onPreferenceAttributesChanged() {
         ThreadUtils.postOnBackgroundThread(() -> {
             final Pair<Drawable, String> pair =
                     BluetoothUtils.getBtRainbowDrawableWithDescription(getContext(), mCachedDevice);
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
index 8cb698f..d65500b 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
@@ -317,4 +317,13 @@
         }
         return device.getBondState() == BluetoothDevice.BOND_BONDED && device.isConnected();
     }
+
+    /**
+     * Update the attributes of {@link Preference}.
+     */
+    public void refreshPreference() {
+        for (Preference preference : mPreferenceMap.values()) {
+            ((BluetoothDevicePreference) preference).onPreferenceAttributesChanged();
+        }
+    }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
index e40e30d..cd36ce8 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.bluetooth;
 
+import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
 import android.bluetooth.BluetoothDevice;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -23,6 +25,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -30,11 +33,14 @@
 
 import androidx.preference.Preference;
 
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.settings.R;
-
-import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+import com.android.settings.password.PasswordUtils;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 /**
  * BluetoothPermissionActivity shows a dialog for accepting incoming
@@ -51,8 +57,13 @@
     private TextView messageView;
     private Button mOkButton;
     private BluetoothDevice mDevice;
-    private String mReturnPackage = null;
-    private String mReturnClass = null;
+
+    @VisibleForTesting
+    String mReturnPackage = null;
+    @VisibleForTesting
+    String mReturnClass = null;
+    @VisibleForTesting
+    String mCallingAppPackageName;
 
     private int mRequestType = 0;
     private BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -80,6 +91,7 @@
 
         getWindow().addPrivateFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
         Intent i = getIntent();
+        mCallingAppPackageName = PasswordUtils.getCallingAppPackageName(getActivityToken());
         String action = i.getAction();
         if (!action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {
             Log.e(TAG, "Error: this activity may be started only with intent "
@@ -94,6 +106,22 @@
         mRequestType = i.getIntExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE,
                                      BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS);
 
+        // Even if the user has already made the choice, Bluetooth still may not know that if
+        // the user preference data have not been migrated from Settings app's shared
+        // preferences to Bluetooth app's. In that case, Bluetooth app broadcasts an
+        // ACTION_CONNECTION_ACCESS_REQUEST intent to ask to Settings app.
+        //
+        // If that happens, 'checkUserChoice()' here will do migration because it finds or
+        // creates a 'CachedBluetoothDevice' object for the device.
+        //
+        // After migration is done, 'checkUserChoice()' replies to the request by sending an
+        // ACTION_CONNECTION_ACCESS_REPLY intent. And we don't need to start permission activity
+        // dialog or notification.
+        if (checkUserChoice()) {
+            finish();
+            return;
+        }
+
         if(DEBUG) Log.i(TAG, "onCreate() Request type: " + mRequestType);
 
         if (mRequestType == BluetoothDevice.REQUEST_TYPE_PROFILE_CONNECTION) {
@@ -202,7 +230,14 @@
         sendReplyIntentToReceiver(false, true);
     }
 
-    private void sendReplyIntentToReceiver(final boolean allowed, final boolean always) {
+    @VisibleForTesting
+    void sendReplyIntentToReceiver(final boolean allowed, final boolean always) {
+        if (!TextUtils.equals(mCallingAppPackageName, mReturnPackage)) {
+            Log.w(TAG, "sendReplyIntentToReceiver() return package name is not equivalent"
+                    + " to calling package name!");
+            return;
+        }
+
         Intent intent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY);
 
         if (mReturnPackage != null && mReturnClass != null) {
@@ -246,4 +281,76 @@
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         return true;
     }
+
+    /**
+     * @return true user had made a choice, this method replies to the request according
+     *              to user's previous decision
+     *         false user hadnot made any choice on this device
+     */
+    private boolean checkUserChoice() {
+        boolean processed = false;
+
+        // ignore if it is something else than phonebook/message settings it wants us to remember
+        if (mRequestType != BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS
+                && mRequestType != BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS
+                && mRequestType != BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
+            Log.d(TAG, "checkUserChoice(): Unknown RequestType " + mRequestType);
+            return processed;
+        }
+
+        final LocalBluetoothManager bluetoothManager = Utils.getLocalBtManager(this);
+        final CachedBluetoothDeviceManager cachedDeviceManager =
+                bluetoothManager.getCachedDeviceManager();
+        CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
+        if (cachedDevice == null) {
+            cachedDevice = cachedDeviceManager.addDevice(mDevice);
+        }
+
+        if (mRequestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
+            final int phonebookPermission = mDevice.getPhonebookAccessPermission();
+
+            if (phonebookPermission == BluetoothDevice.ACCESS_UNKNOWN) {
+                // Leave 'processed' as false.
+            } else if (phonebookPermission == BluetoothDevice.ACCESS_ALLOWED) {
+                sendReplyIntentToReceiver(true, true);
+                processed = true;
+            } else if (phonebookPermission == BluetoothDevice.ACCESS_REJECTED) {
+                sendReplyIntentToReceiver(false, true);
+                processed = true;
+            } else {
+                Log.e(TAG, "Bad phonebookPermission: " + phonebookPermission);
+            }
+        } else if (mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
+            final int messagePermission = mDevice.getMessageAccessPermission();
+
+            if (messagePermission == BluetoothDevice.ACCESS_UNKNOWN) {
+                // Leave 'processed' as false.
+            } else if (messagePermission == BluetoothDevice.ACCESS_ALLOWED) {
+                sendReplyIntentToReceiver(true, true);
+                processed = true;
+            } else if (messagePermission == BluetoothDevice.ACCESS_REJECTED) {
+                sendReplyIntentToReceiver(false, true);
+                processed = true;
+            } else {
+                Log.e(TAG, "Bad messagePermission: " + messagePermission);
+            }
+        } else if (mRequestType == BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
+            final int simPermission = mDevice.getSimAccessPermission();
+
+            if (simPermission == BluetoothDevice.ACCESS_UNKNOWN) {
+                // Leave 'processed' as false.
+            } else if (simPermission == BluetoothDevice.ACCESS_ALLOWED) {
+                sendReplyIntentToReceiver(true, true);
+                processed = true;
+            } else if (simPermission == BluetoothDevice.ACCESS_REJECTED) {
+                sendReplyIntentToReceiver(false, true);
+                processed = true;
+            } else {
+                Log.e(TAG, "Bad simPermission: " + simPermission);
+            }
+        }
+
+        Log.d(TAG, "checkUserChoice(): returning " + processed);
+        return processed;
+    }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index 7fac4991c..c606e31 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -29,9 +29,6 @@
 import android.util.Log;
 
 import com.android.settings.R;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 /**
  * BluetoothPermissionRequest is a receiver to receive Bluetooth connection
@@ -83,21 +80,6 @@
             if (DEBUG) Log.d(TAG, "onReceive request type: " + mRequestType + " return "
                     + mReturnPackage + "," + mReturnClass);
 
-            // Even if the user has already made the choice, Bluetooth still may not know that if
-            // the user preference data have not been migrated from Settings app's shared
-            // preferences to Bluetooth app's. In that case, Bluetooth app broadcasts an
-            // ACTION_CONNECTION_ACCESS_REQUEST intent to ask to Settings app.
-            //
-            // If that happens, 'checkUserChoice()' here will do migration because it finds or
-            // creates a 'CachedBluetoothDevice' object for the device.
-            //
-            // After migration is done, 'checkUserChoice()' replies to the request by sending an
-            // ACTION_CONNECTION_ACCESS_REPLY intent. And we don't need to start permission activity
-            // dialog or notification.
-            if (checkUserChoice()) {
-                return;
-            }
-
             Intent connectionAccessIntent = new Intent(action);
             connectionAccessIntent.setClass(context, BluetoothPermissionActivity.class);
             // We use the FLAG_ACTIVITY_MULTIPLE_TASK since we can have multiple concurrent access
@@ -212,92 +194,4 @@
         }
         return null;
     }
-
-    /**
-     * @return true user had made a choice, this method replies to the request according
-     *              to user's previous decision
-     *         false user hadnot made any choice on this device
-     */
-    private boolean checkUserChoice() {
-        boolean processed = false;
-
-        // ignore if it is something else than phonebook/message settings it wants us to remember
-        if (mRequestType != BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS
-                && mRequestType != BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS
-                && mRequestType != BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
-            if (DEBUG) Log.d(TAG, "checkUserChoice(): Unknown RequestType " + mRequestType);
-            return processed;
-        }
-
-        LocalBluetoothManager bluetoothManager = Utils.getLocalBtManager(mContext);
-        CachedBluetoothDeviceManager cachedDeviceManager =
-            bluetoothManager.getCachedDeviceManager();
-        CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
-        if (cachedDevice == null) {
-            cachedDevice = cachedDeviceManager.addDevice(mDevice);
-        }
-
-        String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;
-
-        if (mRequestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
-            int phonebookPermission = mDevice.getPhonebookAccessPermission();
-
-            if (phonebookPermission == BluetoothDevice.ACCESS_UNKNOWN) {
-                // Leave 'processed' as false.
-            } else if (phonebookPermission == BluetoothDevice.ACCESS_ALLOWED) {
-                sendReplyIntentToReceiver(true);
-                processed = true;
-            } else if (phonebookPermission == BluetoothDevice.ACCESS_REJECTED) {
-                sendReplyIntentToReceiver(false);
-                processed = true;
-            } else {
-                Log.e(TAG, "Bad phonebookPermission: " + phonebookPermission);
-            }
-        } else if (mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
-            int messagePermission = mDevice.getMessageAccessPermission();
-
-            if (messagePermission == BluetoothDevice.ACCESS_UNKNOWN) {
-                // Leave 'processed' as false.
-            } else if (messagePermission == BluetoothDevice.ACCESS_ALLOWED) {
-                sendReplyIntentToReceiver(true);
-                processed = true;
-            } else if (messagePermission == BluetoothDevice.ACCESS_REJECTED) {
-                sendReplyIntentToReceiver(false);
-                processed = true;
-            } else {
-                Log.e(TAG, "Bad messagePermission: " + messagePermission);
-            }
-        } else if(mRequestType == BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
-            int simPermission = mDevice.getSimAccessPermission();
-
-            if (simPermission == BluetoothDevice.ACCESS_UNKNOWN) {
-                // Leave 'processed' as false.
-            } else if (simPermission == BluetoothDevice.ACCESS_ALLOWED) {
-                sendReplyIntentToReceiver(true);
-                processed = true;
-            } else if (simPermission == BluetoothDevice.ACCESS_REJECTED) {
-                sendReplyIntentToReceiver(false);
-                processed = true;
-            } else {
-                Log.e(TAG, "Bad simPermission: " + simPermission);
-            }
-        }
-        if (DEBUG) Log.d(TAG,"checkUserChoice(): returning " + processed);
-        return processed;
-    }
-
-    private void sendReplyIntentToReceiver(final boolean allowed) {
-        Intent intent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY);
-
-        if (mReturnPackage != null && mReturnClass != null) {
-            intent.setClassName(mReturnPackage, mReturnClass);
-        }
-
-        intent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
-                        allowed ? BluetoothDevice.CONNECTION_ACCESS_YES
-                                : BluetoothDevice.CONNECTION_ACCESS_NO);
-        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
-        intent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType);
-        mContext.sendBroadcast(intent, android.Manifest.permission.BLUETOOTH_ADMIN);
-    }
 }
diff --git a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
index 5b74ce7..27f10da 100644
--- a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
@@ -23,7 +23,7 @@
 
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.location.ScanningSettings;
+import com.android.settings.location.LocationServices;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.utils.AnnotationSpan;
 import com.android.settings.widget.SwitchWidgetController;
@@ -100,7 +100,7 @@
     public void onClick(View v) {
         // send users to scanning settings if they click on the link in the summary text
         new SubSettingLauncher(mContext)
-                .setDestination(ScanningSettings.class.getName())
+                .setDestination(LocationServices.class.getName())
                 .setSourceMetricsCategory(SettingsEnums.BLUETOOTH_FRAGMENT)
                 .launch();
     }
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index ab8eea5..214c590 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -27,12 +27,15 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.UserManager;
+import android.text.TextUtils;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
+import com.android.settings.password.PasswordUtils;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.core.AbstractPreferenceController;
 
@@ -48,10 +51,16 @@
 
     @VisibleForTesting
     BluetoothProgressCategory mAvailableDevicesCategory;
+    @VisibleForTesting
+    String mLaunchPackage;
+    @VisibleForTesting
+    String mLaunchClass;
+    @VisibleForTesting
+    String mCallingAppPackageName;
+    @VisibleForTesting
+    Context mContext;
 
     private boolean mNeedAuth;
-    private String mLaunchPackage;
-    private String mLaunchClass;
     private boolean mScanAllowed;
 
     public DevicePickerFragment() {
@@ -85,6 +94,9 @@
         getActivity().setTitle(getString(R.string.device_picker));
         UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
         mScanAllowed = !um.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH);
+        mCallingAppPackageName = PasswordUtils.getCallingAppPackageName(
+                getActivity().getActivityToken());
+        mContext = getContext();
         setHasOptionsMenu(true);
     }
 
@@ -188,11 +200,17 @@
     }
 
     private void sendDevicePickedIntent(BluetoothDevice device) {
+        if (!TextUtils.equals(mCallingAppPackageName, mLaunchPackage)) {
+            Log.w(TAG, "sendDevicePickedIntent() launch package name is not equivalent to"
+                    + " calling package name!");
+            return;
+        }
+
         Intent intent = new Intent(BluetoothDevicePicker.ACTION_DEVICE_SELECTED);
         intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
         if (mLaunchPackage != null && mLaunchClass != null) {
             intent.setClassName(mLaunchPackage, mLaunchClass);
         }
-        getActivity().sendBroadcast(intent, Manifest.permission.BLUETOOTH_ADMIN);
+        mContext.sendBroadcast(intent, Manifest.permission.BLUETOOTH_ADMIN);
     }
 }
diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java
index 48c7212..ca8f9d3 100755
--- a/src/com/android/settings/bluetooth/Utils.java
+++ b/src/com/android/settings/bluetooth/Utils.java
@@ -21,14 +21,18 @@
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.provider.DeviceConfig;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 
 import com.android.settings.R;
+import com.android.settings.core.SettingsUIDeviceConfig;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.bluetooth.BluetoothUtils;
 import com.android.settingslib.bluetooth.BluetoothUtils.ErrorListener;
@@ -153,4 +157,36 @@
         return Settings.Global.getInt(context.getContentResolver(),
                 Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1;
     }
+
+    /**
+     * Check if the Bluetooth device supports advanced details header
+     *
+     * @param bluetoothDevice the BluetoothDevice to get metadata
+     * @return true if it supports advanced details header, false otherwise.
+     */
+    public static boolean isAdvancedDetailsHeader(@NonNull BluetoothDevice bluetoothDevice) {
+        final boolean advancedEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI,
+                SettingsUIDeviceConfig.BT_ADVANCED_HEADER_ENABLED, true);
+        if (!advancedEnabled) {
+            Log.d(TAG, "isAdvancedDetailsHeader: advancedEnabled is false");
+            return false;
+        }
+        // The metadata is for Android R
+        final boolean untetheredHeadset = BluetoothUtils.getBooleanMetaData(bluetoothDevice,
+                BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET);
+        if (untetheredHeadset) {
+            Log.d(TAG, "isAdvancedDetailsHeader: untetheredHeadset is true");
+            return true;
+        }
+        // The metadata is for Android S
+        final String deviceType = BluetoothUtils.getStringMetaData(bluetoothDevice,
+                BluetoothDevice.METADATA_DEVICE_TYPE);
+        if (TextUtils.equals(deviceType, BluetoothDevice.DEVICE_TYPE_UNTETHERED_HEADSET)
+                || TextUtils.equals(deviceType, BluetoothDevice.DEVICE_TYPE_WATCH)
+                || TextUtils.equals(deviceType, BluetoothDevice.DEVICE_TYPE_DEFAULT)) {
+            Log.d(TAG, "isAdvancedDetailsHeader: deviceType is " + deviceType);
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
index d895154..ec122df 100644
--- a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
+++ b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
@@ -68,6 +68,7 @@
         }
         mBluetoothDeviceUpdater.registerCallback();
         mLocalBluetoothManager.getEventManager().registerCallback(this);
+        mBluetoothDeviceUpdater.refreshPreference();
     }
 
     @Override
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
index 957737a..8cec9a6 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
@@ -61,6 +61,7 @@
         mBluetoothDeviceUpdater.registerCallback();
         mConnectedUsbDeviceUpdater.registerCallback();
         mConnectedDockUpdater.registerCallback();
+        mBluetoothDeviceUpdater.refreshPreference();
     }
 
     @Override
diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
index a7bae3b..4a29485 100644
--- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
@@ -111,6 +111,7 @@
         mBluetoothDeviceUpdater.registerCallback();
         mSavedDockUpdater.registerCallback();
         mContext.registerReceiver(mReceiver, mIntentFilter);
+        mBluetoothDeviceUpdater.refreshPreference();
     }
 
     @Override
diff --git a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java
index 062fa2d..df721f1 100644
--- a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java
+++ b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java
@@ -63,6 +63,7 @@
     public void onStart() {
         mBluetoothDeviceUpdater.registerCallback();
         mSavedDockUpdater.registerCallback();
+        mBluetoothDeviceUpdater.refreshPreference();
     }
 
     @Override
diff --git a/src/com/android/settings/connecteddevice/usb/UsbBackend.java b/src/com/android/settings/connecteddevice/usb/UsbBackend.java
index 4773aca..244818f 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbBackend.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbBackend.java
@@ -28,7 +28,7 @@
 import android.hardware.usb.UsbManager;
 import android.hardware.usb.UsbPort;
 import android.hardware.usb.UsbPortStatus;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 
@@ -74,9 +74,8 @@
         mIsAdminUser = userManager.isAdminUser();
 
         mMidiSupported = context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_MIDI);
-        ConnectivityManager cm =
-                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        mTetheringSupported = cm.isTetheringSupported();
+        final TetheringManager tm = context.getSystemService(TetheringManager.class);
+        mTetheringSupported = tm.isTetheringSupported();
 
         updatePorts();
     }
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
index 12e978f..de08f38 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
@@ -16,14 +16,17 @@
 
 package com.android.settings.connecteddevice.usb;
 
-import static android.net.ConnectivityManager.TETHERING_USB;
+import static android.net.TetheringManager.TETHERING_USB;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.hardware.usb.UsbManager;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerExecutor;
+import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceScreen;
@@ -43,10 +46,13 @@
  * Provides options for selecting the default USB mode.
  */
 public class UsbDefaultFragment extends RadioButtonPickerFragment {
+
+    private static final String TAG = "UsbDefaultFragment";
+
     @VisibleForTesting
     UsbBackend mUsbBackend;
     @VisibleForTesting
-    ConnectivityManager mConnectivityManager;
+    TetheringManager mTetheringManager;
     @VisibleForTesting
     OnStartTetheringCallback mOnStartTetheringCallback = new OnStartTetheringCallback();
     @VisibleForTesting
@@ -57,21 +63,32 @@
     boolean mIsStartTethering = false;
 
     private UsbConnectionBroadcastReceiver mUsbReceiver;
+    private Handler mHandler = new Handler();
+    private boolean mIsConnected = false;
 
     @VisibleForTesting
     UsbConnectionBroadcastReceiver.UsbConnectionListener mUsbConnectionListener =
             (connected, functions, powerRole, dataRole) -> {
+                final long defaultFunctions = mUsbBackend.getDefaultUsbFunctions();
+                Log.d(TAG, "UsbConnectionListener() connected : " + connected + ", functions : "
+                        + functions + ", defaultFunctions : " + defaultFunctions);
+                if (connected && !mIsConnected && defaultFunctions == UsbManager.FUNCTION_RNDIS) {
+                    startTethering();
+                }
+
                 if (mIsStartTethering) {
                     mCurrentFunctions = functions;
                     refresh(functions);
+                    mIsStartTethering = false;
                 }
+                mIsConnected = connected;
             };
 
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         mUsbBackend = new UsbBackend(context);
-        mConnectivityManager = context.getSystemService(ConnectivityManager.class);
+        mTetheringManager = context.getSystemService(TetheringManager.class);
         mUsbReceiver = new UsbConnectionBroadcastReceiver(context, mUsbConnectionListener,
                 mUsbBackend);
         getSettingsLifecycle().addObserver(mUsbReceiver);
@@ -138,10 +155,8 @@
         if (!Utils.isMonkeyRunning()) {
             if (functions == UsbManager.FUNCTION_RNDIS) {
                 // We need to have entitlement check for usb tethering, so use API in
-                // ConnectivityManager.
-                mIsStartTethering = true;
-                mConnectivityManager.startTethering(TETHERING_USB, true /* showProvisioningUi */,
-                        mOnStartTetheringCallback);
+                // TetheringManager.
+                startTethering();
             } else {
                 mIsStartTethering = false;
                 mCurrentFunctions = functions;
@@ -152,6 +167,13 @@
         return true;
     }
 
+    private void startTethering() {
+        Log.d(TAG, "startTethering()");
+        mIsStartTethering = true;
+        mTetheringManager.startTethering(TETHERING_USB, new HandlerExecutor(mHandler),
+                mOnStartTetheringCallback);
+    }
+
     @Override
     public void onPause() {
         super.onPause();
@@ -159,20 +181,20 @@
     }
 
     @VisibleForTesting
-    final class OnStartTetheringCallback extends
-            ConnectivityManager.OnStartTetheringCallback {
+    final class OnStartTetheringCallback implements
+            TetheringManager.StartTetheringCallback {
 
         @Override
         public void onTetheringStarted() {
-            super.onTetheringStarted();
+            Log.d(TAG, "onTetheringStarted()");
             // Set default usb functions again to make internal data persistent
             mCurrentFunctions = UsbManager.FUNCTION_RNDIS;
             mUsbBackend.setDefaultUsbFunctions(UsbManager.FUNCTION_RNDIS);
         }
 
         @Override
-        public void onTetheringFailed() {
-            super.onTetheringFailed();
+        public void onTetheringFailed(int error) {
+            Log.w(TAG, "onTetheringFailed() error : " + error);
             mUsbBackend.setDefaultUsbFunctions(mPreviousFunctions);
             updateCandidates();
         }
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
index 99e9d50..40626fb 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
@@ -17,11 +17,12 @@
 package com.android.settings.connecteddevice.usb;
 
 import static android.hardware.usb.UsbPortStatus.DATA_ROLE_DEVICE;
-import static android.net.ConnectivityManager.TETHERING_USB;
 
 import android.content.Context;
 import android.hardware.usb.UsbManager;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
+import android.os.Handler;
+import android.os.HandlerExecutor;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
@@ -55,7 +56,8 @@
     }
 
     private PreferenceCategory mProfilesContainer;
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
+    private Handler mHandler = new Handler();
     @VisibleForTesting
     OnStartTetheringCallback mOnStartTetheringCallback;
     @VisibleForTesting
@@ -64,7 +66,7 @@
     public UsbDetailsFunctionsController(Context context, UsbDetailsFragment fragment,
             UsbBackend backend) {
         super(context, fragment, backend);
-        mConnectivityManager = context.getSystemService(ConnectivityManager.class);
+        mTetheringManager = context.getSystemService(TetheringManager.class);
         mOnStartTetheringCallback = new OnStartTetheringCallback();
         mPreviousFunction = mUsbBackend.getCurrentFunctions();
     }
@@ -130,7 +132,7 @@
                     + UsbManager.usbFunctionsToString(previousFunction));
         }
         if (function != previousFunction && !Utils.isMonkeyRunning()
-                && !shouldIgnoreClickEvent(function, previousFunction)) {
+                && !isClickEventIgnored(function, previousFunction)) {
             mPreviousFunction = previousFunction;
 
             //Update the UI in advance to make it looks smooth
@@ -144,8 +146,9 @@
 
             if (function == UsbManager.FUNCTION_RNDIS) {
                 // We need to have entitlement check for usb tethering, so use API in
-                // ConnectivityManager.
-                mConnectivityManager.startTethering(TETHERING_USB, true /* showProvisioningUi */,
+                // TetheringManager.
+                mTetheringManager.startTethering(
+                        TetheringManager.TETHERING_USB, new HandlerExecutor(mHandler),
                         mOnStartTetheringCallback);
             } else {
                 mUsbBackend.setCurrentFunctions(function);
@@ -153,7 +156,7 @@
         }
     }
 
-    private boolean shouldIgnoreClickEvent(long function, long previousFunction) {
+    private boolean isClickEventIgnored(long function, long previousFunction) {
         return isAccessoryMode(previousFunction) && function == UsbManager.FUNCTION_MTP;
     }
 
@@ -172,12 +175,11 @@
     }
 
     @VisibleForTesting
-    final class OnStartTetheringCallback extends
-            ConnectivityManager.OnStartTetheringCallback {
+    final class OnStartTetheringCallback implements TetheringManager.StartTetheringCallback {
 
         @Override
-        public void onTetheringFailed() {
-            super.onTetheringFailed();
+        public void onTetheringFailed(int error) {
+            Log.w(TAG, "onTetheringFailed() error : " + error);
             mUsbBackend.setCurrentFunctions(mPreviousFunction);
         }
     }
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index 85484af..cc78fa6 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -184,16 +184,18 @@
     public void setTitle(CharSequence title) {
         if (mCollapsingToolbarLayout != null) {
             mCollapsingToolbarLayout.setTitle(title);
+        } else {
+            super.setTitle(title);
         }
-        super.setTitle(title);
     }
 
     @Override
     public void setTitle(int titleId) {
         if (mCollapsingToolbarLayout != null) {
             mCollapsingToolbarLayout.setTitle(getText(titleId));
+        } else {
+            super.setTitle(titleId);
         }
-        super.setTitle(titleId);
     }
 
     /**
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index 245389e..c08c149 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -20,6 +20,7 @@
 import com.android.settings.DisplaySettings;
 import com.android.settings.IccLockSettings;
 import com.android.settings.MainClear;
+import com.android.settings.MainClearConfirm;
 import com.android.settings.Settings;
 import com.android.settings.TestingSettings;
 import com.android.settings.TetherSettings;
@@ -39,10 +40,12 @@
 import com.android.settings.applications.ProcessStatsSummary;
 import com.android.settings.applications.ProcessStatsUi;
 import com.android.settings.applications.UsageAccessDetails;
+import com.android.settings.applications.appinfo.AlarmsAndRemindersDetails;
 import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
 import com.android.settings.applications.appinfo.DrawOverlayDetails;
 import com.android.settings.applications.appinfo.ExternalSourcesDetails;
 import com.android.settings.applications.appinfo.ManageExternalStorageDetails;
+import com.android.settings.applications.appinfo.MediaManagementAppsDetails;
 import com.android.settings.applications.appinfo.WriteSettingsDetails;
 import com.android.settings.applications.appops.BackgroundCheckSummary;
 import com.android.settings.applications.assist.ManageAssist;
@@ -110,8 +113,8 @@
 import com.android.settings.inputmethod.UserDictionarySettings;
 import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.localepicker.LocaleListEditor;
+import com.android.settings.location.LocationServices;
 import com.android.settings.location.LocationSettings;
-import com.android.settings.location.ScanningSettings;
 import com.android.settings.network.MobileNetworkListFragment;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.network.NetworkProviderSettings;
@@ -200,7 +203,7 @@
             NotificationStation.class.getName(),
             LocationSettings.class.getName(),
             PrivacyDashboardFragment.class.getName(),
-            ScanningSettings.class.getName(),
+            LocationServices.class.getName(),
             SecuritySettings.class.getName(),
             UsageAccessDetails.class.getName(),
             PrivacySettings.class.getName(),
@@ -282,6 +285,7 @@
             WifiAPITest.class.getName(),
             WifiInfo.class.getName(),
             MainClear.class.getName(),
+            MainClearConfirm.class.getName(),
             ResetDashboardFragment.class.getName(),
             NightDisplaySettings.class.getName(),
             ManageDomainUrls.class.getName(),
@@ -313,7 +317,9 @@
             InteractAcrossProfilesSettings.class.getName(),
             InteractAcrossProfilesDetails.class.getName(),
             MediaControlsSettings.class.getName(),
-            NetworkProviderSettings.class.getName()
+            NetworkProviderSettings.class.getName(),
+            AlarmsAndRemindersDetails.class.getName(),
+            MediaManagementAppsDetails.class.getName()
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileFragmentBridge.java b/src/com/android/settings/dashboard/profileselector/ProfileFragmentBridge.java
index 04fccb3..2891e3a 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileFragmentBridge.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileFragmentBridge.java
@@ -21,7 +21,7 @@
 import com.android.settings.accounts.AccountDashboardFragment;
 import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.location.LocationSettings;
-import com.android.settings.location.RecentLocationRequestSeeAllFragment;
+import com.android.settings.location.RecentLocationAccessSeeAllFragment;
 
 import java.util.Map;
 
@@ -44,7 +44,7 @@
                 ProfileSelectManageApplications.class.getName());
         FRAGMENT_MAP.put(LocationSettings.class.getName(),
                 ProfileSelectLocationFragment.class.getName());
-        FRAGMENT_MAP.put(RecentLocationRequestSeeAllFragment.class.getName(),
-                ProfileSelectRecentLocationRequestFragment.class.getName());
+        FRAGMENT_MAP.put(RecentLocationAccessSeeAllFragment.class.getName(),
+                ProfileSelectRecentLocationAccessFragment.class.getName());
     }
 }
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectRecentLocationAccessFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectRecentLocationAccessFragment.java
new file mode 100644
index 0000000..3cb77c5
--- /dev/null
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectRecentLocationAccessFragment.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.dashboard.profileselector;
+
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+
+import com.android.settings.location.RecentLocationAccessSeeAllFragment;
+
+/**
+ * Recent location request page for personal/managed profile.
+ */
+public class ProfileSelectRecentLocationAccessFragment extends ProfileSelectFragment {
+
+    @Override
+    public Fragment[] getFragments() {
+        final Bundle workOnly = new Bundle();
+        workOnly.putInt(EXTRA_PROFILE, ProfileType.WORK);
+        final Fragment workFragment = new RecentLocationAccessSeeAllFragment();
+        workFragment.setArguments(workOnly);
+
+        final Bundle personalOnly = new Bundle();
+        personalOnly.putInt(EXTRA_PROFILE, ProfileType.PERSONAL);
+        final Fragment personalFragment = new RecentLocationAccessSeeAllFragment();
+        personalFragment.setArguments(personalOnly);
+        return new Fragment[]{
+                personalFragment, //0
+                workFragment
+        };
+    }
+}
diff --git a/src/com/android/settings/datausage/AppDataUsageActivity.java b/src/com/android/settings/datausage/AppDataUsageActivity.java
index 82a3a45..48bedce 100644
--- a/src/com/android/settings/datausage/AppDataUsageActivity.java
+++ b/src/com/android/settings/datausage/AppDataUsageActivity.java
@@ -17,7 +17,6 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.util.Log;
 
 import com.android.settings.R;
diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java
index f13e88e..e39e41a 100644
--- a/src/com/android/settings/datausage/DataSaverBackend.java
+++ b/src/com/android/settings/datausage/DataSaverBackend.java
@@ -20,10 +20,7 @@
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.net.INetworkPolicyListener;
 import android.net.NetworkPolicyManager;
-import android.os.RemoteException;
-import android.telephony.SubscriptionPlan;
 import android.util.SparseIntArray;
 
 import com.android.settings.overlay.FeatureFactory;
@@ -180,33 +177,17 @@
 
     }
 
-    private final INetworkPolicyListener mPolicyListener = new INetworkPolicyListener.Stub() {
-        @Override
-        public void onUidRulesChanged(int uid, int uidRules) throws RemoteException {
-        }
-
+    private final NetworkPolicyManager.Listener mPolicyListener =
+            new NetworkPolicyManager.Listener() {
         @Override
         public void onUidPoliciesChanged(final int uid, final int uidPolicies) {
             ThreadUtils.postOnMainThread(() -> handleUidPoliciesChanged(uid, uidPolicies));
         }
 
         @Override
-        public void onMeteredIfacesChanged(String[] strings) throws RemoteException {
-        }
-
-        @Override
-        public void onRestrictBackgroundChanged(final boolean isDataSaving) throws RemoteException {
+        public void onRestrictBackgroundChanged(final boolean isDataSaving) {
             ThreadUtils.postOnMainThread(() -> handleRestrictBackgroundChanged(isDataSaving));
         }
-
-        @Override
-        public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue,
-                int[] networkTypes) {
-        }
-
-        @Override
-        public void onSubscriptionPlansChanged(int subId, SubscriptionPlan[] plans) {
-        }
     };
 
     public interface Listener {
diff --git a/src/com/android/settings/datausage/DataUsageUtils.java b/src/com/android/settings/datausage/DataUsageUtils.java
index da0ca63..7da69cb 100644
--- a/src/com/android/settings/datausage/DataUsageUtils.java
+++ b/src/com/android/settings/datausage/DataUsageUtils.java
@@ -14,13 +14,14 @@
 
 package com.android.settings.datausage;
 
-import static android.net.ConnectivityManager.TYPE_MOBILE;
-import static android.net.ConnectivityManager.TYPE_WIFI;
+import static android.content.pm.PackageManager.FEATURE_ETHERNET;
+import static android.content.pm.PackageManager.FEATURE_WIFI;
 import static android.telephony.TelephonyManager.SIM_STATE_READY;
 
 import android.app.usage.NetworkStats.Bucket;
 import android.app.usage.NetworkStatsManager;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkTemplate;
 import android.os.RemoteException;
@@ -69,8 +70,7 @@
             return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains(ETHERNET);
         }
 
-        final ConnectivityManager conn = context.getSystemService(ConnectivityManager.class);
-        if (!conn.isNetworkSupported(ConnectivityManager.TYPE_ETHERNET)) {
+        if (!context.getPackageManager().hasSystemFeature(FEATURE_ETHERNET)) {
             return false;
         }
 
@@ -96,10 +96,8 @@
      * TODO: This is the opposite to Utils.isWifiOnly(), it should be refactored into 1 method.
      */
     public static boolean hasMobileData(Context context) {
-        final ConnectivityManager connectivityManager =
-                context.getSystemService(ConnectivityManager.class);
-        return connectivityManager != null && connectivityManager
-                .isNetworkSupported(ConnectivityManager.TYPE_MOBILE);
+        final TelephonyManager tele = context.getSystemService(TelephonyManager.class);
+        return tele.isDataCapable();
     }
 
     /**
@@ -128,12 +126,13 @@
                 Log.d(TAG, "hasReadyMobileRadio: subInfo=" + subInfo);
             }
         }
-        final ConnectivityManager conn = context.getSystemService(ConnectivityManager.class);
-        final boolean retVal = conn.isNetworkSupported(TYPE_MOBILE) && isReady;
+
+        final boolean isDataCapable = tele.isDataCapable();
+        final boolean retVal = isDataCapable && isReady;
         if (LOGD) {
             Log.d(TAG, "hasReadyMobileRadio:"
-                    + " conn.isNetworkSupported(TYPE_MOBILE)="
-                    + conn.isNetworkSupported(TYPE_MOBILE)
+                    + " telephonManager.isDataCapable()="
+                    + isDataCapable
                     + " isReady=" + isReady);
         }
         return retVal;
@@ -147,9 +146,8 @@
             return SystemProperties.get(TEST_RADIOS_PROP).contains("wifi");
         }
 
-        final ConnectivityManager connectivityManager =
-                context.getSystemService(ConnectivityManager.class);
-        return connectivityManager != null && connectivityManager.isNetworkSupported(TYPE_WIFI);
+        final PackageManager packageManager = context.getPackageManager();
+        return packageManager != null && packageManager.hasSystemFeature(FEATURE_WIFI);
     }
 
     /**
diff --git a/src/com/android/settings/datausage/OWNERS b/src/com/android/settings/datausage/OWNERS
index 49449ec..d71b165 100644
--- a/src/com/android/settings/datausage/OWNERS
+++ b/src/com/android/settings/datausage/OWNERS
@@ -1,5 +1,7 @@
 # Default reviewers for this and subdirectories.
 andychou@google.com
-goldmanj@google.com
 bonianchen@google.com
+changbetty@google.com
+goldmanj@google.com
+songferngwang@google.com
 wengsu@google.com
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
index 00f4a7b..e3c79a7 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
@@ -42,7 +42,6 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-
 public class UnrestrictedDataAccessPreferenceController extends BasePreferenceController implements
         LifecycleObserver, OnStart, OnStop, OnDestroy, ApplicationsState.Callbacks,
         AppStateBaseBridge.Callback, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
index bbfbb19..0b0fa27 100644
--- a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
+++ b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
@@ -15,10 +15,10 @@
  */
 package com.android.settings.datetime;
 
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_ALLOWED;
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE;
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_SUPPORTED;
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_POSSESSED;
+import static android.app.time.Capabilities.CAPABILITY_NOT_ALLOWED;
+import static android.app.time.Capabilities.CAPABILITY_NOT_APPLICABLE;
+import static android.app.time.Capabilities.CAPABILITY_NOT_SUPPORTED;
+import static android.app.time.Capabilities.CAPABILITY_POSSESSED;
 
 import android.app.time.TimeManager;
 import android.app.time.TimeZoneCapabilities;
@@ -31,7 +31,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.TogglePreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -43,7 +43,7 @@
  * screen.
  */
 public class LocationTimeZoneDetectionPreferenceController
-        extends BasePreferenceController
+        extends TogglePreferenceController
         implements LifecycleObserver, OnStart, OnStop, TimeManager.TimeZoneDetectorListener {
 
     private final TimeManager mTimeManager;
@@ -58,6 +58,22 @@
     }
 
     @Override
+    public boolean isChecked() {
+        TimeZoneCapabilitiesAndConfig capabilitiesAndConfig =
+                mTimeManager.getTimeZoneCapabilitiesAndConfig();
+        TimeZoneConfiguration configuration = capabilitiesAndConfig.getConfiguration();
+        return configuration.isGeoDetectionEnabled();
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        TimeZoneConfiguration configuration = new TimeZoneConfiguration.Builder()
+                .setGeoDetectionEnabled(isChecked)
+                .build();
+        return mTimeManager.updateTimeZoneConfiguration(configuration);
+    }
+
+    @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
@@ -126,10 +142,10 @@
                 summaryResId = R.string.location_time_zone_detection_not_applicable;
             }
         } else if (configureGeoDetectionEnabledCapability == CAPABILITY_POSSESSED) {
-            boolean isGeoDetectionEnabled = configuration.isGeoDetectionEnabled();
-            summaryResId = isGeoDetectionEnabled
-                    ? R.string.location_time_zone_detection_on
-                    : R.string.location_time_zone_detection_off;
+            // If capability is possessed, toggle status already tells all the information needed.
+            // Returning null will make previous text stick on toggling.
+            // See AbstractPreferenceController#refreshSummary.
+            return "";
         } else {
             // This is unexpected: getAvailabilityStatus() should ensure that the UI element isn't
             // even shown for known cases, or the capability is unknown.
diff --git a/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceController.java b/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceController.java
deleted file mode 100644
index c91be7f..0000000
--- a/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceController.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datetime.locationtimezone;
-
-import android.app.time.TimeManager;
-import android.app.time.TimeZoneCapabilitiesAndConfig;
-import android.app.time.TimeZoneConfiguration;
-import android.content.Context;
-
-import com.android.settings.core.TogglePreferenceController;
-
-/**
- * The controller for the "location time zone detection" switch on the location time zone detection
- * screen.
- */
-public class TimeZoneDetectionTogglePreferenceController extends TogglePreferenceController {
-
-    private final TimeManager mTimeManager;
-
-    public TimeZoneDetectionTogglePreferenceController(Context context, String key) {
-        super(context, key);
-        mTimeManager = context.getSystemService(TimeManager.class);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
-    }
-
-    @Override
-    public boolean isChecked() {
-        TimeZoneCapabilitiesAndConfig capabilitiesAndConfig =
-                mTimeManager.getTimeZoneCapabilitiesAndConfig();
-        TimeZoneConfiguration configuration = capabilitiesAndConfig.getConfiguration();
-        return configuration.isGeoDetectionEnabled();
-    }
-
-    @Override
-    public boolean setChecked(boolean isChecked) {
-        TimeZoneConfiguration configuration = new TimeZoneConfiguration.Builder()
-                .setGeoDetectionEnabled(isChecked)
-                .build();
-        return mTimeManager.updateTimeZoneConfiguration(configuration);
-    }
-}
diff --git a/src/com/android/settings/development/AdbIpAddressPreferenceController.java b/src/com/android/settings/development/AdbIpAddressPreferenceController.java
index dbc329e..ce5a851 100644
--- a/src/com/android/settings/development/AdbIpAddressPreferenceController.java
+++ b/src/com/android/settings/development/AdbIpAddressPreferenceController.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.debug.IAdbManager;
 import android.net.ConnectivityManager;
+import android.net.LinkAddress;
 import android.net.LinkProperties;
 import android.net.wifi.WifiManager;
 import android.os.RemoteException;
@@ -126,7 +127,7 @@
      * @return the formatted and newline-separated IP addresses, or null if none.
      */
     private static String getDefaultIpAddresses(ConnectivityManager cm) {
-        LinkProperties prop = cm.getActiveLinkProperties();
+        LinkProperties prop = cm.getLinkProperties(cm.getActiveNetwork());
         return formatIpAddresses(prop);
     }
 
@@ -135,7 +136,7 @@
             return null;
         }
 
-        Iterator<InetAddress> iter = prop.getAllAddresses().iterator();
+        Iterator<LinkAddress> iter = prop.getAllLinkAddresses().iterator();
         // If there are no entries, return null
         if (!iter.hasNext()) {
             return null;
@@ -144,7 +145,7 @@
         // Concatenate all available addresses, newline separated
         StringBuilder addresses = new StringBuilder();
         while (iter.hasNext()) {
-            InetAddress addr = iter.next();
+            InetAddress addr = iter.next().getAddress();
             if (addr instanceof Inet4Address) {
                 // adb only supports ipv4 at the moment
                 addresses.append(addr.getHostAddress());
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 367e7c5..e34ae9b 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -200,8 +200,6 @@
         mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
         mSwitchBar.setTitle(getContext().getString(R.string.developer_options_main_switch_title));
         mSwitchBar.show();
-        mSwitchBar.setTranslationZ(
-                getActivity().findViewById(R.id.main_content).getTranslationZ() + 1);
         mSwitchBarController = new DevelopmentSwitchBarController(
                 this /* DevelopmentSettings */, mSwitchBar, mIsAvailable,
                 getSettingsLifecycle());
diff --git a/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java b/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java
index 78352d3..d5d4025 100644
--- a/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java
+++ b/src/com/android/settings/development/ForcePeakRefreshRatePreferenceController.java
@@ -122,7 +122,7 @@
     private float findPeakRefreshRate(Display.Mode[] modes) {
         float peakRefreshRate = DEFAULT_REFRESH_RATE;
         for (Display.Mode mode : modes) {
-            if (Math.round(mode.getRefreshRate()) > DEFAULT_REFRESH_RATE) {
+            if (Math.round(mode.getRefreshRate()) > peakRefreshRate) {
                 peakRefreshRate = mode.getRefreshRate();
             }
         }
diff --git a/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java b/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java
index 08a450b..39e2276 100644
--- a/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java
+++ b/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreference.java
@@ -97,10 +97,14 @@
             radioButton.setText(mRadioButtonStrings.get(i));
             radioButton.setEnabled(selectableIndex.contains(i));
         }
-        // View will be invisible when all options are enabled.
+        // Initial help information text view
+        final TextView helpTextView = view.findViewById(R.id.bluetooth_audio_codec_help_info);
         if (selectableIndex.size() == mRadioButtonIds.size()) {
-            final TextView helpTextView = view.findViewById(R.id.bluetooth_audio_codec_help_info);
+            // View will be invisible when all options are enabled.
             helpTextView.setVisibility(View.GONE);
+        } else {
+            helpTextView.setText(R.string.bluetooth_select_a2dp_codec_type_help_info);
+            helpTextView.setVisibility(View.VISIBLE);
         }
     }
 
diff --git a/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java b/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java
new file mode 100644
index 0000000..e51f8ad
--- /dev/null
+++ b/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development.transcode;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * The controller (in the Media transcoding settings) indicating the user's preference to show
+ * or hide the transcoding notifications.
+ */
+public class TranscodeNotificationPreferenceController extends TogglePreferenceController {
+    @VisibleForTesting
+    static final String TRANSCODE_NOTIFICATION_SYS_PROP_KEY =
+            "persist.sys.fuse.transcode_notification";
+
+    public TranscodeNotificationPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return SystemProperties.getBoolean(TRANSCODE_NOTIFICATION_SYS_PROP_KEY, true);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        SystemProperties.set(TRANSCODE_NOTIFICATION_SYS_PROP_KEY, String.valueOf(isChecked));
+        return true;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/MigrateEstimateTask.java b/src/com/android/settings/deviceinfo/MigrateEstimateTask.java
index a5790b3..9198ade 100644
--- a/src/com/android/settings/deviceinfo/MigrateEstimateTask.java
+++ b/src/com/android/settings/deviceinfo/MigrateEstimateTask.java
@@ -29,9 +29,9 @@
 import android.os.UserManager;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
-import android.util.Log;
 import android.text.format.DateUtils;
 import android.text.format.Formatter;
+import android.util.Log;
 
 import java.io.IOException;
 import java.util.UUID;
diff --git a/src/com/android/settings/deviceinfo/OWNERS b/src/com/android/settings/deviceinfo/OWNERS
index e6569f4..68cee36 100644
--- a/src/com/android/settings/deviceinfo/OWNERS
+++ b/src/com/android/settings/deviceinfo/OWNERS
@@ -1,7 +1,8 @@
 # Default reviewers for this and subdirectories.
+allenwtsu@google.com
 andychou@google.com
 bonianchen@google.com
 goldmanj@google.com
-allenwtsu@google.com
+songferngwang@google.com
 
 # Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/deviceinfo/PercentageBarChart.java b/src/com/android/settings/deviceinfo/PercentageBarChart.java
index cb25b81..e69de29 100644
--- a/src/com/android/settings/deviceinfo/PercentageBarChart.java
+++ b/src/com/android/settings/deviceinfo/PercentageBarChart.java
@@ -1,160 +0,0 @@
-/*
- * Copyright (C) 2010 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.deviceinfo;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.view.View;
-
-import com.android.settings.R;
-
-import java.util.Collection;
-
-/**
- * Draws a horizontal bar chart with colored slices, each represented by
- * {@link Entry}.
- */
-public class PercentageBarChart extends View {
-    private final Paint mEmptyPaint = new Paint();
-
-    private Collection<Entry> mEntries;
-
-    private int mMinTickWidth = 1;
-
-    public static class Entry implements Comparable<Entry> {
-        public final int order;
-        public final float percentage;
-        public final Paint paint;
-
-        protected Entry(int order, float percentage, Paint paint) {
-            this.order = order;
-            this.percentage = percentage;
-            this.paint = paint;
-        }
-
-        @Override
-        public int compareTo(Entry another) {
-            return order - another.order;
-        }
-    }
-
-    public PercentageBarChart(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.PercentageBarChart);
-        mMinTickWidth = a.getDimensionPixelSize(R.styleable.PercentageBarChart_minTickWidth, 1);
-        int emptyColor = a.getColor(R.styleable.PercentageBarChart_emptyColor, Color.BLACK);
-        a.recycle();
-
-        mEmptyPaint.setColor(emptyColor);
-        mEmptyPaint.setStyle(Paint.Style.FILL);
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-
-        final int left = getPaddingLeft();
-        final int right = getWidth() - getPaddingRight();
-        final int top = getPaddingTop();
-        final int bottom = getHeight() - getPaddingBottom();
-
-        final int width = right - left;
-
-        final boolean isLayoutRtl = isLayoutRtl();
-        if (isLayoutRtl) {
-            float nextX = right;
-
-            if (mEntries != null) {
-                for (final Entry e : mEntries) {
-                    final float entryWidth;
-                    if (e.percentage == 0.0f) {
-                        entryWidth = 0.0f;
-                    } else {
-                        entryWidth = Math.max(mMinTickWidth, width * e.percentage);
-                    }
-
-                    final float lastX = nextX - entryWidth;
-                    if (lastX < left) {
-                        canvas.drawRect(left, top, nextX, bottom, e.paint);
-                        return;
-                    }
-
-                    canvas.drawRect(lastX, top, nextX, bottom, e.paint);
-                    nextX = lastX;
-                }
-            }
-
-            canvas.drawRect(left, top, nextX, bottom, mEmptyPaint);
-        } else {
-            float lastX = left;
-
-            if (mEntries != null) {
-                for (final Entry e : mEntries) {
-                    final float entryWidth;
-                    if (e.percentage == 0.0f) {
-                        entryWidth = 0.0f;
-                    } else {
-                        entryWidth = Math.max(mMinTickWidth, width * e.percentage);
-                    }
-
-                    final float nextX = lastX + entryWidth;
-                    if (nextX > right) {
-                        canvas.drawRect(lastX, top, right, bottom, e.paint);
-                        return;
-                    }
-
-                    canvas.drawRect(lastX, top, nextX, bottom, e.paint);
-                    lastX = nextX;
-                }
-            }
-
-            canvas.drawRect(lastX, top, right, bottom, mEmptyPaint);
-        }
-    }
-
-    /**
-     * Sets the background for this chart. Callers are responsible for later
-     * calling {@link #invalidate()}.
-     */
-    @Override
-    public void setBackgroundColor(int color) {
-        mEmptyPaint.setColor(color);
-    }
-
-    /**
-     * Adds a new slice to the percentage bar chart. Callers are responsible for
-     * later calling {@link #invalidate()}.
-     * 
-     * @param percentage the total width that
-     * @param color the color to draw the entry
-     */
-    public static Entry createEntry(int order, float percentage, int color) {
-        final Paint p = new Paint();
-        p.setColor(color);
-        p.setStyle(Paint.Style.FILL);
-        return new Entry(order, percentage, p);
-    }
-
-    public void setEntries(Collection<Entry> entries) {
-        mEntries = entries;
-    }
-}
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
index 6294ab9..bd7ca82 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -19,7 +19,6 @@
 import android.app.usage.StorageStatsManager;
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.storage.StorageManager;
 import android.os.storage.VolumeInfo;
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java
index 2ade3c2..e2d3d8a 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionSettings.java
@@ -17,18 +17,12 @@
 package com.android.settings.deviceinfo.firmwareversion;
 
 import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.Indexable;
 import com.android.settingslib.search.SearchIndexable;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @SearchIndexable
 public class FirmwareVersionSettings extends DashboardFragment {
 
diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java
index adcbb2a..713eaf4 100644
--- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java
+++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFragment.java
@@ -18,18 +18,12 @@
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.Indexable;
 import com.android.settingslib.search.SearchIndexable;
 
-import java.util.ArrayList;
-import java.util.List;
-
-
 @SearchIndexable
 public class HardwareInfoFragment extends DashboardFragment {
 
diff --git a/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java b/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java
index 0e16474..9465fff 100644
--- a/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java
@@ -27,7 +27,6 @@
 
 import java.util.List;
 
-
 public abstract class LegalPreferenceController extends BasePreferenceController {
     private final PackageManager mPackageManager;
     private Preference mPreference;
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index a6a211e..1e25179 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -44,6 +44,7 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
+import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyDisplayInfo;
 import android.telephony.TelephonyManager;
 import android.telephony.UiccCardInfo;
@@ -170,7 +171,8 @@
         }
     };
 
-    private PhoneStateListener mPhoneStateListener;
+    @VisibleForTesting
+    protected SimStatusDialogTelephonyCallback mTelephonyCallback;
 
     private CellBroadcastServiceConnection mCellBroadcastServiceConnection;
 
@@ -235,7 +237,7 @@
         }
         mTelephonyManager =
             mTelephonyManager.createForSubscriptionId(mSubscriptionInfo.getSubscriptionId());
-        mPhoneStateListener = getPhoneStateListener();
+        mTelephonyCallback = new SimStatusDialogTelephonyCallback();
         updateLatestAreaInfo();
         updateSubscriptionStatus();
     }
@@ -278,11 +280,7 @@
         }
         mTelephonyManager = mTelephonyManager.createForSubscriptionId(
                 mSubscriptionInfo.getSubscriptionId());
-        mTelephonyManager.listen(mPhoneStateListener,
-                PhoneStateListener.LISTEN_DATA_CONNECTION_STATE
-                        | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS
-                        | PhoneStateListener.LISTEN_SERVICE_STATE
-                        | PhoneStateListener.LISTEN_DISPLAY_INFO_CHANGED);
+        mTelephonyManager.registerTelephonyCallback(mContext.getMainExecutor(), mTelephonyCallback);
         mSubscriptionManager.addOnSubscriptionsChangedListener(
                 mContext.getMainExecutor(), mOnSubscriptionsChangedListener);
         registerImsRegistrationCallback(mSubscriptionInfo.getSubscriptionId());
@@ -305,7 +303,7 @@
             if (mIsRegisteredListener) {
                 mSubscriptionManager.removeOnSubscriptionsChangedListener(
                         mOnSubscriptionsChangedListener);
-                mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+                mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
                 if (mShowLatestAreaInfo) {
                     mContext.unregisterReceiver(mAreaInfoReceiver);
                 }
@@ -316,7 +314,7 @@
 
         unregisterImsRegistrationCallback(mSubscriptionInfo.getSubscriptionId());
         mSubscriptionManager.removeOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);
-        mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+        mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
 
         if (mShowLatestAreaInfo) {
             mContext.unregisterReceiver(mAreaInfoReceiver);
@@ -768,33 +766,35 @@
     }
 
     @VisibleForTesting
-    protected PhoneStateListener getPhoneStateListener() {
-        return new PhoneStateListener() {
-            @Override
-            public void onDataConnectionStateChanged(int state) {
-                updateDataState(state);
-                updateNetworkType();
-            }
+    class SimStatusDialogTelephonyCallback extends TelephonyCallback implements
+            TelephonyCallback.DataConnectionStateListener,
+            TelephonyCallback.SignalStrengthsListener,
+            TelephonyCallback.ServiceStateListener,
+            TelephonyCallback.DisplayInfoListener {
+        @Override
+        public void onDataConnectionStateChanged(int state, int networkType) {
+            updateDataState(state);
+            updateNetworkType();
+        }
 
-            @Override
-            public void onSignalStrengthsChanged(SignalStrength signalStrength) {
-                updateSignalStrength(signalStrength);
-            }
+        @Override
+        public void onSignalStrengthsChanged(SignalStrength signalStrength) {
+            updateSignalStrength(signalStrength);
+        }
 
-            @Override
-            public void onServiceStateChanged(ServiceState serviceState) {
-                updateNetworkProvider();
-                updateServiceState(serviceState);
-                updateRoamingStatus(serviceState);
-                mPreviousServiceState = serviceState;
-            }
+        @Override
+        public void onServiceStateChanged(ServiceState serviceState) {
+            updateNetworkProvider();
+            updateServiceState(serviceState);
+            updateRoamingStatus(serviceState);
+            mPreviousServiceState = serviceState;
+        }
 
-            @Override
-            public void onDisplayInfoChanged(@NonNull TelephonyDisplayInfo displayInfo) {
-                mTelephonyDisplayInfo = displayInfo;
-                updateNetworkType();
-            }
-        };
+        @Override
+        public void onDisplayInfoChanged(@NonNull TelephonyDisplayInfo displayInfo) {
+            mTelephonyDisplayInfo = displayInfo;
+            updateNetworkType();
+        }
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceController.java
index 1110ad2..0d21e9c 100644
--- a/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceController.java
+++ b/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceController.java
@@ -23,11 +23,11 @@
 import android.content.pm.PackageManager;
 import android.net.Uri;
 
-import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
+import com.android.settingslib.widget.BannerMessagePreference;
 
 /**
  * The controller of Screen attention's permission warning preference. The preference appears when
@@ -35,8 +35,8 @@
  */
 public class AdaptiveSleepPermissionPreferenceController {
     @VisibleForTesting
-    Preference mPreference;
-    private PackageManager mPackageManager;
+    BannerMessagePreference mPreference;
+    private final PackageManager mPackageManager;
 
     public AdaptiveSleepPermissionPreferenceController(Context context) {
         final String packageName = context.getPackageManager().getAttentionServicePackageName();
@@ -44,13 +44,12 @@
         final Intent intent = new Intent(
                 android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
         intent.setData(Uri.parse("package:" + packageName));
-        mPreference = new Preference(context);
+        mPreference = new BannerMessagePreference(context);
         mPreference.setTitle(R.string.adaptive_sleep_title_no_permission);
         mPreference.setSummary(R.string.adaptive_sleep_summary_no_permission);
-        mPreference.setIcon(R.drawable.ic_info_outline_24);
-        mPreference.setOnPreferenceClickListener(p -> {
+        mPreference.setPositiveButtonText(R.string.adaptive_sleep_manage_permission_button);
+        mPreference.setPositiveButtonOnClickListener(p -> {
             context.startActivity(intent);
-            return true;
         });
     }
 
diff --git a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
index c0c5e63..e0527f9 100644
--- a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
+++ b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
@@ -20,6 +20,7 @@
 import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import android.Manifest;
+import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -33,8 +34,10 @@
 
 import com.android.settings.R;
 import com.android.settings.bluetooth.RestrictionUtils;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -45,6 +48,7 @@
     private RestrictionUtils mRestrictionUtils;
     private PackageManager mPackageManager;
     private Context mContext;
+    private MetricsFeatureProvider mMetricsFeatureProvider;
 
     @VisibleForTesting
     RestrictedSwitchPreference mPreference;
@@ -52,6 +56,7 @@
     public AdaptiveSleepPreferenceController(Context context, RestrictionUtils restrictionUtils) {
         mContext = context;
         mRestrictionUtils = restrictionUtils;
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
         mPreference = new RestrictedSwitchPreference(context);
         mPreference.setTitle(R.string.adaptive_sleep_title);
         mPreference.setSummary(R.string.adaptive_sleep_description);
@@ -60,6 +65,8 @@
         mPreference.setKey(PREFERENCE_KEY);
         mPreference.setOnPreferenceClickListener(preference -> {
             final boolean isChecked = ((RestrictedSwitchPreference) preference).isChecked();
+            mMetricsFeatureProvider.action(context, SettingsEnums.ACTION_SCREEN_ATTENTION_CHANGED,
+                    isChecked);
             Settings.Secure.putInt(context.getContentResolver(),
                     Settings.Secure.ADAPTIVE_SLEEP, isChecked ? 1 : DEFAULT_VALUE);
             return true;
diff --git a/src/com/android/settings/display/AutoRotateSwitchBarController.java b/src/com/android/settings/display/AutoRotateSwitchBarController.java
index 0931a10..e149ccb 100644
--- a/src/com/android/settings/display/AutoRotateSwitchBarController.java
+++ b/src/com/android/settings/display/AutoRotateSwitchBarController.java
@@ -93,7 +93,8 @@
 
     private boolean setRotationLock(boolean isChecked) {
         final boolean isLocked = !isChecked;
-        mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ROTATION_LOCK, isLocked);
+        mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ROTATE_ROTATE_MASTER_TOGGLE,
+                isChecked);
         RotationPolicy.setRotationLock(mContext, isLocked);
         return true;
     }
diff --git a/src/com/android/settings/display/PeakRefreshRatePreferenceController.java b/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
index 10cab1c..36e085a 100644
--- a/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
+++ b/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
@@ -129,10 +129,11 @@
         mDeviceConfigDisplaySettings.stopListening();
     }
 
-    private float findPeakRefreshRate(Display.Mode[] modes) {
+    @VisibleForTesting
+    float findPeakRefreshRate(Display.Mode[] modes) {
         float peakRefreshRate = DEFAULT_REFRESH_RATE;
         for (Display.Mode mode : modes) {
-            if (Math.round(mode.getRefreshRate()) > DEFAULT_REFRESH_RATE) {
+            if (Math.round(mode.getRefreshRate()) > peakRefreshRate) {
                 peakRefreshRate = mode.getRefreshRate();
             }
         }
diff --git a/src/com/android/settings/display/ScreenTimeoutSettings.java b/src/com/android/settings/display/ScreenTimeoutSettings.java
index b518646..3b0d333 100644
--- a/src/com/android/settings/display/ScreenTimeoutSettings.java
+++ b/src/com/android/settings/display/ScreenTimeoutSettings.java
@@ -23,22 +23,26 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
-import android.os.Bundle;
 import android.os.UserHandle;
 import android.provider.Settings;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.ClickableSpan;
 import android.util.Log;
+import android.view.View;
 
+import androidx.annotation.NonNull;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.actionbar.SearchMenuController;
-import com.android.settings.support.actionbar.HelpMenuController;
 import com.android.settings.support.actionbar.HelpResourceProvider;
 import com.android.settings.widget.RadioButtonPickerFragment;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.search.SearchIndexableRaw;
 import com.android.settingslib.widget.CandidateInfo;
@@ -65,6 +69,7 @@
     private CharSequence[] mInitialEntries;
     private CharSequence[] mInitialValues;
     private FooterPreference mPrivacyPreference;
+    private MetricsFeatureProvider mMetricsFeatureProvider;
 
     @VisibleForTesting
     RestrictedLockUtils.EnforcedAdmin mAdmin;
@@ -77,11 +82,10 @@
     @VisibleForTesting
     AdaptiveSleepPreferenceController mAdaptiveSleepController;
 
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        SearchMenuController.init(this /* host */);
-        HelpMenuController.init(this /* host */);
+    public ScreenTimeoutSettings() {
+        super();
+        mMetricsFeatureProvider = FeatureFactory.getFactory(getContext())
+                .getMetricsFeatureProvider();
     }
 
     @Override
@@ -97,15 +101,6 @@
         mPrivacyPreference.setTitle(R.string.adaptive_sleep_privacy);
         mPrivacyPreference.setSelectable(false);
         mPrivacyPreference.setLayoutResource(R.layout.preference_footer);
-
-        mDisableOptionsPreference = new FooterPreference(context);
-        mDisableOptionsPreference.setLayoutResource(R.layout.preference_footer);
-        mDisableOptionsPreference.setTitle(R.string.admin_disabled_other_options);
-        mDisableOptionsPreference.setIcon(R.drawable.ic_info_outline_24dp);
-
-        // The 'disabled by admin' preference should always be at the end of the setting page.
-        mDisableOptionsPreference.setOrder(DEFAULT_ORDER_OF_LOWEST_PREFERENCE);
-        mPrivacyPreference.setOrder(DEFAULT_ORDER_OF_LOWEST_PREFERENCE - 1);
     }
 
     @Override
@@ -138,14 +133,6 @@
         final PreferenceScreen screen = getPreferenceScreen();
         screen.removeAll();
 
-        if (mAdmin != null) {
-            mDisableOptionsPreference.setOnPreferenceClickListener(p -> {
-                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(), mAdmin);
-                return true;
-            });
-            screen.addPreference(mDisableOptionsPreference);
-        }
-
         final List<? extends CandidateInfo> candidateList = getCandidates();
         if (candidateList == null) {
             return;
@@ -165,14 +152,43 @@
         }
 
         if (mAdmin != null) {
-            mDisableOptionsPreference.setOnPreferenceClickListener(p -> {
-                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(), mAdmin);
-                return true;
-            });
+            setupDisabledFooterPreference();
             screen.addPreference(mDisableOptionsPreference);
         }
     }
 
+    @VisibleForTesting
+    void setupDisabledFooterPreference() {
+        final String textDisabledByAdmin = getResources().getString(
+                R.string.admin_disabled_other_options);
+        final String textMoreDetails = getResources().getString(R.string.admin_more_details);
+
+        final SpannableString spannableString = new SpannableString(
+                textDisabledByAdmin + System.lineSeparator() + textMoreDetails);
+        final ClickableSpan clickableSpan = new ClickableSpan() {
+            @Override
+            public void onClick(@NonNull View widget) {
+                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(), mAdmin);
+            }
+        };
+
+        if (textDisabledByAdmin != null && textMoreDetails != null) {
+            spannableString.setSpan(clickableSpan, textDisabledByAdmin.length() + 1,
+                    textDisabledByAdmin.length() + textMoreDetails.length() + 1,
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+
+        mDisableOptionsPreference = new FooterPreference(getContext());
+        mDisableOptionsPreference.setLayoutResource(R.layout.preference_footer);
+        mDisableOptionsPreference.setTitle(spannableString);
+        mDisableOptionsPreference.setSelectable(false);
+        mDisableOptionsPreference.setIcon(R.drawable.ic_info_outline_24dp);
+
+        // The 'disabled by admin' preference should always be at the end of the setting page.
+        mDisableOptionsPreference.setOrder(DEFAULT_ORDER_OF_LOWEST_PREFERENCE);
+        mPrivacyPreference.setOrder(DEFAULT_ORDER_OF_LOWEST_PREFERENCE - 1);
+    }
+
     @Override
     protected String getDefaultKey() {
         return getCurrentSystemScreenTimeout(getContext());
@@ -227,6 +243,8 @@
         try {
             if (context != null) {
                 final long value = Long.parseLong(key);
+                mMetricsFeatureProvider.action(context, SettingsEnums.ACTION_SCREEN_TIMEOUT_CHANGED,
+                        (int) value);
                 Settings.System.putLong(context.getContentResolver(), SCREEN_OFF_TIMEOUT, value);
             }
         } catch (NumberFormatException e) {
diff --git a/src/com/android/settings/display/SmartAutoRotatePermissionController.java b/src/com/android/settings/display/SmartAutoRotatePermissionController.java
index 484db31..caa306d 100644
--- a/src/com/android/settings/display/SmartAutoRotatePermissionController.java
+++ b/src/com/android/settings/display/SmartAutoRotatePermissionController.java
@@ -22,11 +22,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.text.TextUtils;
 
-import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
 
+import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.widget.BannerMessagePreference;
 
 /**
  * The controller of camera based rotate permission warning preference. The preference appears when
@@ -45,19 +46,22 @@
     }
 
     @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final BannerMessagePreference preference =
+                (BannerMessagePreference) screen.findPreference(getPreferenceKey());
+        preference
+                .setPositiveButtonText(R.string.auto_rotate_manage_permission_button)
+                .setPositiveButtonOnClickListener(v -> {
+                    mContext.startActivity(mIntent);
+                });
+    }
+
+    @Override
     @AvailabilityStatus
     public int getAvailabilityStatus() {
         return isRotationResolverServiceAvailable(mContext) && !hasSufficientPermission(mContext)
                 ? AVAILABLE_UNSEARCHABLE
                 : UNSUPPORTED_ON_DEVICE;
     }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (TextUtils.equals(getPreferenceKey(), preference.getKey())) {
-            mContext.startActivity(mIntent);
-            return true;
-        }
-        return super.handlePreferenceTreeClick(preference);
-    }
 }
diff --git a/src/com/android/settings/display/SmartAutoRotatePreferenceController.java b/src/com/android/settings/display/SmartAutoRotatePreferenceController.java
index 01c8379..0e2e013 100644
--- a/src/com/android/settings/display/SmartAutoRotatePreferenceController.java
+++ b/src/com/android/settings/display/SmartAutoRotatePreferenceController.java
@@ -21,7 +21,6 @@
 import android.content.Context;
 import android.os.UserHandle;
 import android.provider.Settings;
-import android.util.Log;
 
 import androidx.preference.Preference;
 
@@ -34,8 +33,6 @@
  */
 public class SmartAutoRotatePreferenceController extends BasePreferenceController {
 
-    private static final String TAG = "SmartAutoRotatePreferenceController";
-
     public SmartAutoRotatePreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
     }
@@ -54,16 +51,12 @@
     public CharSequence getSummary() {
         int activeStringId = R.string.auto_rotate_option_off;
         if (!RotationPolicy.isRotationLocked(mContext)) {
-            try {
-                final int cameraRotate = Settings.Secure.getIntForUser(
-                        mContext.getContentResolver(),
-                        CAMERA_AUTOROTATE,
-                        UserHandle.USER_CURRENT);
-                activeStringId = cameraRotate == 1 ? R.string.auto_rotate_option_face_based
-                        : R.string.auto_rotate_option_on;
-            } catch (Settings.SettingNotFoundException e) {
-                Log.w(TAG, "CAMERA_AUTOROTATE setting not found", e);
-            }
+            final int cameraRotate = Settings.Secure.getIntForUser(
+                    mContext.getContentResolver(),
+                    CAMERA_AUTOROTATE,
+                    0, UserHandle.USER_CURRENT);
+            activeStringId = cameraRotate == 1 ? R.string.auto_rotate_option_face_based
+                    : R.string.auto_rotate_option_on;
         }
         return mContext.getString(activeStringId);
     }
diff --git a/src/com/android/settings/display/TopLevelWallpaperPreferenceController.java b/src/com/android/settings/display/TopLevelWallpaperPreferenceController.java
index 5118b27..7b3d788 100644
--- a/src/com/android/settings/display/TopLevelWallpaperPreferenceController.java
+++ b/src/com/android/settings/display/TopLevelWallpaperPreferenceController.java
@@ -105,7 +105,7 @@
             final Intent intent = new Intent().setComponent(
                     getComponentName()).putExtra(mWallpaperLaunchExtra, LAUNCHED_SETTINGS);
             if (areStylesAvailable()) {
-                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
             }
             preference.getContext().startActivity(intent);
             return true;
diff --git a/src/com/android/settings/emergency/EmergencyActionContentProvider.java b/src/com/android/settings/emergency/EmergencyActionContentProvider.java
new file mode 100644
index 0000000..03f0faf
--- /dev/null
+++ b/src/com/android/settings/emergency/EmergencyActionContentProvider.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.emergency;
+
+import static android.telecom.TelecomManager.EXTRA_CALL_SOURCE;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Binder;
+import android.os.Bundle;
+import android.telecom.PhoneAccount;
+import android.telecom.TelecomManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
+
+/**
+ * ContentProvider to delegate emergency action work
+ */
+public class EmergencyActionContentProvider extends ContentProvider {
+    private static final String TAG = "EmergencyActionContentP";
+
+    private static final String ACTION_START_EMERGENCY_CALL =
+            "com.android.settings.emergency.MAKE_EMERGENCY_CALL";
+
+    @Override
+    public Bundle call(String authority, String method, String arg, Bundle extras) {
+        int uid = Binder.getCallingUid();
+        Log.d(TAG, "calling pid/uid" + Binder.getCallingPid() + "/" + uid);
+        if (!isEmergencyInfo(getContext())) {
+            throw new SecurityException("Uid is not allowed: " + uid);
+        }
+        if (!TextUtils.equals(method, ACTION_START_EMERGENCY_CALL)) {
+            throw new IllegalArgumentException("Unsupported operation");
+        }
+        placeEmergencyCall(getContext());
+        return new Bundle();
+    }
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+            String sortOrder) {
+        return null;
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        return null;
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        return null;
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        return 0;
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        return 0;
+    }
+
+    private static boolean isEmergencyInfo(Context context) {
+        final int callingUid = Binder.getCallingUid();
+        final String callingPackage = context.getPackageManager().getPackagesForUid(callingUid)[0];
+        return TextUtils.equals(callingPackage,
+                context.getString(R.string.config_aosp_emergency_package_name));
+    }
+
+    private static void placeEmergencyCall(Context context) {
+        if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+            Log.i(TAG, "Telephony is not supported, skipping.");
+            return;
+        }
+        Bundle extras = new Bundle();
+        extras.putBoolean(TelecomManager.EXTRA_IS_USER_INTENT_EMERGENCY_CALL, true);
+        extras.putInt(EXTRA_CALL_SOURCE, TelecomManager.CALL_SOURCE_EMERGENCY_SHORTCUT);
+        TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
+        EmergencyNumberUtils emergencyNumberUtils = new EmergencyNumberUtils(context);
+        telecomManager.placeCall(
+                Uri.fromParts(PhoneAccount.SCHEME_TEL, emergencyNumberUtils.getPoliceNumber(),
+                        /* fragment= */ null), extras);
+    }
+}
diff --git a/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java b/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java
index 43ff215..ab2c473 100644
--- a/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java
+++ b/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java
@@ -49,11 +49,11 @@
         final String emergencyGestureSettingsPackageName = context.getResources().getString(
                 R.string.emergency_gesture_settings_package);
         if (!TextUtils.isEmpty(emergencyGestureSettingsPackageName)) {
-            mUseCustomIntent = true;
-            // Use custom intent if it's configured and system can resolve it.
             final Intent intent = new Intent(ACTION_EMERGENCY_GESTURE_SETTINGS)
                     .setPackage(emergencyGestureSettingsPackageName);
             if (canResolveIntent(intent)) {
+                // Use custom intent if it's configured and system can resolve it.
+                mUseCustomIntent = true;
                 mIntent = intent;
             }
         }
diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
index 5599a94..1140291 100644
--- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
+++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.enterprise;
 
+import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_FINANCED;
+
 import android.annotation.NonNull;
 import android.annotation.UserIdInt;
 import android.app.Activity;
@@ -119,24 +121,11 @@
         if (admin == null) {
             return;
         }
-        ImageView supportIconView = root.requireViewById(R.id.admin_support_icon);
-        if (!RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(mActivity, admin)
-                || !RestrictedLockUtils.isCurrentUserOrProfile(mActivity, userId)) {
+
+        setAdminSupportIcon(root, admin, userId);
+
+        if (isNotCurrentUserOrProfile(admin, userId)) {
             admin = null;
-
-            supportIconView.setImageDrawable(
-                    mActivity.getDrawable(com.android.internal.R.drawable.ic_info));
-
-            TypedArray ta = mActivity.obtainStyledAttributes(new int[]{android.R.attr.colorAccent});
-            supportIconView.setImageTintList(ColorStateList.valueOf(ta.getColor(0, 0)));
-            ta.recycle();
-        } else {
-            final Drawable badgedIcon = Utils.getBadgedIcon(
-                    IconDrawableFactory.newInstance(mActivity),
-                    mActivity.getPackageManager(),
-                    admin.getPackageName(),
-                    userId);
-            supportIconView.setImageDrawable(badgedIcon);
         }
 
         setAdminSupportTitle(root, restriction);
@@ -151,12 +140,41 @@
         setAdminSupportDetails(mActivity, root, new EnforcedAdmin(admin, user));
     }
 
+    private boolean isNotCurrentUserOrProfile(ComponentName admin, int userId) {
+        return !RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(mActivity, admin)
+                || !RestrictedLockUtils.isCurrentUserOrProfile(mActivity, userId);
+    }
+
+    @VisibleForTesting
+    void setAdminSupportIcon(View root, ComponentName admin, int userId) {
+        ImageView supportIconView = root.requireViewById(R.id.admin_support_icon);
+        if (isNotCurrentUserOrProfile(admin, userId)) {
+            supportIconView.setImageDrawable(
+                    mActivity.getDrawable(com.android.internal.R.drawable.ic_info));
+
+            TypedArray ta = mActivity.obtainStyledAttributes(new int[]{android.R.attr.colorAccent});
+            supportIconView.setImageTintList(ColorStateList.valueOf(ta.getColor(0, 0)));
+            ta.recycle();
+        } else {
+            final Drawable badgedIcon = Utils.getBadgedIcon(
+                    IconDrawableFactory.newInstance(mActivity),
+                    mActivity.getPackageManager(),
+                    admin.getPackageName(),
+                    userId);
+            supportIconView.setImageDrawable(badgedIcon);
+        }
+    }
+
     @VisibleForTesting
     void setAdminSupportTitle(View root, String restriction) {
         final TextView titleView = root.findViewById(R.id.admin_support_dialog_title);
         if (titleView == null) {
             return;
         }
+        if (isFinancedDevice()) {
+            titleView.setText(R.string.disabled_by_policy_title_financed_device);
+            return;
+        }
         if (restriction == null) {
             titleView.setText(R.string.disabled_by_policy_title);
             return;
@@ -195,6 +213,7 @@
 
         final DevicePolicyManager dpm = (DevicePolicyManager) activity.getSystemService(
                 Context.DEVICE_POLICY_SERVICE);
+        CharSequence supportMessage = null;
         if (!RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(activity,
                 enforcedAdmin.component) || !RestrictedLockUtils.isCurrentUserOrProfile(
                 activity, getEnforcementAdminUserId(enforcedAdmin))) {
@@ -203,15 +222,14 @@
             if (enforcedAdmin.user == null) {
                 enforcedAdmin.user = UserHandle.of(UserHandle.myUserId());
             }
-            CharSequence supportMessage = null;
             if (UserHandle.isSameApp(Process.myUid(), Process.SYSTEM_UID)) {
                 supportMessage = dpm.getShortSupportMessageForUser(enforcedAdmin.component,
                         getEnforcementAdminUserId(enforcedAdmin));
             }
-            if (supportMessage != null) {
-                final TextView textView = root.findViewById(R.id.admin_support_msg);
-                textView.setText(supportMessage);
-            }
+        }
+        final TextView textView = root.findViewById(R.id.admin_support_msg);
+        if (supportMessage != null) {
+            textView.setText(supportMessage);
         }
     }
 
@@ -233,4 +251,10 @@
             activity.startActivity(intent);
         }
     }
+
+    private boolean isFinancedDevice() {
+        final DevicePolicyManager dpm = mActivity.getSystemService(DevicePolicyManager.class);
+        return dpm.isDeviceManaged() && dpm.getDeviceOwnerType(
+                dpm.getDeviceOwnerComponentOnAnyUser()) == DEVICE_OWNER_TYPE_FINANCED;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index e8d5f33..399a84d 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -23,7 +23,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.os.BatteryStats;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.text.TextUtils;
@@ -33,9 +32,6 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.internal.util.ArrayUtils;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
@@ -101,63 +97,46 @@
 
     private String mPackageName;
 
-    @VisibleForTesting
-    static void startBatteryDetailPage(Activity caller, BatteryUtils batteryUtils,
-            InstrumentedPreferenceFragment fragment, BatteryStatsHelper helper, int which,
-            BatteryEntry entry, String usagePercent) {
-        // Initialize mStats if necessary.
-        helper.getStats();
-
+    /**
+     * Launches battery details page for an individual battery consumer.
+     */
+    public static void startBatteryDetailPage(Activity caller,
+            InstrumentedPreferenceFragment fragment, BatteryEntry entry, String usagePercent) {
         final Bundle args = new Bundle();
-        final BatterySipper sipper = entry.sipper;
-        final BatteryStats.Uid uid = sipper.uidObj;
-        final boolean isTypeApp = sipper.drainType == BatterySipper.DrainType.APP;
-
-        final long foregroundTimeMs = isTypeApp ? batteryUtils.getProcessTimeMs(
-                BatteryUtils.StatusType.FOREGROUND, uid, which) : sipper.usageTimeMs;
-        final long backgroundTimeMs = isTypeApp ? batteryUtils.getProcessTimeMs(
-                BatteryUtils.StatusType.BACKGROUND, uid, which) : 0;
-
-        if (ArrayUtils.isEmpty(sipper.mPackages)) {
+        final long foregroundTimeMs = entry.getTimeInForegroundMs();
+        final long backgroundTimeMs = entry.getTimeInBackgroundMs();
+        final String packageName = entry.getDefaultPackageName();
+        if (packageName == null) {
             // populate data for system app
             args.putString(EXTRA_LABEL, entry.getLabel());
             args.putInt(EXTRA_ICON_ID, entry.iconId);
             args.putString(EXTRA_PACKAGE_NAME, null);
         } else {
             // populate data for normal app
-            args.putString(EXTRA_PACKAGE_NAME, entry.defaultPackageName != null
-                    ? entry.defaultPackageName
-                    : sipper.mPackages[0]);
+            args.putString(EXTRA_PACKAGE_NAME, packageName);
         }
 
-        args.putInt(EXTRA_UID, sipper.getUid());
+        args.putInt(EXTRA_UID, entry.getUid());
         args.putLong(EXTRA_BACKGROUND_TIME, backgroundTimeMs);
         args.putLong(EXTRA_FOREGROUND_TIME, foregroundTimeMs);
         args.putString(EXTRA_POWER_USAGE_PERCENT, usagePercent);
-        args.putInt(EXTRA_POWER_USAGE_AMOUNT, (int) sipper.totalPowerMah);
+        args.putInt(EXTRA_POWER_USAGE_AMOUNT, (int) entry.getConsumedPower());
 
         new SubSettingLauncher(caller)
                 .setDestination(AdvancedPowerUsageDetail.class.getName())
                 .setTitleRes(R.string.battery_details_title)
                 .setArguments(args)
                 .setSourceMetricsCategory(fragment.getMetricsCategory())
-                .setUserHandle(new UserHandle(getUserIdToLaunchAdvancePowerUsageDetail(sipper)))
+                .setUserHandle(new UserHandle(getUserIdToLaunchAdvancePowerUsageDetail(entry)))
                 .launch();
     }
 
-    private static @UserIdInt
-    int getUserIdToLaunchAdvancePowerUsageDetail(BatterySipper bs) {
-        if (bs.drainType == BatterySipper.DrainType.USER) {
+    private static @UserIdInt int getUserIdToLaunchAdvancePowerUsageDetail(
+            BatteryEntry batteryEntry) {
+        if (batteryEntry.isUserEntry()) {
             return ActivityManager.getCurrentUser();
         }
-        return UserHandle.getUserId(bs.getUid());
-    }
-
-    public static void startBatteryDetailPage(Activity caller,
-            InstrumentedPreferenceFragment fragment, BatteryStatsHelper helper, int which,
-            BatteryEntry entry, String usagePercent) {
-        startBatteryDetailPage(caller, BatteryUtils.getInstance(caller), fragment, helper, which,
-                entry, usagePercent);
+        return UserHandle.getUserId(batteryEntry.getUid());
     }
 
     public static void startBatteryDetailPage(Activity caller,
diff --git a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
index 1a9db03..47b2a0a 100644
--- a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
@@ -19,18 +19,22 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
-import android.os.BatteryStats;
+import android.os.BatteryConsumer;
+import android.os.BatteryUsageStats;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Process;
+import android.os.SystemBatteryConsumer;
+import android.os.UidBatteryConsumer;
+import android.os.UserBatteryConsumer;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.ArrayMap;
-import android.util.Log;
 import android.util.SparseArray;
 
 import androidx.annotation.VisibleForTesting;
@@ -38,9 +42,6 @@
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatterySipper.DrainType;
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.internal.os.PowerProfile;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -65,35 +66,57 @@
     static final boolean USE_FAKE_DATA = false;
     private static final int MAX_ITEMS_TO_LIST = USE_FAKE_DATA ? 30 : 20;
     private static final int MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP = 10;
-    private static final int STATS_TYPE = BatteryStats.STATS_SINCE_CHARGED;
 
     private final String mPreferenceKey;
     @VisibleForTesting
     PreferenceGroup mAppListGroup;
-    private BatteryStatsHelper mBatteryStatsHelper;
+    private BatteryUsageStats mBatteryUsageStats;
     private ArrayMap<String, Preference> mPreferenceCache;
     @VisibleForTesting
     BatteryUtils mBatteryUtils;
-    private UserManager mUserManager;
-    private SettingsActivity mActivity;
-    private InstrumentedPreferenceFragment mFragment;
+    private final UserManager mUserManager;
+    private final PackageManager mPackageManager;
+    private final SettingsActivity mActivity;
+    private final InstrumentedPreferenceFragment mFragment;
     private Context mPrefContext;
 
-    private Handler mHandler = new Handler(Looper.getMainLooper()) {
+    /**
+     * Battery attribution list configuration.
+     */
+    public interface Config {
+        /**
+         * Returns true if the attribution list should be shown.
+         */
+        boolean shouldShowBatteryAttributionList(Context context);
+    }
+
+    @VisibleForTesting
+    static Config sConfig = new Config() {
+        @Override
+        public boolean shouldShowBatteryAttributionList(Context context) {
+            if (USE_FAKE_DATA) {
+                return true;
+            }
+
+            PowerProfile powerProfile = new PowerProfile(context);
+            return powerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL)
+                    >= MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP;
+        }
+    };
+
+    private final Handler mHandler = new Handler(Looper.getMainLooper()) {
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case BatteryEntry.MSG_UPDATE_NAME_ICON:
                     BatteryEntry entry = (BatteryEntry) msg.obj;
-                    PowerGaugePreference pgp =
-                            (PowerGaugePreference) mAppListGroup.findPreference(
-                                    Integer.toString(entry.sipper.uidObj.getUid()));
+                    PowerGaugePreference pgp = mAppListGroup.findPreference(entry.getKey());
                     if (pgp != null) {
-                        final int userId = UserHandle.getUserId(entry.sipper.getUid());
+                        final int userId = UserHandle.getUserId(entry.getUid());
                         final UserHandle userHandle = new UserHandle(userId);
                         pgp.setIcon(mUserManager.getBadgedIconForUser(entry.getIcon(), userHandle));
                         pgp.setTitle(entry.name);
-                        if (entry.sipper.drainType == DrainType.APP) {
+                        if (entry.isAppEntry()) {
                             pgp.setContentDescription(entry.name);
                         }
                     }
@@ -121,6 +144,7 @@
         mPreferenceKey = preferenceKey;
         mBatteryUtils = BatteryUtils.getInstance(context);
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mPackageManager = context.getPackageManager();
         mActivity = activity;
         mFragment = fragment;
     }
@@ -160,78 +184,63 @@
         if (preference instanceof PowerGaugePreference) {
             PowerGaugePreference pgp = (PowerGaugePreference) preference;
             BatteryEntry entry = pgp.getInfo();
-            AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils,
-                    mFragment, mBatteryStatsHelper, STATS_TYPE, entry, pgp.getPercent());
+            AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity,
+                    mFragment, entry, pgp.getPercent());
             return true;
         }
         return false;
     }
 
-    public void refreshAppListGroup(BatteryStatsHelper statsHelper, boolean showAllApps) {
+    /**
+     * Refreshes the list of battery consumers using the supplied BatteryUsageStats.
+     */
+    public void refreshAppListGroup(BatteryUsageStats batteryUsageStats, boolean showAllApps) {
         if (!isAvailable()) {
             return;
         }
 
-        mBatteryStatsHelper = statsHelper;
+        mBatteryUsageStats = USE_FAKE_DATA ? getFakeStats() : batteryUsageStats;
         mAppListGroup.setTitle(R.string.power_usage_list_summary);
 
-        final PowerProfile powerProfile = statsHelper.getPowerProfile();
-        final BatteryStats stats = statsHelper.getStats();
-        final double averagePower = powerProfile.getAveragePower(PowerProfile.POWER_SCREEN_FULL);
         boolean addedSome = false;
-        final int dischargeAmount = USE_FAKE_DATA ? 5000
-                : stats != null ? stats.getDischargeAmount(STATS_TYPE) : 0;
 
         cacheRemoveAllPrefs(mAppListGroup);
         mAppListGroup.setOrderingAsAdded(false);
 
-        if (averagePower >= MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP || USE_FAKE_DATA) {
-            final List<BatterySipper> usageList = getCoalescedUsageList(
-                    USE_FAKE_DATA ? getFakeStats() : statsHelper.getUsageList());
-            double hiddenPowerMah = showAllApps ? 0 :
-                    mBatteryUtils.removeHiddenBatterySippers(usageList);
-            mBatteryUtils.sortUsageList(usageList);
-
+        if (sConfig.shouldShowBatteryAttributionList(mContext)) {
+            final int dischargePercentage = getDischargePercentage(batteryUsageStats);
+            final List<BatteryEntry> usageList = getCoalescedUsageList(showAllApps);
+            final double totalPower = batteryUsageStats.getConsumedPower();
             final int numSippers = usageList.size();
             for (int i = 0; i < numSippers; i++) {
-                final BatterySipper sipper = usageList.get(i);
-                double totalPower = USE_FAKE_DATA ? 4000 : statsHelper.getTotalPower();
+                final BatteryEntry entry = usageList.get(i);
 
                 final double percentOfTotal = mBatteryUtils.calculateBatteryPercent(
-                        sipper.totalPowerMah, totalPower, hiddenPowerMah, dischargeAmount);
+                        entry.getConsumedPower(), totalPower, dischargePercentage);
 
                 if (((int) (percentOfTotal + .5)) < 1) {
                     continue;
                 }
-                if (shouldHideSipper(sipper)) {
-                    continue;
-                }
-                final UserHandle userHandle = new UserHandle(UserHandle.getUserId(sipper.getUid()));
-                final BatteryEntry entry = new BatteryEntry(mActivity, mHandler, mUserManager,
-                        sipper, null);
+
+                final UserHandle userHandle = new UserHandle(UserHandle.getUserId(entry.getUid()));
                 final Drawable badgedIcon = mUserManager.getBadgedIconForUser(entry.getIcon(),
                         userHandle);
                 final CharSequence contentDescription = mUserManager.getBadgedLabelForUser(
-                        entry.getLabel(),
-                        userHandle);
+                        entry.getLabel(), userHandle);
 
-                final String key = extractKeyFromSipper(sipper);
+                final String key = entry.getKey();
                 PowerGaugePreference pref = (PowerGaugePreference) getCachedPreference(key);
                 if (pref == null) {
                     pref = new PowerGaugePreference(mPrefContext, badgedIcon,
                             contentDescription, entry);
                     pref.setKey(key);
                 }
-                sipper.percent = percentOfTotal;
+                entry.percent = percentOfTotal;
                 pref.setTitle(entry.getLabel());
                 pref.setOrder(i + 1);
                 pref.setPercent(percentOfTotal);
                 pref.shouldShowAnomalyIcon(false);
-                if (sipper.usageTimeMs == 0 && sipper.drainType == DrainType.APP) {
-                    sipper.usageTimeMs = mBatteryUtils.getProcessTimeMs(
-                            BatteryUtils.StatusType.FOREGROUND, sipper.uidObj, STATS_TYPE);
-                }
-                setUsageSummary(pref, sipper);
+                setUsageSummary(pref, entry);
                 addedSome = true;
                 mAppListGroup.addPreference(pref);
                 if (mAppListGroup.getPreferenceCount() - getCachedCount()
@@ -248,6 +257,14 @@
         BatteryEntry.startRequestQueue();
     }
 
+    private int getDischargePercentage(BatteryUsageStats batteryUsageStats) {
+        int dischargePercentage = batteryUsageStats.getDischargePercentage();
+        if (dischargePercentage < 0) {
+            dischargePercentage = 0;
+        }
+        return dischargePercentage;
+    }
+
     /**
      * We want to coalesce some UIDs. For example, dex2oat runs under a shared gid that
      * exists for all users of the same app. We detect this case and merge the power use
@@ -255,129 +272,102 @@
      *
      * @return A sorted list of apps using power.
      */
-    private List<BatterySipper> getCoalescedUsageList(final List<BatterySipper> sippers) {
-        final SparseArray<BatterySipper> uidList = new SparseArray<>();
+    private List<BatteryEntry> getCoalescedUsageList(boolean showAllApps) {
+        final SparseArray<BatteryEntry> batteryEntryList = new SparseArray<>();
 
-        final ArrayList<BatterySipper> results = new ArrayList<>();
-        final int numSippers = sippers.size();
-        for (int i = 0; i < numSippers; i++) {
-            BatterySipper sipper = sippers.get(i);
-            if (sipper.getUid() > 0) {
-                int realUid = sipper.getUid();
+        final ArrayList<BatteryEntry> results = new ArrayList<>();
+        final List<UidBatteryConsumer> uidBatteryConsumers =
+                mBatteryUsageStats.getUidBatteryConsumers();
+        for (int i = 0, size = uidBatteryConsumers.size(); i < size; i++) {
+            final UidBatteryConsumer consumer = uidBatteryConsumers.get(i);
+            int realUid = consumer.getUid();
 
-                // Check if this UID is a shared GID. If so, we combine it with the OWNER's
-                // actual app UID.
-                if (isSharedGid(sipper.getUid())) {
-                    realUid = UserHandle.getUid(UserHandle.USER_SYSTEM,
-                            UserHandle.getAppIdFromSharedAppGid(sipper.getUid()));
-                }
+            // Check if this UID is a shared GID. If so, we combine it with the OWNER's
+            // actual app UID.
+            if (isSharedGid(consumer.getUid())) {
+                realUid = UserHandle.getUid(UserHandle.USER_SYSTEM,
+                        UserHandle.getAppIdFromSharedAppGid(consumer.getUid()));
+            }
 
-                // Check if this UID is a system UID (mediaserver, logd, nfc, drm, etc).
-                if (isSystemUid(realUid)
-                        && !"mediaserver".equals(sipper.packageWithHighestDrain)) {
-                    // Use the system UID for all UIDs running in their own sandbox that
-                    // are not apps. We exclude mediaserver because we already are expected to
-                    // report that as a separate item.
-                    realUid = Process.SYSTEM_UID;
-                }
+            // Check if this UID is a system UID (mediaserver, logd, nfc, drm, etc).
+            if (isSystemUid(realUid)
+                    && !"mediaserver".equals(consumer.getPackageWithHighestDrain())) {
+                // Use the system UID for all UIDs running in their own sandbox that
+                // are not apps. We exclude mediaserver because we already are expected to
+                // report that as a separate item.
+                realUid = Process.SYSTEM_UID;
+            }
 
-                if (realUid != sipper.getUid()) {
-                    // Replace the BatterySipper with a new one with the real UID set.
-                    BatterySipper newSipper = new BatterySipper(sipper.drainType,
-                            new FakeUid(realUid), 0.0);
-                    newSipper.add(sipper);
-                    newSipper.packageWithHighestDrain = sipper.packageWithHighestDrain;
-                    newSipper.mPackages = sipper.mPackages;
-                    sipper = newSipper;
-                }
+            final String[] packages = mPackageManager.getPackagesForUid(consumer.getUid());
+            if (mBatteryUtils.shouldHideUidBatteryConsumerUnconditionally(consumer, packages)) {
+                continue;
+            }
 
-                int index = uidList.indexOfKey(realUid);
-                if (index < 0) {
-                    // New entry.
-                    uidList.put(realUid, sipper);
-                } else {
-                    // Combine BatterySippers if we already have one with this UID.
-                    final BatterySipper existingSipper = uidList.valueAt(index);
-                    existingSipper.add(sipper);
-                    if (existingSipper.packageWithHighestDrain == null
-                            && sipper.packageWithHighestDrain != null) {
-                        existingSipper.packageWithHighestDrain = sipper.packageWithHighestDrain;
-                    }
+            final boolean isHidden = mBatteryUtils.shouldHideUidBatteryConsumer(consumer, packages);
+            if (isHidden && !showAllApps) {
+                continue;
+            }
 
-                    final int existingPackageLen = existingSipper.mPackages != null ?
-                            existingSipper.mPackages.length : 0;
-                    final int newPackageLen = sipper.mPackages != null ?
-                            sipper.mPackages.length : 0;
-                    if (newPackageLen > 0) {
-                        String[] newPackages = new String[existingPackageLen + newPackageLen];
-                        if (existingPackageLen > 0) {
-                            System.arraycopy(existingSipper.mPackages, 0, newPackages, 0,
-                                    existingPackageLen);
-                        }
-                        System.arraycopy(sipper.mPackages, 0, newPackages, existingPackageLen,
-                                newPackageLen);
-                        existingSipper.mPackages = newPackages;
-                    }
-                }
+            final int index = batteryEntryList.indexOfKey(realUid);
+            if (index < 0) {
+                // New entry.
+                batteryEntryList.put(realUid, new BatteryEntry(mActivity, mHandler, mUserManager,
+                        consumer, isHidden, packages, null));
             } else {
-                results.add(sipper);
+                // Combine BatterySippers if we already have one with this UID.
+                final BatteryEntry existingSipper = batteryEntryList.valueAt(index);
+                existingSipper.add(consumer);
             }
         }
 
-        final int numUidSippers = uidList.size();
+        final List<SystemBatteryConsumer> systemBatteryConsumers =
+                mBatteryUsageStats.getSystemBatteryConsumers();
+        for (int i = 0, size = systemBatteryConsumers.size(); i < size; i++) {
+            final SystemBatteryConsumer consumer = systemBatteryConsumers.get(i);
+            if (!showAllApps && mBatteryUtils.shouldHideSystemBatteryConsumer(consumer)) {
+                continue;
+            }
+
+            results.add(new BatteryEntry(mActivity, mHandler, mUserManager,
+                    consumer, /* isHidden */ true, null, null));
+        }
+
+        if (showAllApps) {
+            final List<UserBatteryConsumer> userBatteryConsumers =
+                    mBatteryUsageStats.getUserBatteryConsumers();
+            for (int i = 0, size = userBatteryConsumers.size(); i < size; i++) {
+                final UserBatteryConsumer consumer = userBatteryConsumers.get(i);
+                results.add(new BatteryEntry(mActivity, mHandler, mUserManager,
+                        consumer, /* isHidden */ true, null, null));
+            }
+        }
+
+        final int numUidSippers = batteryEntryList.size();
+
         for (int i = 0; i < numUidSippers; i++) {
-            results.add(uidList.valueAt(i));
+            results.add(batteryEntryList.valueAt(i));
         }
 
         // The sort order must have changed, so re-sort based on total power use.
-        mBatteryUtils.sortUsageList(results);
+        results.sort(BatteryEntry.COMPARATOR);
         return results;
     }
 
     @VisibleForTesting
-    void setUsageSummary(Preference preference, BatterySipper sipper) {
+    void setUsageSummary(Preference preference, BatteryEntry entry) {
         // Only show summary when usage time is longer than one minute
-        final long usageTimeMs = sipper.usageTimeMs;
-        if (shouldShowSummary(sipper) && usageTimeMs >= DateUtils.MINUTE_IN_MILLIS) {
+        final long usageTimeMs = entry.getTimeInForegroundMs();
+        if (shouldShowSummary(entry) && usageTimeMs >= DateUtils.MINUTE_IN_MILLIS) {
             final CharSequence timeSequence =
                     StringUtil.formatElapsedTime(mContext, usageTimeMs, false);
             preference.setSummary(
-                    (sipper.drainType != DrainType.APP || mBatteryUtils.shouldHideSipper(sipper))
+                    entry.isHidden()
                             ? timeSequence
                             : TextUtils.expandTemplate(mContext.getText(R.string.battery_used_for),
                                     timeSequence));
         }
     }
 
-    @VisibleForTesting
-    boolean shouldHideSipper(BatterySipper sipper) {
-        // Don't show over-counted, unaccounted and hidden system module in any condition
-        return sipper.drainType == BatterySipper.DrainType.OVERCOUNTED
-                || sipper.drainType == BatterySipper.DrainType.UNACCOUNTED
-                || mBatteryUtils.isHiddenSystemModule(sipper) || sipper.getUid() < 0;
-    }
-
-    @VisibleForTesting
-    String extractKeyFromSipper(BatterySipper sipper) {
-        if (sipper.uidObj != null) {
-            return extractKeyFromUid(sipper.getUid());
-        } else if (sipper.drainType == DrainType.USER) {
-            return sipper.drainType.toString() + sipper.userId;
-        } else if (sipper.drainType != DrainType.APP) {
-            return sipper.drainType.toString();
-        } else if (sipper.getPackages() != null) {
-            return TextUtils.concat(sipper.getPackages()).toString();
-        } else {
-            Log.w(TAG, "Inappropriate BatterySipper without uid and package names: " + sipper);
-            return "-1";
-        }
-    }
-
-    @VisibleForTesting
-    String extractKeyFromUid(int uid) {
-        return Integer.toString(uid);
-    }
-
     private void cacheRemoveAllPrefs(PreferenceGroup group) {
         mPreferenceCache = new ArrayMap<>();
         final int N = group.getPreferenceCount();
@@ -390,12 +380,12 @@
         }
     }
 
-    private boolean shouldShowSummary(BatterySipper sipper) {
+    private boolean shouldShowSummary(BatteryEntry entry) {
         final CharSequence[] allowlistPackages = mContext.getResources()
                 .getTextArray(R.array.allowlist_hide_summary_in_battery_usage);
-        final String target = sipper.packageWithHighestDrain;
+        final String target = entry.getDefaultPackageName();
 
-        for (CharSequence packageName: allowlistPackages) {
+        for (CharSequence packageName : allowlistPackages) {
             if (TextUtils.equals(target, packageName)) {
                 return false;
             }
@@ -412,39 +402,54 @@
         return appUid >= Process.SYSTEM_UID && appUid < Process.FIRST_APPLICATION_UID;
     }
 
-    private static List<BatterySipper> getFakeStats() {
-        ArrayList<BatterySipper> stats = new ArrayList<>();
-        float use = 5;
-        for (DrainType type : DrainType.values()) {
-            if (type == DrainType.APP) {
-                continue;
-            }
-            stats.add(new BatterySipper(type, null, use));
+    private BatteryUsageStats getFakeStats() {
+        BatteryUsageStats.Builder builder = new BatteryUsageStats.Builder(0, 0)
+                .setDischargePercentage(100);
+
+        float use = 500;
+        for (@SystemBatteryConsumer.DrainType int drainType : new int[]{
+                SystemBatteryConsumer.DRAIN_TYPE_AMBIENT_DISPLAY,
+                SystemBatteryConsumer.DRAIN_TYPE_BLUETOOTH,
+                SystemBatteryConsumer.DRAIN_TYPE_CAMERA,
+                SystemBatteryConsumer.DRAIN_TYPE_FLASHLIGHT,
+                SystemBatteryConsumer.DRAIN_TYPE_IDLE,
+                SystemBatteryConsumer.DRAIN_TYPE_MEMORY,
+                SystemBatteryConsumer.DRAIN_TYPE_MOBILE_RADIO,
+                SystemBatteryConsumer.DRAIN_TYPE_PHONE,
+                SystemBatteryConsumer.DRAIN_TYPE_SCREEN,
+                SystemBatteryConsumer.DRAIN_TYPE_WIFI,
+        }) {
+            builder.getOrCreateSystemBatteryConsumerBuilder(drainType)
+                    .setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, use);
             use += 5;
         }
+
+        use = 450;
         for (int i = 0; i < 100; i++) {
-            stats.add(new BatterySipper(DrainType.APP,
-                    new FakeUid(Process.FIRST_APPLICATION_UID + i), use));
+            builder.getOrCreateUidBatteryConsumerBuilder(
+                            new FakeUid(Process.FIRST_APPLICATION_UID + i))
+                    .setTimeInStateMs(BatteryConsumer.TIME_COMPONENT_USAGE, 10000 + i * 1000)
+                    .setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, use);
+            use += 1;
         }
-        stats.add(new BatterySipper(DrainType.APP,
-                new FakeUid(0), use));
 
         // Simulate dex2oat process.
-        BatterySipper sipper = new BatterySipper(DrainType.APP,
-                new FakeUid(UserHandle.getSharedAppGid(Process.FIRST_APPLICATION_UID)), 10.0f);
-        sipper.packageWithHighestDrain = "dex2oat";
-        stats.add(sipper);
+        builder.getOrCreateUidBatteryConsumerBuilder(new FakeUid(Process.FIRST_APPLICATION_UID))
+                .setTimeInStateMs(BatteryConsumer.TIME_COMPONENT_USAGE, 100000)
+                .setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, 1000.0)
+                .setPackageWithHighestDrain("dex2oat");
 
-        sipper = new BatterySipper(DrainType.APP,
-                new FakeUid(UserHandle.getSharedAppGid(Process.FIRST_APPLICATION_UID + 1)), 10.0f);
-        sipper.packageWithHighestDrain = "dex2oat";
-        stats.add(sipper);
+        builder.getOrCreateUidBatteryConsumerBuilder(new FakeUid(Process.FIRST_APPLICATION_UID + 1))
+                .setTimeInStateMs(BatteryConsumer.TIME_COMPONENT_USAGE, 100000)
+                .setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, 1000.0)
+                .setPackageWithHighestDrain("dex2oat");
 
-        sipper = new BatterySipper(DrainType.APP,
-                new FakeUid(UserHandle.getSharedAppGid(Process.LOG_UID)), 9.0f);
-        stats.add(sipper);
+        builder.getOrCreateUidBatteryConsumerBuilder(
+                        new FakeUid(UserHandle.getSharedAppGid(Process.LOG_UID)))
+                .setTimeInStateMs(BatteryConsumer.TIME_COMPONENT_USAGE, 100000)
+                .setConsumedPower(BatteryConsumer.POWER_COMPONENT_USAGE, 900.0);
 
-        return stats;
+        return builder.build();
     }
 
     private Preference getCachedPreference(String key) {
diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java
index d533c80..9fafefd 100644
--- a/src/com/android/settings/fuelgauge/BatteryEntry.java
+++ b/src/com/android/settings/fuelgauge/BatteryEntry.java
@@ -25,19 +25,24 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.UserInfo;
 import android.graphics.drawable.Drawable;
+import android.os.BatteryConsumer;
 import android.os.Handler;
 import android.os.Process;
 import android.os.RemoteException;
+import android.os.SystemBatteryConsumer;
 import android.os.UidBatteryConsumer;
+import android.os.UserBatteryConsumer;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.Log;
 
-import com.android.internal.os.BatterySipper;
+import androidx.annotation.NonNull;
+
 import com.android.settings.R;
 import com.android.settingslib.Utils;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Locale;
 
@@ -52,9 +57,9 @@
     private static final String TAG = "BatteryEntry";
     private static final String PACKAGE_SYSTEM = "android";
 
-    static final HashMap<String,UidToDetail> sUidCache = new HashMap<String,UidToDetail>();
+    static final HashMap<String, UidToDetail> sUidCache = new HashMap<>();
 
-    static final ArrayList<BatteryEntry> mRequestQueue = new ArrayList<BatteryEntry>();
+    static final ArrayList<BatteryEntry> sRequestQueue = new ArrayList<BatteryEntry>();
     static Handler sHandler;
 
     static Locale sCurrentLocale = null;
@@ -74,15 +79,14 @@
         public void run() {
             while (true) {
                 BatteryEntry be;
-                synchronized (mRequestQueue) {
-                    if (mRequestQueue.isEmpty() || mAbort) {
+                synchronized (sRequestQueue) {
+                    if (sRequestQueue.isEmpty() || mAbort) {
                         if (sHandler != null) {
                             sHandler.sendEmptyMessage(MSG_REPORT_FULLY_DRAWN);
                         }
-                        mRequestQueue.clear();
                         return;
                     }
-                    be = mRequestQueue.remove(0);
+                    be = sRequestQueue.remove(0);
                 }
                 be.loadNameAndIcon();
             }
@@ -93,25 +97,26 @@
 
     public static void startRequestQueue() {
         if (sHandler != null) {
-            synchronized (mRequestQueue) {
-                if (!mRequestQueue.isEmpty()) {
+            synchronized (sRequestQueue) {
+                if (!sRequestQueue.isEmpty()) {
                     if (mRequestThread != null) {
                         mRequestThread.abort();
                     }
                     mRequestThread = new NameAndIconLoader();
                     mRequestThread.setPriority(Thread.MIN_PRIORITY);
                     mRequestThread.start();
-                    mRequestQueue.notify();
+                    sRequestQueue.notify();
                 }
             }
         }
     }
 
     public static void stopRequestQueue() {
-        synchronized (mRequestQueue) {
+        synchronized (sRequestQueue) {
             if (mRequestThread != null) {
                 mRequestThread.abort();
                 mRequestThread = null;
+                sRequestQueue.clear();
                 sHandler = null;
             }
         }
@@ -121,14 +126,19 @@
         sUidCache.clear();
     }
 
-    public final Context context;
-    public final BatterySipper sipper;
-    public final UidBatteryConsumer uidBatteryConsumer;
+    public static final Comparator<BatteryEntry> COMPARATOR =
+            (a, b) -> Double.compare(b.getConsumedPower(), a.getConsumedPower());
+
+    private final Context mContext;
+    private final BatteryConsumer mBatteryConsumer;
+    private final boolean mIsHidden;
 
     public String name;
     public Drawable icon;
     public int iconId; // For passing to the detail screen.
-    public String defaultPackageName;
+    public double percent;
+    private String mDefaultPackageName;
+    private double mConsumedPower;
 
     static class UidToDetail {
         String name;
@@ -136,123 +146,100 @@
         Drawable icon;
     }
 
-    public BatteryEntry(Context context, Handler handler, UserManager um, BatterySipper sipper,
-            UidBatteryConsumer uidBatteryConsumer) {
+    public BatteryEntry(Context context, Handler handler, UserManager um,
+            @NonNull BatteryConsumer batteryConsumer, boolean isHidden, String[] packages,
+            String packageName) {
         sHandler = handler;
-        this.context = context;
-        this.sipper = sipper;
-        this.uidBatteryConsumer = uidBatteryConsumer;
+        mContext = context;
+        mBatteryConsumer = batteryConsumer;
+        mIsHidden = isHidden;
+        mDefaultPackageName = packageName;
+        mConsumedPower = batteryConsumer.getConsumedPower();
 
-        // This condition is met when BatteryEntry is initialized from BatteryUsageStats.
-        // Once the conversion from BatteryStatsHelper is completed, the condition will
-        // always be true and can be removed.
-        if (uidBatteryConsumer != null) {
-            PackageManager pm = context.getPackageManager();
+        if (batteryConsumer instanceof UidBatteryConsumer) {
+            UidBatteryConsumer uidBatteryConsumer = (UidBatteryConsumer) batteryConsumer;
             int uid = uidBatteryConsumer.getUid();
-            String[] packages = pm.getPackagesForUid(uid);
-            // Apps should only have one package
-            if (packages == null || packages.length != 1) {
-                name = uidBatteryConsumer.getPackageWithHighestDrain();
-            } else {
-                defaultPackageName = packages[0];
+            if (mDefaultPackageName == null) {
+                // Apps should only have one package
+                if (packages != null && packages.length == 1) {
+                    mDefaultPackageName = packages[0];
+                } else {
+                    mDefaultPackageName = uidBatteryConsumer.getPackageWithHighestDrain();
+                }
+            }
+            if (mDefaultPackageName != null) {
+                PackageManager pm = context.getPackageManager();
                 try {
                     ApplicationInfo appInfo =
-                            pm.getApplicationInfo(defaultPackageName, 0 /* no flags */);
+                            pm.getApplicationInfo(mDefaultPackageName, 0 /* no flags */);
                     name = pm.getApplicationLabel(appInfo).toString();
                 } catch (NameNotFoundException e) {
                     Log.d(TAG, "PackageManager failed to retrieve ApplicationInfo for: "
-                            + defaultPackageName);
-                    name = defaultPackageName;
+                            + mDefaultPackageName);
+                    name = mDefaultPackageName;
                 }
             }
-            if ((name == null || iconId == 0) && uid != 0) {
-                getQuickNameIconForUid(uid);
-            }
+            getQuickNameIconForUid(uid, packages);
             return;
+        } else if (batteryConsumer instanceof SystemBatteryConsumer) {
+            switch(((SystemBatteryConsumer) batteryConsumer).getDrainType()) {
+                case SystemBatteryConsumer.DRAIN_TYPE_AMBIENT_DISPLAY:
+                    name = context.getResources().getString(R.string.ambient_display_screen_title);
+                    iconId = R.drawable.ic_settings_aod;
+                    break;
+                case SystemBatteryConsumer.DRAIN_TYPE_BLUETOOTH:
+                    name = context.getResources().getString(R.string.power_bluetooth);
+                    iconId = com.android.internal.R.drawable.ic_settings_bluetooth;
+                    break;
+                case SystemBatteryConsumer.DRAIN_TYPE_CAMERA:
+                    name = context.getResources().getString(R.string.power_camera);
+                    iconId = R.drawable.ic_settings_camera;
+                    break;
+                case SystemBatteryConsumer.DRAIN_TYPE_MOBILE_RADIO:
+                    name = context.getResources().getString(R.string.power_cell);
+                    iconId = R.drawable.ic_cellular_1_bar;
+                    break;
+                case SystemBatteryConsumer.DRAIN_TYPE_FLASHLIGHT:
+                    name = context.getResources().getString(R.string.power_flashlight);
+                    iconId = R.drawable.ic_settings_display;
+                    break;
+                case SystemBatteryConsumer.DRAIN_TYPE_PHONE:
+                    name = context.getResources().getString(R.string.power_phone);
+                    iconId = R.drawable.ic_settings_voice_calls;
+                    break;
+                case SystemBatteryConsumer.DRAIN_TYPE_SCREEN:
+                    name = context.getResources().getString(R.string.power_screen);
+                    iconId = R.drawable.ic_settings_display;
+                    break;
+                case SystemBatteryConsumer.DRAIN_TYPE_WIFI:
+                    name = context.getResources().getString(R.string.power_wifi);
+                    iconId = R.drawable.ic_settings_wireless;
+                    break;
+                case SystemBatteryConsumer.DRAIN_TYPE_IDLE:
+                case SystemBatteryConsumer.DRAIN_TYPE_MEMORY:
+                    name = context.getResources().getString(R.string.power_idle);
+                    iconId = R.drawable.ic_settings_phone_idle;
+                    break;
+                case SystemBatteryConsumer.DRAIN_TYPE_CUSTOM:
+                    name = null;
+                    iconId = R.drawable.ic_power_system;
+                    break;
+            }
+        } else if (batteryConsumer instanceof UserBatteryConsumer) {
+            UserInfo info = um.getUserInfo(((UserBatteryConsumer) batteryConsumer).getUserId());
+            if (info != null) {
+                icon = Utils.getUserIcon(context, um, info);
+                name = Utils.getUserLabel(context, info);
+            } else {
+                icon = null;
+                name = context.getResources().getString(
+                        R.string.running_process_item_removed_user_label);
+            }
         }
 
-        switch (sipper.drainType) {
-            case IDLE:
-                name = context.getResources().getString(R.string.power_idle);
-                iconId = R.drawable.ic_settings_phone_idle;
-                break;
-            case CELL:
-                name = context.getResources().getString(R.string.power_cell);
-                iconId = R.drawable.ic_cellular_1_bar;
-                break;
-            case PHONE:
-                name = context.getResources().getString(R.string.power_phone);
-                iconId = R.drawable.ic_settings_voice_calls;
-                break;
-            case WIFI:
-                name = context.getResources().getString(R.string.power_wifi);
-                iconId = R.drawable.ic_settings_wireless;
-                break;
-            case BLUETOOTH:
-                name = context.getResources().getString(R.string.power_bluetooth);
-                iconId = com.android.internal.R.drawable.ic_settings_bluetooth;
-                break;
-            case SCREEN:
-                name = context.getResources().getString(R.string.power_screen);
-                iconId = R.drawable.ic_settings_display;
-                break;
-            case FLASHLIGHT:
-                name = context.getResources().getString(R.string.power_flashlight);
-                iconId = R.drawable.ic_settings_display;
-                break;
-            case APP:
-                PackageManager pm = context.getPackageManager();
-                sipper.mPackages = pm.getPackagesForUid(sipper.uidObj.getUid());
-                // Apps should only have one package
-                if (sipper.mPackages == null || sipper.mPackages.length != 1) {
-                    name = sipper.packageWithHighestDrain;
-                } else {
-                    defaultPackageName = pm.getPackagesForUid(sipper.uidObj.getUid())[0];
-                    try {
-                        ApplicationInfo appInfo =
-                            pm.getApplicationInfo(defaultPackageName, 0 /* no flags */);
-                        name = pm.getApplicationLabel(appInfo).toString();
-                    } catch (NameNotFoundException e) {
-                        Log.d(TAG, "PackageManager failed to retrieve ApplicationInfo for: "
-                            + defaultPackageName);
-                        name = defaultPackageName;
-                    }
-                }
-                break;
-            case USER: {
-                UserInfo info = um.getUserInfo(sipper.userId);
-                if (info != null) {
-                    icon = Utils.getUserIcon(context, um, info);
-                    name = Utils.getUserLabel(context, info);
-                } else {
-                    icon = null;
-                    name = context.getResources().getString(
-                            R.string.running_process_item_removed_user_label);
-                }
-            } break;
-            case UNACCOUNTED:
-                name = context.getResources().getString(R.string.power_unaccounted);
-                iconId = R.drawable.ic_android;
-                break;
-            case OVERCOUNTED:
-                name = context.getResources().getString(R.string.power_overcounted);
-                iconId = R.drawable.ic_android;
-                break;
-            case CAMERA:
-                name = context.getResources().getString(R.string.power_camera);
-                iconId = R.drawable.ic_settings_camera;
-                break;
-            case AMBIENT_DISPLAY:
-                name = context.getResources().getString(R.string.ambient_display_screen_title);
-                iconId = R.drawable.ic_settings_aod;
-                break;
-        }
-        if (iconId > 0) {
+        if (iconId != 0) {
             icon = context.getDrawable(iconId);
         }
-        if ((name == null || iconId == 0) && this.sipper.uidObj != null) {
-            getQuickNameIconForUid(this.sipper.uidObj.getUid());
-        }
     }
 
     public Drawable getIcon() {
@@ -266,7 +253,7 @@
         return name;
     }
 
-    void getQuickNameIconForUid(final int uid) {
+    void getQuickNameIconForUid(final int uid, final String[] packages) {
         // Locale sync to system config in Settings
         final Locale locale = Locale.getDefault();
         if (sCurrentLocale != locale) {
@@ -277,28 +264,29 @@
         final String uidString = Integer.toString(uid);
         if (sUidCache.containsKey(uidString)) {
             UidToDetail utd = sUidCache.get(uidString);
-            defaultPackageName = utd.packageName;
+            mDefaultPackageName = utd.packageName;
             name = utd.name;
             icon = utd.icon;
             return;
         }
-        PackageManager pm = context.getPackageManager();
-        icon = pm.getDefaultActivityIcon();
-        if (pm.getPackagesForUid(uid) == null) {
+
+        if (packages == null || packages.length == 0) {
             if (uid == 0) {
-                name = context.getResources().getString(R.string.process_kernel_label);
+                name = mContext.getResources().getString(R.string.process_kernel_label);
             } else if ("mediaserver".equals(name)) {
-                name = context.getResources().getString(R.string.process_mediaserver_label);
+                name = mContext.getResources().getString(R.string.process_mediaserver_label);
             } else if ("dex2oat".equals(name)) {
-                name = context.getResources().getString(R.string.process_dex2oat_label);
+                name = mContext.getResources().getString(R.string.process_dex2oat_label);
             }
             iconId = R.drawable.ic_power_system;
-            icon = context.getDrawable(iconId);
+            icon = mContext.getDrawable(iconId);
+        } else {
+            icon = mContext.getPackageManager().getDefaultActivityIcon();
         }
 
         if (sHandler != null) {
-            synchronized (mRequestQueue) {
-                mRequestQueue.add(this);
+            synchronized (sRequestQueue) {
+                sRequestQueue.add(this);
             }
         }
     }
@@ -308,17 +296,19 @@
      */
     public void loadNameAndIcon() {
         // Bail out if the current sipper is not an App sipper.
-        if (sipper.uidObj == null) {
+        final int uid = getUid();
+        if (uid == 0 || uid == Process.INVALID_UID) {
             return;
         }
 
-        PackageManager pm = context.getPackageManager();
-        final int uid = sipper.uidObj.getUid();
-        if (sipper.mPackages == null) {
-            sipper.mPackages = pm.getPackagesForUid(uid);
+        final PackageManager pm = mContext.getPackageManager();
+        final String[] packages;
+        if (uid == Process.SYSTEM_UID) {
+            packages = new String[]{PACKAGE_SYSTEM};
+        } else {
+            packages = pm.getPackagesForUid(uid);
         }
 
-        final String[] packages = extractPackagesFromSipper(sipper);
         if (packages != null) {
             String[] packageLabels = new String[packages.length];
             System.arraycopy(packages, 0, packageLabels, 0, packages.length);
@@ -340,7 +330,7 @@
                         packageLabels[i] = label.toString();
                     }
                     if (ai.icon != 0) {
-                        defaultPackageName = packages[i];
+                        mDefaultPackageName = packages[i];
                         icon = ai.loadIcon(pm);
                         break;
                     }
@@ -368,7 +358,7 @@
                             if (nm != null) {
                                 name = nm.toString();
                                 if (pi.applicationInfo.icon != 0) {
-                                    defaultPackageName = pkgName;
+                                    mDefaultPackageName = pkgName;
                                     icon = pi.applicationInfo.loadIcon(pm);
                                 }
                                 break;
@@ -394,17 +384,113 @@
         UidToDetail utd = new UidToDetail();
         utd.name = name;
         utd.icon = icon;
-        utd.packageName = defaultPackageName;
+        utd.packageName = mDefaultPackageName;
+
         sUidCache.put(uidString, utd);
         if (sHandler != null) {
             sHandler.sendMessage(sHandler.obtainMessage(MSG_UPDATE_NAME_ICON, this));
         }
     }
 
-    String[] extractPackagesFromSipper(BatterySipper sipper) {
-        // Only use system package if uid is system uid, so it could find a consistent name and icon
-        return sipper.getUid() == Process.SYSTEM_UID
-                ? new String[]{PACKAGE_SYSTEM}
-                : sipper.mPackages;
+    /**
+     * Returns a string that uniquely identifies this battery consumer.
+     */
+    public String getKey() {
+        if (mBatteryConsumer instanceof UidBatteryConsumer) {
+            return Integer.toString(((UidBatteryConsumer) mBatteryConsumer).getUid());
+        } else if (mBatteryConsumer instanceof SystemBatteryConsumer) {
+            return "S|" + ((SystemBatteryConsumer) mBatteryConsumer).getDrainType();
+        } else if (mBatteryConsumer instanceof UserBatteryConsumer) {
+            return "U|" + ((UserBatteryConsumer) mBatteryConsumer).getUserId();
+        } else {
+            Log.w(TAG, "Unsupported BatteryConsumer: " + mBatteryConsumer);
+            return "";
+        }
+    }
+
+    /**
+     * Returns true if the entry is hidden from the battery usage summary list.
+     */
+    public boolean isHidden() {
+        return mIsHidden;
+    }
+
+    /**
+     * Returns true if this entry describes an app (UID)
+     */
+    public boolean isAppEntry() {
+        return mBatteryConsumer instanceof UidBatteryConsumer;
+    }
+
+    /**
+     * Returns true if this entry describes a User.
+     */
+    public boolean isUserEntry() {
+        if (mBatteryConsumer instanceof UserBatteryConsumer) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Returns the package name that should be used to represent the UID described
+     * by this entry.
+     */
+    public String getDefaultPackageName() {
+        return mDefaultPackageName;
+    }
+
+    /**
+     * Returns the UID of the app described by this entry.
+     */
+    public int getUid() {
+        if (mBatteryConsumer instanceof UidBatteryConsumer) {
+            return ((UidBatteryConsumer) mBatteryConsumer).getUid();
+        } else {
+            return Process.INVALID_UID;
+        }
+    }
+
+    /**
+     * Returns foreground foreground time (in milliseconds) that is attributed to this entry.
+     */
+    public long getTimeInForegroundMs() {
+        if (mBatteryConsumer instanceof UidBatteryConsumer) {
+            return ((UidBatteryConsumer) mBatteryConsumer).getTimeInStateMs(
+                    UidBatteryConsumer.STATE_FOREGROUND);
+        } else {
+            return mBatteryConsumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE);
+        }
+    }
+
+    /**
+     * Returns background activity time (in milliseconds) that is attributed to this entry.
+     */
+    public long getTimeInBackgroundMs() {
+        if (mBatteryConsumer instanceof UidBatteryConsumer) {
+            return ((UidBatteryConsumer) mBatteryConsumer).getTimeInStateMs(
+                    UidBatteryConsumer.STATE_BACKGROUND);
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * Returns total amount of power (in milli-amp-hours) that is attributed to this entry.
+     */
+    public double getConsumedPower() {
+        return mConsumedPower;
+    }
+
+    /**
+     * Adds the consumed power of the supplied BatteryConsumer to this entry. Also
+     * uses its package with highest drain, if necessary.
+     */
+    public void add(BatteryConsumer batteryConsumer) {
+        mConsumedPower += batteryConsumer.getConsumedPower();
+        if (mDefaultPackageName == null && batteryConsumer instanceof UidBatteryConsumer) {
+            mDefaultPackageName =
+                    ((UidBatteryConsumer) batteryConsumer).getPackageWithHighestDrain();
+        }
     }
 }
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 4415e71..51d74d5 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -21,10 +21,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.graphics.ColorFilter;
 import android.icu.text.NumberFormat;
 import android.os.BatteryManager;
 import android.os.PowerManager;
 import android.text.TextUtils;
+import android.widget.ImageView;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceFragmentCompat;
@@ -60,6 +62,7 @@
     private Activity mActivity;
     private PreferenceFragmentCompat mHost;
     private Lifecycle mLifecycle;
+    private ColorFilter mAccentColorFilter;
     private final PowerManager mPowerManager;
 
     public BatteryHeaderPreferenceController(Context context, String key) {
@@ -85,6 +88,9 @@
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mBatteryUsageProgressBarPref = screen.findPreference(getPreferenceKey());
+        mAccentColorFilter = com.android.settings.Utils.getAlphaInvariantColorFilterForColor(
+                com.android.settings.Utils.getColorAttrDefaultColor(
+                        mContext, android.R.attr.colorAccent));
 
         if (com.android.settings.Utils.isBatteryPresent(mContext)) {
             quickUpdateHeaderPreference();
@@ -116,13 +122,12 @@
     }
 
     public void updateHeaderPreference(BatteryInfo info) {
-
-        //TODO(b/179237746): Make progress bar widget support battery state icon
-
         mBatteryUsageProgressBarPref.setUsageSummary(
                 formatBatteryPercentageText(info.batteryLevel));
         mBatteryUsageProgressBarPref.setTotalSummary(generateLabel(info));
         mBatteryUsageProgressBarPref.setPercent(info.batteryLevel, BATTERY_MAX_LEVEL);
+        mBatteryUsageProgressBarPref.setCustomContent(
+                getBatteryIcon(!info.discharging, info.batteryLevel));
     }
 
     /**
@@ -139,14 +144,30 @@
         final boolean discharging =
                 batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
 
-        //TODO(b/179237746): Make progress bar widget support battery state icon
-
         mBatteryUsageProgressBarPref.setUsageSummary(formatBatteryPercentageText(batteryLevel));
         mBatteryUsageProgressBarPref.setPercent(batteryLevel, BATTERY_MAX_LEVEL);
+        mBatteryUsageProgressBarPref.setCustomContent(getBatteryIcon(!discharging, batteryLevel));
     }
 
     private CharSequence formatBatteryPercentageText(int batteryLevel) {
         return TextUtils.expandTemplate(mContext.getText(R.string.battery_header_title_alternate),
                 NumberFormat.getIntegerInstance().format(batteryLevel));
     }
+
+    //TODO(b/179237746): Update the battery icon after receiving final asset
+    private ImageView getBatteryIcon(boolean isCharging, int batteryLevel) {
+        ImageView batteryIcon = new ImageView(mContext);
+
+        if (batteryLevel <= (mContext.getResources().getInteger(
+                com.android.internal.R.integer.config_lowBatteryWarningLevel))) {
+            batteryIcon.setImageResource(R.drawable.ic_battery_low);
+        } else if (isCharging) {
+            batteryIcon.setColorFilter(mAccentColorFilter);
+            batteryIcon.setImageResource(R.drawable.ic_battery_charging_full);
+        } else {
+            batteryIcon = null;
+        }
+
+        return batteryIcon;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
index faca9fb..4d3b9cd 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
@@ -17,15 +17,16 @@
 package com.android.settings.fuelgauge;
 
 import android.content.Context;
+import android.os.BatteryUsageStats;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
 import com.android.settings.widget.UsageView;
 
@@ -50,11 +51,11 @@
         setSelectable(false);
     }
 
-    public void setStats(BatteryStatsHelper batteryStats) {
+    void setBatteryUsageStats(@NonNull BatteryUsageStats batteryUsageStats) {
         BatteryInfo.getBatteryInfo(getContext(), info -> {
             mBatteryInfo = info;
             notifyChanged();
-        }, batteryStats, false);
+        }, batteryUsageStats, false);
     }
 
     public void setBottomSummary(CharSequence text) {
diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index 5d7b325..a4dd86c 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -20,16 +20,18 @@
 import android.content.res.Resources;
 import android.os.AsyncTask;
 import android.os.BatteryManager;
-import android.os.BatteryStats;
 import android.os.BatteryStats.HistoryItem;
-import android.os.Bundle;
+import android.os.BatteryStatsManager;
+import android.os.BatteryUsageStats;
 import android.os.SystemClock;
 import android.text.format.Formatter;
 import android.util.SparseIntArray;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
-import com.android.internal.os.BatteryStatsHelper;
+import com.android.internal.os.BatteryStatsHistoryIterator;
 import com.android.settings.Utils;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.UsageView;
@@ -52,7 +54,7 @@
     public String statusLabel;
     public String suggestionLabel;
     private boolean mCharging;
-    private BatteryStats mStats;
+    private BatteryUsageStats mBatteryUsageStats;
     private static final String LOG_TAG = "BatteryInfo";
     private long timePeriod;
 
@@ -126,7 +128,7 @@
             parserList[i] = parsers[i];
         }
         parserList[parsers.length] = parser;
-        parse(mStats, parserList);
+        parseBatteryHistory(parserList);
         String timeString = context.getString(R.string.charge_length_format,
                 Formatter.formatShortElapsedTime(context, timePeriod));
         String remaining = "";
@@ -137,22 +139,25 @@
         view.setBottomLabels(new CharSequence[]{timeString, remaining});
     }
 
-    public static void getBatteryInfo(final Context context, final Callback callback) {
-        BatteryInfo.getBatteryInfo(context, callback, null /* statsHelper */,
-                false /* shortString */);
-    }
-
     public static void getBatteryInfo(final Context context, final Callback callback,
             boolean shortString) {
-        BatteryInfo.getBatteryInfo(context, callback, null /* statsHelper */, shortString);
+        BatteryInfo.getBatteryInfo(context, callback,  /* batteryUsageStats */ null, shortString);
     }
 
     public static void getBatteryInfo(final Context context, final Callback callback,
-            final BatteryStatsHelper statsHelper, boolean shortString) {
+            @Nullable final BatteryUsageStats batteryUsageStats,
+            boolean shortString) {
         new AsyncTask<Void, Void, BatteryInfo>() {
             @Override
             protected BatteryInfo doInBackground(Void... params) {
-                return getBatteryInfo(context, statsHelper, shortString);
+                BatteryUsageStats stats;
+                if (batteryUsageStats != null) {
+                    stats = batteryUsageStats;
+                } else {
+                    stats = context.getSystemService(BatteryStatsManager.class)
+                            .getBatteryUsageStats();
+                }
+                return getBatteryInfo(context, stats, shortString);
             }
 
             @Override
@@ -164,18 +169,13 @@
         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
+    /**
+     * Creates a BatteryInfo based on BatteryUsageStats
+     */
+    @WorkerThread
     public static BatteryInfo getBatteryInfo(final Context context,
-            final BatteryStatsHelper statsHelper, boolean shortString) {
-        final BatteryStats stats;
+            @NonNull final BatteryUsageStats batteryUsageStats, boolean shortString) {
         final long batteryStatsTime = System.currentTimeMillis();
-        if (statsHelper == null) {
-            final BatteryStatsHelper localStatsHelper = new BatteryStatsHelper(context,
-                    true);
-            localStatsHelper.create((Bundle) null);
-            stats = localStatsHelper.getStats();
-        } else {
-            stats = statsHelper.getStats();
-        }
         BatteryUtils.logRuntime(LOG_TAG, "time for getStats", batteryStatsTime);
 
         final long startTime = System.currentTimeMillis();
@@ -197,38 +197,38 @@
                 Estimate.storeCachedEstimate(context, estimate);
                 BatteryUtils
                         .logRuntime(LOG_TAG, "time for enhanced BatteryInfo", startTime);
-                return BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
+                return BatteryInfo.getBatteryInfo(context, batteryBroadcast, batteryUsageStats,
                         estimate, elapsedRealtimeUs, shortString);
             }
         }
-        final long prediction = discharging
-                ? stats.computeBatteryTimeRemaining(elapsedRealtimeUs) : 0;
+        final long prediction = discharging ? batteryUsageStats.getBatteryTimeRemainingMs() : 0;
         final Estimate estimate = new Estimate(
                 PowerUtil.convertUsToMs(prediction),
                 false, /* isBasedOnUsage */
                 EstimateKt.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN);
         BatteryUtils.logRuntime(LOG_TAG, "time for regular BatteryInfo", startTime);
-        return BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
+        return BatteryInfo.getBatteryInfo(context, batteryBroadcast, batteryUsageStats,
                 estimate, elapsedRealtimeUs, shortString);
     }
 
     @WorkerThread
     public static BatteryInfo getBatteryInfoOld(Context context, Intent batteryBroadcast,
-            BatteryStats stats, long elapsedRealtimeUs, boolean shortString) {
+            BatteryUsageStats batteryUsageStats, long elapsedRealtimeUs, boolean shortString) {
         Estimate estimate = new Estimate(
-                PowerUtil.convertUsToMs(stats.computeBatteryTimeRemaining(elapsedRealtimeUs)),
+                batteryUsageStats.getBatteryTimeRemainingMs(),
                 false,
                 EstimateKt.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN);
-        return getBatteryInfo(context, batteryBroadcast, stats, estimate, elapsedRealtimeUs,
-                shortString);
+        return getBatteryInfo(context, batteryBroadcast, batteryUsageStats, estimate,
+                elapsedRealtimeUs, shortString);
     }
 
     @WorkerThread
     public static BatteryInfo getBatteryInfo(Context context, Intent batteryBroadcast,
-            BatteryStats stats, Estimate estimate, long elapsedRealtimeUs, boolean shortString) {
+            @NonNull BatteryUsageStats batteryUsageStats, Estimate estimate,
+            long elapsedRealtimeUs, boolean shortString) {
         final long startTime = System.currentTimeMillis();
         BatteryInfo info = new BatteryInfo();
-        info.mStats = stats;
+        info.mBatteryUsageStats = batteryUsageStats;
         info.batteryLevel = Utils.getBatteryLevel(batteryBroadcast);
         info.batteryPercentString = Utils.formatPercentage(info.batteryLevel);
         info.mCharging = batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) != 0;
@@ -241,16 +241,17 @@
         if (!info.mCharging) {
             updateBatteryInfoDischarging(context, shortString, estimate, info);
         } else {
-            updateBatteryInfoCharging(context, batteryBroadcast, stats, elapsedRealtimeUs, info);
+            updateBatteryInfoCharging(context, batteryBroadcast, batteryUsageStats,
+                    info);
         }
         BatteryUtils.logRuntime(LOG_TAG, "time for getBatteryInfo", startTime);
         return info;
     }
 
     private static void updateBatteryInfoCharging(Context context, Intent batteryBroadcast,
-            BatteryStats stats, long elapsedRealtimeUs, BatteryInfo info) {
+            BatteryUsageStats stats, BatteryInfo info) {
         final Resources resources = context.getResources();
-        final long chargeTime = stats.computeChargeTimeRemaining(elapsedRealtimeUs);
+        final long chargeTimeMs = stats.getChargeTimeRemainingMs();
         final int status = batteryBroadcast.getIntExtra(BatteryManager.EXTRA_STATUS,
                 BatteryManager.BATTERY_STATUS_UNKNOWN);
         info.discharging = false;
@@ -260,8 +261,8 @@
             int chargingLimitedResId = R.string.power_charging_limited;
             info.chargeLabel =
                 context.getString(chargingLimitedResId, info.batteryPercentString);
-        } else if (chargeTime > 0 && status != BatteryManager.BATTERY_STATUS_FULL) {
-            info.remainingTimeUs = chargeTime;
+        } else if (chargeTimeMs > 0 && status != BatteryManager.BATTERY_STATUS_FULL) {
+            info.remainingTimeUs = PowerUtil.convertMsToUs(chargeTimeMs);
             CharSequence timeString = StringUtil.formatElapsedTime(context,
                     PowerUtil.convertUsToMs(info.remainingTimeUs), false /* withSeconds */);
             int resId = R.string.power_charging_duration;
@@ -313,7 +314,11 @@
         void onParsingDone();
     }
 
-    public static void parse(BatteryStats stats, BatteryDataParser... parsers) {
+    /**
+     * Iterates over battery history included in the BatteryUsageStats that this object
+     * was initialized with.
+     */
+    public void parseBatteryHistory(BatteryDataParser... parsers) {
         long startWalltime = 0;
         long endWalltime = 0;
         long historyStart = 0;
@@ -324,41 +329,41 @@
         int lastInteresting = 0;
         int pos = 0;
         boolean first = true;
-        if (stats.startIteratingHistoryLocked()) {
-            final HistoryItem rec = new HistoryItem();
-            while (stats.getNextHistoryLocked(rec)) {
-                pos++;
-                if (first) {
-                    first = false;
-                    historyStart = rec.time;
+        final BatteryStatsHistoryIterator iterator1 =
+                mBatteryUsageStats.iterateBatteryStatsHistory();
+        final HistoryItem rec = new HistoryItem();
+        while (iterator1.next(rec)) {
+            pos++;
+            if (first) {
+                first = false;
+                historyStart = rec.time;
+            }
+            if (rec.cmd == HistoryItem.CMD_CURRENT_TIME
+                    || rec.cmd == HistoryItem.CMD_RESET) {
+                // If there is a ridiculously large jump in time, then we won't be
+                // able to create a good chart with that data, so just ignore the
+                // times we got before and pretend like our data extends back from
+                // the time we have now.
+                // Also, if we are getting a time change and we are less than 5 minutes
+                // since the start of the history real time, then also use this new
+                // time to compute the base time, since whatever time we had before is
+                // pretty much just noise.
+                if (rec.currentTime > (lastWallTime + (180 * 24 * 60 * 60 * 1000L))
+                        || rec.time < (historyStart + (5 * 60 * 1000L))) {
+                    startWalltime = 0;
                 }
-                if (rec.cmd == HistoryItem.CMD_CURRENT_TIME
-                        || rec.cmd == HistoryItem.CMD_RESET) {
-                    // If there is a ridiculously large jump in time, then we won't be
-                    // able to create a good chart with that data, so just ignore the
-                    // times we got before and pretend like our data extends back from
-                    // the time we have now.
-                    // Also, if we are getting a time change and we are less than 5 minutes
-                    // since the start of the history real time, then also use this new
-                    // time to compute the base time, since whatever time we had before is
-                    // pretty much just noise.
-                    if (rec.currentTime > (lastWallTime + (180 * 24 * 60 * 60 * 1000L))
-                            || rec.time < (historyStart + (5 * 60 * 1000L))) {
-                        startWalltime = 0;
-                    }
-                    lastWallTime = rec.currentTime;
-                    lastRealtime = rec.time;
-                    if (startWalltime == 0) {
-                        startWalltime = lastWallTime - (lastRealtime - historyStart);
-                    }
-                }
-                if (rec.isDeltaData()) {
-                    lastInteresting = pos;
-                    historyEnd = rec.time;
+                lastWallTime = rec.currentTime;
+                lastRealtime = rec.time;
+                if (startWalltime == 0) {
+                    startWalltime = lastWallTime - (lastRealtime - historyStart);
                 }
             }
+            if (rec.isDeltaData()) {
+                lastInteresting = pos;
+                historyEnd = rec.time;
+            }
         }
-        stats.finishIteratingHistoryLocked();
+
         endWalltime = lastWallTime + historyEnd - lastRealtime;
 
         int i = 0;
@@ -367,9 +372,11 @@
         for (int j = 0; j < parsers.length; j++) {
             parsers[j].onParsingStarted(startWalltime, endWalltime);
         }
-        if (endWalltime > startWalltime && stats.startIteratingHistoryLocked()) {
-            final HistoryItem rec = new HistoryItem();
-            while (stats.getNextHistoryLocked(rec) && i < N) {
+
+        if (endWalltime > startWalltime) {
+            final BatteryStatsHistoryIterator iterator2 =
+                    mBatteryUsageStats.iterateBatteryStatsHistory();
+            while (iterator2.next(rec) && i < N) {
                 if (rec.isDeltaData()) {
                     curWalltime += rec.time - lastRealtime;
                     lastRealtime = rec.time;
@@ -404,8 +411,6 @@
             }
         }
 
-        stats.finishIteratingHistoryLocked();
-
         for (int j = 0; j < parsers.length; j++) {
             parsers[j].onParsingDone();
         }
diff --git a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java
index cd87612..ffee462 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java
@@ -19,7 +19,6 @@
 
 import androidx.annotation.VisibleForTesting;
 
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settingslib.utils.AsyncLoaderCompat;
 
 /**
@@ -28,17 +27,14 @@
  * when not available.
  */
 public class BatteryInfoLoader extends AsyncLoaderCompat<BatteryInfo>{
-
-    BatteryStatsHelper mStatsHelper;
     private static final String LOG_TAG = "BatteryInfoLoader";
 
     @VisibleForTesting
-    BatteryUtils batteryUtils;
+    BatteryUtils mBatteryUtils;
 
-    public BatteryInfoLoader(Context context, BatteryStatsHelper batteryStatsHelper) {
+    public BatteryInfoLoader(Context context) {
         super(context);
-        mStatsHelper = batteryStatsHelper;
-        batteryUtils = BatteryUtils.getInstance(context);
+        mBatteryUtils = BatteryUtils.getInstance(context);
     }
 
     @Override
@@ -48,6 +44,6 @@
 
     @Override
     public BatteryInfo loadInBackground() {
-        return batteryUtils.getBatteryInfo(mStatsHelper, LOG_TAG);
+        return mBatteryUtils.getBatteryInfo(LOG_TAG);
     }
 }
diff --git a/src/com/android/settings/fuelgauge/BatterySaverController.java b/src/com/android/settings/fuelgauge/BatterySaverController.java
index a91f85c..fba163d 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverController.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverController.java
@@ -15,14 +15,21 @@
  */
 package com.android.settings.fuelgauge;
 
+import android.content.ContentResolver;
 import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.Looper;
 import android.os.PowerManager;
+import android.provider.Settings;
+import android.provider.Settings.Global;
 
-import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.core.TogglePreferenceController;
-import com.android.settings.widget.PrimarySwitchPreference;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.core.BasePreferenceController;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -31,14 +38,19 @@
 /**
  * Controller to update the battery saver entry preference.
  */
-public class BatterySaverController extends TogglePreferenceController
+public class BatterySaverController extends BasePreferenceController
         implements LifecycleObserver, OnStart, OnStop, BatterySaverReceiver.BatterySaverListener {
     private static final String KEY_BATTERY_SAVER = "battery_saver_summary";
     private final BatterySaverReceiver mBatteryStateChangeReceiver;
     private final PowerManager mPowerManager;
-
-    @VisibleForTesting
-    PrimarySwitchPreference mBatterySaverPref;
+    private Preference mBatterySaverPref;
+    private final ContentObserver mObserver = new ContentObserver(
+            new Handler(Looper.getMainLooper())) {
+        @Override
+        public void onChange(boolean selfChange) {
+            updateSummary();
+        }
+    };
 
     public BatterySaverController(Context context) {
         super(context, KEY_BATTERY_SAVER);
@@ -67,38 +79,54 @@
 
     @Override
     public void onStart() {
+        mContext.getContentResolver().registerContentObserver(
+                Settings.Global.getUriFor(Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL),
+                true /* notifyForDescendants */, mObserver);
 
         mBatteryStateChangeReceiver.setListening(true);
+        updateSummary();
     }
 
     @Override
     public void onStop() {
+        mContext.getContentResolver().unregisterContentObserver(mObserver);
         mBatteryStateChangeReceiver.setListening(false);
     }
 
     @Override
-    public void onPowerSaveModeChanged() {
-        final boolean isChecked = isChecked();
-        if (mBatterySaverPref != null && mBatterySaverPref.isChecked() != isChecked) {
-            mBatterySaverPref.setChecked(isChecked);
+    public CharSequence getSummary() {
+        final boolean isPowerSaveOn = mPowerManager.isPowerSaveMode();
+        if (isPowerSaveOn) {
+            return mContext.getString(R.string.battery_saver_on_summary);
         }
+
+        final ContentResolver resolver = mContext.getContentResolver();
+        final int mode = Settings.Global.getInt(resolver,
+                Global.AUTOMATIC_POWER_SAVE_MODE, PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
+        if (mode == PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE) {
+            final int percent = Settings.Global.getInt(resolver,
+                    Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
+            return percent != 0 ?
+                    mContext.getString(R.string.battery_saver_off_scheduled_summary,
+                            Utils.formatPercentage(percent)) :
+                    mContext.getString(R.string.battery_saver_off_summary);
+        } else {
+            return mContext.getString(R.string.battery_saver_auto_routine);
+        }
+    }
+
+    private void updateSummary() {
+        if (mBatterySaverPref != null) {
+            mBatterySaverPref.setSummary(getSummary());
+        }
+    }
+
+    @Override
+    public void onPowerSaveModeChanged() {
+        updateSummary();
     }
 
     @Override
     public void onBatteryChanged(boolean pluggedIn) {
-        if (mBatterySaverPref != null) {
-            mBatterySaverPref.setSwitchEnabled(!pluggedIn);
-        }
-    }
-
-    @Override
-    public boolean isChecked() {
-        return mPowerManager.isPowerSaveMode();
-    }
-
-    @Override
-    public boolean setChecked(boolean stateOn) {
-        return BatterySaverUtils.setPowerSaveMode(mContext, stateOn,
-            false /* needFirstTimeWarning */);
     }
 }
diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java
deleted file mode 100644
index 5de83d3..0000000
--- a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge;
-
-import android.content.Context;
-import android.os.UserManager;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settingslib.utils.AsyncLoaderCompat;
-
-/**
- * Loader to get new {@link BatteryStatsHelper} in the background
- */
-public class BatteryStatsHelperLoader extends AsyncLoaderCompat<BatteryStatsHelper> {
-    @VisibleForTesting
-    UserManager mUserManager;
-    @VisibleForTesting
-    BatteryUtils mBatteryUtils;
-
-    public BatteryStatsHelperLoader(Context context) {
-        super(context);
-        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        mBatteryUtils = BatteryUtils.getInstance(context);
-    }
-
-    @Override
-    public BatteryStatsHelper loadInBackground() {
-        Context context = getContext();
-        final BatteryStatsHelper statsHelper = new BatteryStatsHelper(context,
-                true /* collectBatteryBroadcast */);
-        mBatteryUtils.initBatteryStatsHelper(statsHelper, null /* bundle */, mUserManager);
-
-        return statsHelper;
-    }
-
-    @Override
-    protected void onDiscardResult(BatteryStatsHelper result) {
-
-    }
-
-}
diff --git a/src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java b/src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java
index 5b184a9..d35ef82 100644
--- a/src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java
+++ b/src/com/android/settings/fuelgauge/BatteryUsageStatsLoader.java
@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.os.BatteryStatsManager;
 import android.os.BatteryUsageStats;
+import android.os.BatteryUsageStatsQuery;
 
 import com.android.settingslib.utils.AsyncLoaderCompat;
 
@@ -27,15 +28,21 @@
  */
 public class BatteryUsageStatsLoader extends AsyncLoaderCompat<BatteryUsageStats> {
     private final BatteryStatsManager mBatteryStatsManager;
+    private final boolean mIncludeBatteryHistory;
 
-    public BatteryUsageStatsLoader(Context context) {
+    public BatteryUsageStatsLoader(Context context, boolean includeBatteryHistory) {
         super(context);
         mBatteryStatsManager = context.getSystemService(BatteryStatsManager.class);
+        mIncludeBatteryHistory = includeBatteryHistory;
     }
 
     @Override
     public BatteryUsageStats loadInBackground() {
-        return mBatteryStatsManager.getBatteryUsageStats();
+        final BatteryUsageStatsQuery.Builder builder = new BatteryUsageStatsQuery.Builder();
+        if (mIncludeBatteryHistory) {
+            builder.includeBatteryHistory();
+        }
+        return mBatteryStatsManager.getBatteryUsageStats(builder.build());
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index 5b1f096..1645590 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -24,23 +24,22 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.BatteryStats;
+import android.os.BatteryStatsManager;
+import android.os.BatteryUsageStats;
+import android.os.BatteryUsageStatsQuery;
 import android.os.Build;
-import android.os.Bundle;
 import android.os.Process;
+import android.os.SystemBatteryConsumer;
 import android.os.SystemClock;
+import android.os.UidBatteryConsumer;
 import android.os.UserHandle;
-import android.os.UserManager;
-import android.text.format.DateUtils;
 import android.util.Log;
-import android.util.SparseLongArray;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
 
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.internal.util.ArrayUtils;
 import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper;
 import com.android.settings.fuelgauge.batterytip.AnomalyInfo;
@@ -58,8 +57,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.time.Duration;
 import java.time.Instant;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -84,9 +81,8 @@
 
     private static final String TAG = "BatteryUtils";
 
-    private static final int MIN_POWER_THRESHOLD_MILLI_AMP = 5;
+    private static final double MIN_POWER_THRESHOLD_MILLI_AMP_HOURS = 0.002;
 
-    private static final int SECONDS_IN_HOUR = 60 * 60;
     private static BatteryUtils sInstance;
     private PackageManager mPackageManager;
 
@@ -103,7 +99,7 @@
     }
 
     @VisibleForTesting
-    BatteryUtils(Context context) {
+    public BatteryUtils(Context context) {
         mContext = context;
         mPackageManager = context.getPackageManager();
         mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
@@ -171,111 +167,61 @@
     }
 
     /**
-     * Remove the {@link BatterySipper} that we should hide and smear the screen usage based on
-     * foreground activity time.
-     *
-     * @param sippers sipper list that need to check and remove
-     * @return the total power of the hidden items of {@link BatterySipper}
-     * for proportional smearing
+     * Returns true if the specified battery consumer should be excluded from the summary
+     * battery consumption list.
      */
-    public double removeHiddenBatterySippers(List<BatterySipper> sippers) {
-        double proportionalSmearPowerMah = 0;
-        BatterySipper screenSipper = null;
-        for (int i = sippers.size() - 1; i >= 0; i--) {
-            final BatterySipper sipper = sippers.get(i);
-            if (shouldHideSipper(sipper)) {
-                sippers.remove(i);
-                if (sipper.drainType != BatterySipper.DrainType.OVERCOUNTED
-                        && sipper.drainType != BatterySipper.DrainType.SCREEN
-                        && sipper.drainType != BatterySipper.DrainType.UNACCOUNTED
-                        && sipper.drainType != BatterySipper.DrainType.BLUETOOTH
-                        && sipper.drainType != BatterySipper.DrainType.WIFI
-                        && sipper.drainType != BatterySipper.DrainType.IDLE
-                        && !isHiddenSystemModule(sipper)) {
-                    // Don't add it if it is overcounted, unaccounted, wifi, bluetooth, screen
-                    // or hidden system modules
-                    proportionalSmearPowerMah += sipper.totalPowerMah;
-                }
-            }
-
-            if (sipper.drainType == BatterySipper.DrainType.SCREEN) {
-                screenSipper = sipper;
-            }
-        }
-
-        smearScreenBatterySipper(sippers, screenSipper);
-
-        return proportionalSmearPowerMah;
+    public boolean shouldHideUidBatteryConsumer(UidBatteryConsumer consumer) {
+        return shouldHideUidBatteryConsumer(consumer,
+                mPackageManager.getPackagesForUid(consumer.getUid()));
     }
 
     /**
-     * Smear the screen on power usage among {@code sippers}, based on ratio of foreground activity
-     * time.
+     * Returns true if the specified battery consumer should be excluded from the summary
+     * battery consumption list.
      */
-    @VisibleForTesting
-    void smearScreenBatterySipper(List<BatterySipper> sippers, BatterySipper screenSipper) {
-        long totalActivityTimeMs = 0;
-        final SparseLongArray activityTimeArray = new SparseLongArray();
-        for (int i = 0, size = sippers.size(); i < size; i++) {
-            final BatteryStats.Uid uid = sippers.get(i).uidObj;
-            if (uid != null) {
-                final long timeMs = getProcessTimeMs(StatusType.SCREEN_USAGE, uid,
-                        BatteryStats.STATS_SINCE_CHARGED);
-                activityTimeArray.put(uid.getUid(), timeMs);
-                totalActivityTimeMs += timeMs;
-            }
-        }
+    public boolean shouldHideUidBatteryConsumer(UidBatteryConsumer consumer, String[] packages) {
+        return consumer.getConsumedPower() < MIN_POWER_THRESHOLD_MILLI_AMP_HOURS
+                || mPowerUsageFeatureProvider.isTypeSystem(consumer.getUid(), packages)
+                || shouldHideUidBatteryConsumerUnconditionally(consumer, packages);
+    }
 
-        if (totalActivityTimeMs >= 10 * DateUtils.MINUTE_IN_MILLIS) {
-            if (screenSipper == null) {
-                Log.e(TAG, "screen sipper is null even when app screen time is not zero");
-                return;
-            }
+    /**
+     * Returns true if the specified battery consumer should be excluded from
+     * battery consumption lists, either short or full.
+     */
+    boolean shouldHideUidBatteryConsumerUnconditionally(UidBatteryConsumer consumer,
+            String[] packages) {
+        return consumer.getUid() < 0 || isHiddenSystemModule(packages);
+    }
 
-            final double screenPowerMah = screenSipper.totalPowerMah;
-            for (int i = 0, size = sippers.size(); i < size; i++) {
-                final BatterySipper sipper = sippers.get(i);
-                sipper.totalPowerMah += screenPowerMah * activityTimeArray.get(sipper.getUid(), 0)
-                        / totalActivityTimeMs;
-            }
+    /**
+     * Returns true if the specified battery consumer should be excluded from the summary
+     * battery consumption list.
+     */
+    public boolean shouldHideSystemBatteryConsumer(SystemBatteryConsumer consumer) {
+        switch (consumer.getDrainType()) {
+            case SystemBatteryConsumer.DRAIN_TYPE_IDLE:
+            case SystemBatteryConsumer.DRAIN_TYPE_MOBILE_RADIO:
+            case SystemBatteryConsumer.DRAIN_TYPE_SCREEN:
+            case SystemBatteryConsumer.DRAIN_TYPE_BLUETOOTH:
+            case SystemBatteryConsumer.DRAIN_TYPE_WIFI:
+                return true;
+            default:
+                return consumer.getConsumedPower() < MIN_POWER_THRESHOLD_MILLI_AMP_HOURS;
         }
     }
 
     /**
-     * Check whether we should hide the battery sipper.
+     * Returns true if one the specified packages belongs to a hidden system module.
      */
-    public boolean shouldHideSipper(BatterySipper sipper) {
-        final BatterySipper.DrainType drainType = sipper.drainType;
-
-        return drainType == BatterySipper.DrainType.IDLE
-                || drainType == BatterySipper.DrainType.CELL
-                || drainType == BatterySipper.DrainType.SCREEN
-                || drainType == BatterySipper.DrainType.UNACCOUNTED
-                || drainType == BatterySipper.DrainType.OVERCOUNTED
-                || drainType == BatterySipper.DrainType.BLUETOOTH
-                || drainType == BatterySipper.DrainType.WIFI
-                || (sipper.totalPowerMah * SECONDS_IN_HOUR) < MIN_POWER_THRESHOLD_MILLI_AMP
-                || mPowerUsageFeatureProvider.isTypeService(sipper)
-                || mPowerUsageFeatureProvider.isTypeSystem(sipper)
-                || isHiddenSystemModule(sipper);
-    }
-
-    /**
-     * Return {@code true} if one of packages in {@code sipper} is hidden system modules
-     */
-    public boolean isHiddenSystemModule(BatterySipper sipper) {
-        if (sipper.uidObj == null) {
-            return false;
-        }
-        sipper.mPackages = mPackageManager.getPackagesForUid(sipper.getUid());
-        if (sipper.mPackages != null) {
-            for (int i = 0, length = sipper.mPackages.length; i < length; i++) {
-                if (AppUtils.isHiddenSystemModule(mContext, sipper.mPackages[i])) {
+    public boolean isHiddenSystemModule(String[] packages) {
+        if (packages != null) {
+            for (int i = 0, length = packages.length; i < length; i++) {
+                if (AppUtils.isHiddenSystemModule(mContext, packages[i])) {
                     return true;
                 }
             }
         }
-
         return false;
     }
 
@@ -284,36 +230,17 @@
      *
      * @param powerUsageMah   power used by the app
      * @param totalPowerMah   total power used in the system
-     * @param hiddenPowerMah  power used by no-actionable app that we want to hide, i.e. Screen,
-     *                        Android OS.
      * @param dischargeAmount The discharge amount calculated by {@link BatteryStats}
      * @return A percentage value scaled by {@paramref dischargeAmount}
      * @see BatteryStats#getDischargeAmount(int)
      */
     public double calculateBatteryPercent(double powerUsageMah, double totalPowerMah,
-            double hiddenPowerMah, int dischargeAmount) {
+            int dischargeAmount) {
         if (totalPowerMah == 0) {
             return 0;
         }
 
-        return (powerUsageMah / (totalPowerMah - hiddenPowerMah)) * dischargeAmount;
-    }
-
-    /**
-     * Calculate the whole running time in the state {@code statsType}
-     *
-     * @param batteryStatsHelper utility class that contains the data
-     * @param statsType          state that we want to calculate the time for
-     * @return the running time in millis
-     */
-    public long calculateRunningTimeBasedOnStatsType(BatteryStatsHelper batteryStatsHelper,
-            int statsType) {
-        final long elapsedRealtimeUs = PowerUtil.convertMsToUs(
-                SystemClock.elapsedRealtime());
-        // Return the battery time (millisecond) on status mStatsType
-        return PowerUtil.convertUsToMs(
-                batteryStatsHelper.getStats().computeBatteryRealtime(elapsedRealtimeUs, statsType));
-
+        return (powerUsageMah / totalPowerMah) * dischargeAmount;
     }
 
     /**
@@ -363,40 +290,15 @@
     }
 
     /**
-     * Sort the {@code usageList} based on {@link BatterySipper#totalPowerMah}
-     */
-    public void sortUsageList(List<BatterySipper> usageList) {
-        Collections.sort(usageList, new Comparator<BatterySipper>() {
-            @Override
-            public int compare(BatterySipper a, BatterySipper b) {
-                return Double.compare(b.totalPowerMah, a.totalPowerMah);
-            }
-        });
-    }
-
-    /**
      * Calculate the time since last full charge, including the device off time
      *
-     * @param batteryStatsHelper utility class that contains the data
+     * @param batteryUsageStats  class that contains the data
      * @param currentTimeMs      current wall time
      * @return time in millis
      */
-    public long calculateLastFullChargeTime(BatteryStatsHelper batteryStatsHelper,
+    public long calculateLastFullChargeTime(BatteryUsageStats batteryUsageStats,
             long currentTimeMs) {
-        return currentTimeMs - batteryStatsHelper.getStats().getStartClockTime();
-
-    }
-
-    /**
-     * Calculate the screen usage time since last full charge.
-     *
-     * @param batteryStatsHelper utility class that contains the screen usage data
-     * @return time in millis
-     */
-    public long calculateScreenUsageTime(BatteryStatsHelper batteryStatsHelper) {
-        final BatterySipper sipper = findBatterySipperByType(
-                batteryStatsHelper.getUsageList(), BatterySipper.DrainType.SCREEN);
-        return sipper != null ? sipper.usageTimeMs : 0;
+        return currentTimeMs - batteryUsageStats.getStatsStartRealtime();
     }
 
     public static void logRuntime(String tag, String message, long startTime) {
@@ -464,37 +366,36 @@
         }
     }
 
-    public void initBatteryStatsHelper(BatteryStatsHelper statsHelper, Bundle bundle,
-            UserManager userManager) {
-        statsHelper.create(bundle);
-        statsHelper.clearStats();
-        statsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, userManager.getUserProfiles());
-    }
-
     @WorkerThread
-    public BatteryInfo getBatteryInfo(final BatteryStatsHelper statsHelper, final String tag) {
+    public BatteryInfo getBatteryInfo(final String tag) {
+        final BatteryStatsManager systemService = mContext.getSystemService(
+                BatteryStatsManager.class);
+        final BatteryUsageStats batteryUsageStats = systemService.getBatteryUsageStats(
+                new BatteryUsageStatsQuery.Builder().includeBatteryHistory().build());
+
         final long startTime = System.currentTimeMillis();
 
         // Stuff we always need to get BatteryInfo
         final Intent batteryBroadcast = mContext.registerReceiver(null,
                 new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+
         final long elapsedRealtimeUs = PowerUtil.convertMsToUs(
                 SystemClock.elapsedRealtime());
-        final BatteryStats stats = statsHelper.getStats();
+
         BatteryInfo batteryInfo;
         Estimate estimate = getEnhancedEstimate();
 
         // couldn't get estimate from cache or provider, use fallback
         if (estimate == null) {
             estimate = new Estimate(
-                    PowerUtil.convertUsToMs(stats.computeBatteryTimeRemaining(elapsedRealtimeUs)),
+                    PowerUtil.convertUsToMs(batteryUsageStats.getBatteryTimeRemainingMs()),
                     false /* isBasedOnUsage */,
                     EstimateKt.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN);
         }
 
         BatteryUtils.logRuntime(tag, "BatteryInfoLoader post query", startTime);
-        batteryInfo = BatteryInfo.getBatteryInfo(mContext, batteryBroadcast, stats,
-                estimate, elapsedRealtimeUs, false /* shortString */);
+        batteryInfo = BatteryInfo.getBatteryInfo(mContext, batteryBroadcast,
+                batteryUsageStats, estimate, elapsedRealtimeUs, false /* shortString */);
         BatteryUtils.logRuntime(tag, "BatteryInfoLoader.loadInBackground", startTime);
 
         return batteryInfo;
@@ -517,20 +418,6 @@
         return estimate;
     }
 
-    /**
-     * Find the {@link BatterySipper} with the corresponding {@link BatterySipper.DrainType}
-     */
-    public BatterySipper findBatterySipperByType(List<BatterySipper> usageList,
-            BatterySipper.DrainType type) {
-        for (int i = 0, size = usageList.size(); i < size; i++) {
-            final BatterySipper sipper = usageList.get(i);
-            if (sipper.drainType == type) {
-                return sipper;
-            }
-        }
-        return null;
-    }
-
     private boolean isDataCorrupted() {
         return mPackageManager == null || mAppOpsManager == null;
     }
@@ -665,4 +552,3 @@
         return -1L;
     }
 }
-
diff --git a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
index c8dbb59..0623bcb 100644
--- a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
+++ b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
@@ -19,6 +19,8 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.BatteryStats;
+import android.os.BatteryStatsManager;
+import android.os.BatteryUsageStats;
 import android.os.SystemClock;
 
 import com.android.internal.os.BatteryStatsHelper;
@@ -56,15 +58,17 @@
         Intent batteryBroadcast = getContext().registerReceiver(null,
                 new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
         BatteryStats stats = mStatsHelper.getStats();
-
+        BatteryUsageStats batteryUsageStats =
+                context.getSystemService(BatteryStatsManager.class).getBatteryUsageStats();
         BatteryInfo oldinfo = BatteryInfo.getBatteryInfoOld(getContext(), batteryBroadcast,
-                stats, elapsedRealtimeUs, false);
+                batteryUsageStats, elapsedRealtimeUs, false);
 
         Estimate estimate = powerUsageFeatureProvider.getEnhancedBatteryPrediction(context);
         if (estimate == null) {
             estimate = new Estimate(0, false, EstimateKt.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN);
         }
-        BatteryInfo newInfo = BatteryInfo.getBatteryInfo(getContext(), batteryBroadcast, stats,
+        BatteryInfo newInfo = BatteryInfo.getBatteryInfo(getContext(), batteryBroadcast,
+                batteryUsageStats,
                 estimate, elapsedRealtimeUs, false);
 
         List<BatteryInfo> infos = new ArrayList<>();
diff --git a/src/com/android/settings/fuelgauge/FakeUid.java b/src/com/android/settings/fuelgauge/FakeUid.java
index db35e73..b49fb10 100644
--- a/src/com/android/settings/fuelgauge/FakeUid.java
+++ b/src/com/android/settings/fuelgauge/FakeUid.java
@@ -356,12 +356,27 @@
     }
 
     @Override
-    public long getScreenOnEnergy() {
+    public long getBluetoothMeasuredBatteryConsumptionUC() {
         return 0;
     }
 
     @Override
-    public long[] getCustomMeasuredEnergiesMicroJoules() {
+    public long getCpuMeasuredBatteryConsumptionUC() {
+        return 0;
+    }
+
+    @Override
+    public long getScreenOnMeasuredBatteryConsumptionUC() {
+        return 0;
+    }
+
+    @Override
+    public long getWifiMeasuredBatteryConsumptionUC() {
+        return 0;
+    }
+
+    @Override
+    public long[] getCustomConsumerMeasuredBatteryConsumptionUC() {
         return null;
     }
 
diff --git a/src/com/android/settings/fuelgauge/OWNERS b/src/com/android/settings/fuelgauge/OWNERS
index ab3da89..d68dc98 100644
--- a/src/com/android/settings/fuelgauge/OWNERS
+++ b/src/com/android/settings/fuelgauge/OWNERS
@@ -2,3 +2,6 @@
 tifn@google.com
 wesleycwwang@google.com
 ykhung@google.com
+
+# BatteryStats
+per-file FakeUid.java = file:platform/frameworks/base:/BATTERY_STATS_OWNERS
diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
index befede4..9279e5d 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
@@ -50,7 +50,6 @@
 
     @VisibleForTesting
     BatteryHistoryPreference mHistPref;
-    private BatteryUtils mBatteryUtils;
     private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
     private BatteryAppListPreferenceController mBatteryAppListPreferenceController;
     @VisibleForTesting
@@ -64,7 +63,6 @@
         mHistPref = (BatteryHistoryPreference) findPreference(KEY_BATTERY_GRAPH);
         mPowerUsageFeatureProvider = FeatureFactory.getFactory(context)
                 .getPowerUsageFeatureProvider(context);
-        mBatteryUtils = BatteryUtils.getInstance(context);
 
         // init the summary so other preferences won't have unnecessary move
         updateHistPrefSummary(context);
@@ -142,6 +140,11 @@
     }
 
     @Override
+    protected boolean isBatteryHistoryNeeded() {
+        return true;
+    }
+
+    @Override
     protected void refreshUi(@BatteryUpdateType int refreshType) {
         final Context context = getContext();
         if (context == null) {
@@ -150,7 +153,7 @@
         updatePreference(mHistPref);
         updateHistPrefSummary(context);
 
-        mBatteryAppListPreferenceController.refreshAppListGroup(mStatsHelper, mShowAllApps);
+        mBatteryAppListPreferenceController.refreshAppListGroup(mBatteryUsageStats, mShowAllApps);
     }
 
     private void updateHistPrefSummary(Context context) {
diff --git a/src/com/android/settings/fuelgauge/PowerUsageBase.java b/src/com/android/settings/fuelgauge/PowerUsageBase.java
index 3a5ed6c..28d7715 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageBase.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageBase.java
@@ -19,15 +19,16 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.os.BatteryUsageStats;
 import android.os.Bundle;
 import android.os.UserManager;
 import android.view.Menu;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.dashboard.DashboardFragment;
 
 /**
@@ -40,23 +41,30 @@
     static final int MENU_STATS_REFRESH = Menu.FIRST + 1;
     private static final String TAG = "PowerUsageBase";
     private static final String KEY_REFRESH_TYPE = "refresh_type";
+    private static final String KEY_INCLUDE_HISTORY = "include_history";
 
-    protected BatteryStatsHelper mStatsHelper;
+    private static final int LOADER_BATTERY_USAGE_STATS = 1;
+
+    @VisibleForTesting
+    BatteryUsageStats mBatteryUsageStats;
+
     protected UserManager mUm;
     private BatteryBroadcastReceiver mBatteryBroadcastReceiver;
     protected boolean mIsBatteryPresent = true;
 
+    @VisibleForTesting
+    final BatteryUsageStatsLoaderCallbacks mBatteryUsageStatsLoaderCallbacks =
+            new BatteryUsageStatsLoaderCallbacks();
+
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
         mUm = (UserManager) activity.getSystemService(Context.USER_SERVICE);
-        mStatsHelper = new BatteryStatsHelper(activity, true);
     }
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        mStatsHelper.create(icicle);
         setHasOptionsMenu(true);
 
         mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(getContext());
@@ -83,42 +91,44 @@
     protected void restartBatteryStatsLoader(int refreshType) {
         final Bundle bundle = new Bundle();
         bundle.putInt(KEY_REFRESH_TYPE, refreshType);
+        bundle.putBoolean(KEY_INCLUDE_HISTORY, isBatteryHistoryNeeded());
+        getLoaderManager().restartLoader(LOADER_BATTERY_USAGE_STATS, bundle,
+                mBatteryUsageStatsLoaderCallbacks);
+    }
 
-        getLoaderManager().restartLoader(0, bundle, new PowerLoaderCallback());
+    private void onLoadFinished(@BatteryUpdateType int refreshType) {
+        refreshUi(refreshType);
     }
 
     protected abstract void refreshUi(@BatteryUpdateType int refreshType);
+    protected abstract boolean isBatteryHistoryNeeded();
 
     protected void updatePreference(BatteryHistoryPreference historyPref) {
         final long startTime = System.currentTimeMillis();
-        historyPref.setStats(mStatsHelper);
+        historyPref.setBatteryUsageStats(mBatteryUsageStats);
         BatteryUtils.logRuntime(TAG, "updatePreference", startTime);
     }
 
-    /**
-     * {@link android.app.LoaderManager.LoaderCallbacks} for {@link PowerUsageBase} to load
-     * the {@link BatteryStatsHelper}
-     */
-    public class PowerLoaderCallback implements LoaderManager.LoaderCallbacks<BatteryStatsHelper> {
+    private class BatteryUsageStatsLoaderCallbacks
+            implements LoaderManager.LoaderCallbacks<BatteryUsageStats> {
         private int mRefreshType;
 
         @Override
-        public Loader<BatteryStatsHelper> onCreateLoader(int id,
-                Bundle args) {
+        @NonNull
+        public Loader<BatteryUsageStats> onCreateLoader(int id, Bundle args) {
             mRefreshType = args.getInt(KEY_REFRESH_TYPE);
-            return new BatteryStatsHelperLoader(getContext());
+            return new BatteryUsageStatsLoader(getContext(), args.getBoolean(KEY_INCLUDE_HISTORY));
         }
 
         @Override
-        public void onLoadFinished(Loader<BatteryStatsHelper> loader,
-                BatteryStatsHelper statsHelper) {
-            mStatsHelper = statsHelper;
-            refreshUi(mRefreshType);
+        public void onLoadFinished(Loader<BatteryUsageStats> loader,
+                BatteryUsageStats batteryUsageStats) {
+            mBatteryUsageStats = batteryUsageStats;
+            PowerUsageBase.this.onLoadFinished(mRefreshType);
         }
 
         @Override
-        public void onLoaderReset(Loader<BatteryStatsHelper> loader) {
-
+        public void onLoaderReset(Loader<BatteryUsageStats> loader) {
         }
     }
 }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
index 4f292dd..6a22ed4 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
@@ -59,6 +59,11 @@
     boolean isTypeSystem(BatterySipper sipper);
 
     /**
+     * Check whether it is type system
+     */
+    boolean isTypeSystem(int uid, String[] packages);
+
+    /**
      * Check whether the toggle for power accounting is enabled
      */
     boolean isPowerAccountingToggleEnabled();
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index ab71c97..cb83d80 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -66,6 +66,21 @@
     }
 
     @Override
+    public boolean isTypeSystem(int uid, String[] packages) {
+        // Classify all the sippers to type system if the range of uid is 0...FIRST_APPLICATION_UID
+        if (uid >= Process.ROOT_UID && uid < Process.FIRST_APPLICATION_UID) {
+            return true;
+        } else if (packages != null) {
+            for (final String packageName : packages) {
+                if (ArrayUtils.contains(PACKAGES_SYSTEM, packageName)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
     public boolean isLocationSettingEnabled(String[] packages) {
         return false;
     }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index c00c131..9e61997 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -88,7 +88,7 @@
 
                 @Override
                 public Loader<BatteryInfo> onCreateLoader(int i, Bundle bundle) {
-                    return new BatteryInfoLoader(getContext(), mStatsHelper);
+                    return new BatteryInfoLoader(getContext());
                 }
 
                 @Override
@@ -108,7 +108,7 @@
 
                 @Override
                 public Loader<List<BatteryTip>> onCreateLoader(int id, Bundle args) {
-                    return new BatteryTipLoader(getContext(), mStatsHelper);
+                    return new BatteryTipLoader(getContext(), mBatteryUsageStats);
                 }
 
                 @Override
@@ -190,6 +190,11 @@
         return R.string.help_url_battery;
     }
 
+    @Override
+    protected boolean isBatteryHistoryNeeded() {
+        return false;
+    }
+
     protected void refreshUi(@BatteryUpdateType int refreshType) {
         final Context context = getContext();
         if (context == null) {
diff --git a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
index c06a4ff..f75fccc 100644
--- a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
+++ b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
@@ -94,6 +94,13 @@
     }
 
     @Override
+    protected void onStart() {
+        super.onStart();
+        getWindow().addSystemFlags(android.view.WindowManager.LayoutParams
+                .SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+    }
+
+    @Override
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case BUTTON_POSITIVE:
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
index 257810c..122e13a 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
@@ -88,8 +88,8 @@
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        mPreference = (MainSwitchPreference) screen.findPreference(getPreferenceKey());
-        mPreference.setTitle(mContext.getString(R.string.battery_saver_main_switch_title));
+        mPreference = screen.findPreference(getPreferenceKey());
+        mPreference.setTitle(mContext.getString(R.string.battery_saver_master_switch_title));
         mPreference.addOnSwitchChangeListener(this);
         mPreference.updateStatus(isChecked());
     }
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
index 0c916b2..433c06d 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
@@ -17,10 +17,10 @@
 package com.android.settings.fuelgauge.batterytip;
 
 import android.content.Context;
+import android.os.BatteryUsageStats;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.fuelgauge.BatteryInfo;
 import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settings.fuelgauge.batterytip.detectors.BatteryDefenderDetector;
@@ -48,13 +48,13 @@
 
     private static final boolean USE_FAKE_DATA = false;
 
-    private BatteryStatsHelper mBatteryStatsHelper;
+    private BatteryUsageStats mBatteryUsageStats;
     @VisibleForTesting
     BatteryUtils mBatteryUtils;
 
-    public BatteryTipLoader(Context context, BatteryStatsHelper batteryStatsHelper) {
+    public BatteryTipLoader(Context context, BatteryUsageStats batteryUsageStats) {
         super(context);
-        mBatteryStatsHelper = batteryStatsHelper;
+        mBatteryUsageStats = batteryUsageStats;
         mBatteryUtils = BatteryUtils.getInstance(context);
     }
 
@@ -65,12 +65,11 @@
         }
         final List<BatteryTip> tips = new ArrayList<>();
         final BatteryTipPolicy policy = new BatteryTipPolicy(getContext());
-        final BatteryInfo batteryInfo = mBatteryUtils.getBatteryInfo(mBatteryStatsHelper, TAG);
+        final BatteryInfo batteryInfo = mBatteryUtils.getBatteryInfo(TAG);
         final Context context = getContext();
 
         tips.add(new LowBatteryDetector(context, policy, batteryInfo).detect());
-        tips.add(new HighUsageDetector(context, policy, mBatteryStatsHelper,
-                batteryInfo.discharging).detect());
+        tips.add(new HighUsageDetector(context, policy, mBatteryUsageStats, batteryInfo).detect());
         tips.add(new SmartBatteryDetector(policy, context.getContentResolver()).detect());
         tips.add(new EarlyWarningDetector(policy, context).detect());
         tips.add(new BatteryDefenderDetector(batteryInfo).detect());
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java
index 067046c..4b3f2df 100644
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java
@@ -19,12 +19,11 @@
 import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
 
 import android.content.Context;
-import android.os.BatteryStats;
+import android.os.BatteryUsageStats;
+import android.os.UidBatteryConsumer;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.fuelgauge.BatteryInfo;
 import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settings.fuelgauge.batterytip.AppInfo;
@@ -34,7 +33,6 @@
 import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -44,7 +42,8 @@
  */
 public class HighUsageDetector implements BatteryTipDetector {
     private BatteryTipPolicy mPolicy;
-    private BatteryStatsHelper mBatteryStatsHelper;
+    private BatteryUsageStats mBatteryUsageStats;
+    private final BatteryInfo mBatteryInfo;
     private List<AppInfo> mHighUsageAppList;
     @VisibleForTesting
     HighUsageDataParser mDataParser;
@@ -54,50 +53,49 @@
     boolean mDischarging;
 
     public HighUsageDetector(Context context, BatteryTipPolicy policy,
-            BatteryStatsHelper batteryStatsHelper, boolean discharging) {
+            BatteryUsageStats batteryUsageStats, BatteryInfo batteryInfo) {
         mPolicy = policy;
-        mBatteryStatsHelper = batteryStatsHelper;
+        mBatteryUsageStats = batteryUsageStats;
+        mBatteryInfo = batteryInfo;
         mHighUsageAppList = new ArrayList<>();
         mBatteryUtils = BatteryUtils.getInstance(context);
         mDataParser = new HighUsageDataParser(mPolicy.highUsagePeriodMs,
                 mPolicy.highUsageBatteryDraining);
-        mDischarging = discharging;
+        mDischarging = batteryInfo.discharging;
     }
 
     @Override
     public BatteryTip detect() {
         final long lastFullChargeTimeMs = mBatteryUtils.calculateLastFullChargeTime(
-                mBatteryStatsHelper, System.currentTimeMillis());
+                mBatteryUsageStats, System.currentTimeMillis());
         if (mPolicy.highUsageEnabled && mDischarging) {
             parseBatteryData();
             if (mDataParser.isDeviceHeavilyUsed() || mPolicy.testHighUsageTip) {
-                final BatteryStats batteryStats = mBatteryStatsHelper.getStats();
-                final List<BatterySipper> batterySippers
-                        = new ArrayList<>(mBatteryStatsHelper.getUsageList());
-                final double totalPower = mBatteryStatsHelper.getTotalPower();
-                final int dischargeAmount = batteryStats != null
-                        ? batteryStats.getDischargeAmount(BatteryStats.STATS_SINCE_CHARGED)
-                        : 0;
-
-                Collections.sort(batterySippers,
-                        (sipper1, sipper2) -> Double.compare(sipper2.totalSmearedPowerMah,
-                                sipper1.totalSmearedPowerMah));
-                for (BatterySipper batterySipper : batterySippers) {
+                final double totalPower = mBatteryUsageStats.getConsumedPower();
+                final int dischargeAmount = mBatteryUsageStats.getDischargePercentage();
+                final List<UidBatteryConsumer> uidBatteryConsumers =
+                        mBatteryUsageStats.getUidBatteryConsumers();
+                // Sort by descending power
+                uidBatteryConsumers.sort(
+                        (consumer1, consumer2) -> Double.compare(consumer2.getConsumedPower(),
+                                consumer1.getConsumedPower()));
+                for (UidBatteryConsumer consumer : uidBatteryConsumers) {
                     final double percent = mBatteryUtils.calculateBatteryPercent(
-                            batterySipper.totalSmearedPowerMah, totalPower, 0, dischargeAmount);
-                    if ((percent + 0.5f < 1f) || mBatteryUtils.shouldHideSipper(batterySipper)) {
+                            consumer.getConsumedPower(), totalPower, dischargeAmount);
+                    if ((percent + 0.5f < 1f)
+                            || mBatteryUtils.shouldHideUidBatteryConsumer(consumer)) {
                         // Don't show it if we should hide or usage percentage is lower than 1%
                         continue;
                     }
+
                     mHighUsageAppList.add(new AppInfo.Builder()
-                            .setUid(batterySipper.getUid())
+                            .setUid(consumer.getUid())
                             .setPackageName(
-                                    mBatteryUtils.getPackageName(batterySipper.getUid()))
+                                    mBatteryUtils.getPackageName(consumer.getUid()))
                             .build());
                     if (mHighUsageAppList.size() >= mPolicy.highUsageAppCount) {
                         break;
                     }
-
                 }
 
                 // When in test mode, add an app if necessary
@@ -115,6 +113,6 @@
 
     @VisibleForTesting
     void parseBatteryData() {
-        BatteryInfo.parse(mBatteryStatsHelper.getStats(), mDataParser);
+        mBatteryInfo.parseBatteryHistory(mDataParser);
     }
 }
diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
index 14fe6a6..388d87a 100644
--- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
+++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
@@ -30,15 +30,12 @@
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.provider.Settings;
-import android.text.TextUtils;
 import android.util.FeatureFlagUtils;
-import android.view.accessibility.AccessibilityManager;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.SettingsTutorialDialogWrapperActivity;
 import com.android.settings.core.FeatureFlags;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
@@ -188,12 +185,7 @@
     protected boolean setDefaultKey(String key) {
         setCurrentSystemNavigationMode(mOverlayManager, key);
         setIllustrationVideo(mVideoPreference, key);
-        if (TextUtils.equals(KEY_SYSTEM_NAV_GESTURAL, key) && (
-                isAnyServiceSupportAccessibilityButton() || isNavBarMagnificationEnabled())) {
-            Intent intent = new Intent(getActivity(), SettingsTutorialDialogWrapperActivity.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(intent);
-        }
+
         return true;
     }
 
@@ -267,18 +259,6 @@
         }
     }
 
-    private boolean isAnyServiceSupportAccessibilityButton() {
-        final AccessibilityManager ams = getContext().getSystemService(AccessibilityManager.class);
-        final List<String> targets = ams.getAccessibilityShortcutTargets(
-                AccessibilityManager.ACCESSIBILITY_BUTTON);
-        return !targets.isEmpty();
-    }
-
-    private boolean isNavBarMagnificationEnabled() {
-        return Settings.Secure.getInt(getContext().getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, 0) == 1;
-    }
-
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.system_navigation_gesture_settings) {
 
diff --git a/src/com/android/settings/homepage/RestrictedHomepagePreference.java b/src/com/android/settings/homepage/RestrictedHomepagePreference.java
index bee52ec..476642d 100644
--- a/src/com/android/settings/homepage/RestrictedHomepagePreference.java
+++ b/src/com/android/settings/homepage/RestrictedHomepagePreference.java
@@ -16,27 +16,21 @@
 
 package com.android.settings.homepage;
 
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
 import android.content.Context;
-import android.os.UserHandle;
 import android.util.AttributeSet;
 
 import androidx.core.content.res.TypedArrayUtils;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
-import com.android.settingslib.RestrictedPreferenceHelper;
+import com.android.settingslib.RestrictedTopLevelPreference;
 
 /** Homepage preference that can be disabled by a device admin using a user restriction. */
-public class RestrictedHomepagePreference extends HomepagePreference {
-    private RestrictedPreferenceHelper mHelper;
+public class RestrictedHomepagePreference extends RestrictedTopLevelPreference {
 
     public RestrictedHomepagePreference(Context context, AttributeSet attrs,
             int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
-        mHelper = new RestrictedPreferenceHelper(context, /* preference= */ this, attrs);
+        setLayoutResource(R.layout.homepage_preference);
     }
 
     public RestrictedHomepagePreference(Context context, AttributeSet attrs, int defStyleAttr) {
@@ -51,72 +45,4 @@
     public RestrictedHomepagePreference(Context context) {
         this(context, /* attrs= */ null);
     }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-        mHelper.onBindViewHolder(holder);
-    }
-
-    @Override
-    public void performClick() {
-        if (!mHelper.performClick()) {
-            super.performClick();
-        }
-    }
-
-    @Override
-    protected void onAttachedToHierarchy(PreferenceManager preferenceManager) {
-        mHelper.onAttachedToHierarchy();
-        super.onAttachedToHierarchy(preferenceManager);
-    }
-
-    /**
-     * Set the user restriction and disable this preference.
-     *
-     * @param userRestriction constant from {@link android.os.UserManager}
-     */
-    public void checkRestrictionAndSetDisabled(String userRestriction) {
-        mHelper.checkRestrictionAndSetDisabled(userRestriction, UserHandle.myUserId());
-    }
-
-    /**
-     * Set the user restriction and disable this preference for the given user.
-     *
-     * @param userRestriction constant from {@link android.os.UserManager}
-     * @param userId          user to check the restriction for.
-     */
-    public void checkRestrictionAndSetDisabled(String userRestriction, int userId) {
-        mHelper.checkRestrictionAndSetDisabled(userRestriction, userId);
-    }
-
-    @Override
-    public void setEnabled(boolean enabled) {
-        if (enabled && isDisabledByAdmin()) {
-            mHelper.setDisabledByAdmin(/* admin= */ null);
-            return;
-        }
-        super.setEnabled(enabled);
-    }
-
-    /**
-     * Check whether this preference is disabled by admin.
-     *
-     * @return true if this preference is disabled by admin.
-     */
-    public boolean isDisabledByAdmin() {
-        return mHelper.isDisabledByAdmin();
-    }
-
-    /**
-     * Disable preference based on the enforce admin.
-     *
-     * @param admin details of the admin who enforced the restriction. If it is {@code null}, then
-     *              this preference will be enabled. Otherwise, it will be disabled.
-     */
-    public void setDisabledByAdmin(EnforcedAdmin admin) {
-        if (mHelper.setDisabledByAdmin(admin)) {
-            notifyChanged();
-        }
-    }
 }
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java
index 2f55b3f..8bd3028 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java
@@ -40,11 +40,13 @@
     private final ConditionManager mConditionManager;
     private final Context mAppContext;
     private final Receiver mReceiver;
+    private final ConnectivityManager mConnectivityManager;
 
     public AirplaneModeConditionController(Context appContext, ConditionManager conditionManager) {
         mAppContext = appContext;
         mConditionManager = conditionManager;
         mReceiver = new Receiver();
+        mConnectivityManager = mAppContext.getSystemService(ConnectivityManager.class);
     }
 
     @Override
@@ -65,7 +67,7 @@
 
     @Override
     public void onActionClick() {
-        ConnectivityManager.from(mAppContext).setAirplaneMode(false);
+        mConnectivityManager.setAirplaneMode(false);
     }
 
     @Override
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java
index 4c0ddc9..9c936b9 100644
--- a/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java
+++ b/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java
@@ -19,7 +19,6 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
-import android.net.ConnectivityManager;
 import android.telephony.PhoneStateListener;
 import android.telephony.PreciseDataConnectionState;
 import android.telephony.SubscriptionManager;
@@ -39,7 +38,6 @@
     private final Context mAppContext;
     private final ConditionManager mConditionManager;
     private final GlobalSettingsChangeListener mDefaultDataSubscriptionIdListener;
-    private final ConnectivityManager mConnectivityManager;
 
     private int mSubId;
     private TelephonyManager mTelephonyManager;
@@ -63,8 +61,6 @@
                 }
             }
         };
-        mConnectivityManager = appContext.getSystemService(
-                ConnectivityManager.class);
     }
 
     @Override
@@ -74,7 +70,7 @@
 
     @Override
     public boolean isDisplayable() {
-        if (!mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)
+        if (!mTelephonyManager.isDataCapable()
                 || mTelephonyManager.getSimState() != TelephonyManager.SIM_STATE_READY) {
             return false;
         }
diff --git a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
index 6a5b300..94d3f69 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
@@ -29,6 +29,7 @@
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.os.BatteryUsageStats;
 import android.util.ArrayMap;
 import android.view.View;
 
@@ -40,11 +41,10 @@
 import androidx.slice.builders.ListBuilder.RowBuilder;
 import androidx.slice.builders.SliceAction;
 
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
 import com.android.settings.SubSettings;
 import com.android.settings.Utils;
-import com.android.settings.fuelgauge.BatteryStatsHelperLoader;
+import com.android.settings.fuelgauge.BatteryUsageStatsLoader;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.fuelgauge.batterytip.BatteryTipLoader;
 import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
@@ -206,9 +206,10 @@
     @WorkerThread
     @VisibleForTesting
     static List<BatteryTip> refreshBatteryTips(Context context) {
-        final BatteryStatsHelperLoader statsLoader = new BatteryStatsHelperLoader(context);
-        final BatteryStatsHelper statsHelper = statsLoader.loadInBackground();
-        final BatteryTipLoader loader = new BatteryTipLoader(context, statsHelper);
+        final BatteryUsageStatsLoader statsLoader = new BatteryUsageStatsLoader(context,
+                /* includeBatteryHistory */ false);
+        final BatteryUsageStats batteryUsageStats = statsLoader.loadInBackground();
+        final BatteryTipLoader loader = new BatteryTipLoader(context, batteryUsageStats);
         final List<BatteryTip> batteryTips = loader.loadInBackground();
         for (BatteryTip batteryTip : batteryTips) {
             if (batteryTip.getState() != BatteryTip.StateType.INVISIBLE) {
diff --git a/src/com/android/settings/inputmethod/OWNERS b/src/com/android/settings/inputmethod/OWNERS
index 9f33394..556de5f 100644
--- a/src/com/android/settings/inputmethod/OWNERS
+++ b/src/com/android/settings/inputmethod/OWNERS
@@ -1,5 +1,7 @@
-# Default reviewers for this and subdirectories.
-yukawa@google.com
-michaelwr@google.com
+# Bug component: 34867
+include platform/frameworks/base:/services/core/java/com/android/server/inputmethod/OWNERS
 
-# Emergency approvers in case the above are not available
\ No newline at end of file
+# Settings for physical keyboard and game pad are better to be reviewed by the input team
+per-file GameControllerPreferenceController.java = file: platform/frameworks/base:/services/core/java/com/android/server/input/OWNERS
+per-file KeyboardLayoutPicker*.java = file: platform/frameworks/base:/services/core/java/com/android/server/input/OWNERS
+per-file PhysicalKeyboard*.java = file: platform/frameworks/base:/services/core/java/com/android/server/input/OWNERS
diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/BluetoothScanningFragment.java
similarity index 79%
copy from src/com/android/settings/location/ScanningSettings.java
copy to src/com/android/settings/location/BluetoothScanningFragment.java
index 90f4e2a..553f975 100644
--- a/src/com/android/settings/location/ScanningSettings.java
+++ b/src/com/android/settings/location/BluetoothScanningFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,20 +29,20 @@
 import java.util.List;
 
 /**
- * A page that configures the background scanning settings for Wi-Fi and Bluetooth.
+ * A page that configures the Bluetooth scanning setting.
  */
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
-public class ScanningSettings extends DashboardFragment {
-    private static final String TAG = "ScanningSettings";
+public class BluetoothScanningFragment extends DashboardFragment {
+    private static final String TAG = "BluetoothScanningFragment";
 
     @Override
     public int getMetricsCategory() {
-        return SettingsEnums.LOCATION_SCANNING;
+        return SettingsEnums.LOCATION_SERVICES;
     }
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.location_scanning;
+        return R.xml.location_services_bluetooth_scanning;
     }
 
     @Override
@@ -55,9 +55,13 @@
         return buildPreferenceControllers(context);
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+    }
+
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
-        controllers.add(new WifiScanningPreferenceController(context));
         controllers.add(new BluetoothScanningPreferenceController(context));
         return controllers;
     }
@@ -66,7 +70,7 @@
      * For Search.
      */
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.location_scanning) {
+            new BaseSearchIndexProvider(R.xml.location_services_bluetooth_scanning) {
 
                 @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(Context
diff --git a/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java b/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java
new file mode 100644
index 0000000..051fd8d
--- /dev/null
+++ b/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.location;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.widget.Switch;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
+
+/**
+ * Preference controller for Bluetooth scanning main switch.
+ */
+public class BluetoothScanningMainSwitchPreferenceController extends TogglePreferenceController
+        implements OnMainSwitchChangeListener {
+
+    private static final String KEY_BLUETOOTH_SCANNING_SWITCH = "bluetooth_always_scanning_switch";
+
+    public BluetoothScanningMainSwitchPreferenceController(Context context) {
+        super(context, KEY_BLUETOOTH_SCANNING_SWITCH);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        MainSwitchPreference pref = screen.findPreference(getPreferenceKey());
+        pref.addOnSwitchChangeListener(this);
+        pref.updateStatus(isChecked());
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mContext.getResources().getBoolean(R.bool.config_show_location_scanning)
+                ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, isChecked ? 1 : 0);
+        // Returning true means the underlying setting is updated.
+        return true;
+    }
+
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        if (isChecked != isChecked()) {
+            setChecked(isChecked);
+        }
+    }
+}
diff --git a/src/com/android/settings/location/LocationForWorkPreferenceController.java b/src/com/android/settings/location/LocationForWorkPreferenceController.java
index 41d26ef..45fb5f1 100644
--- a/src/com/android/settings/location/LocationForWorkPreferenceController.java
+++ b/src/com/android/settings/location/LocationForWorkPreferenceController.java
@@ -27,6 +27,9 @@
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 
+/**
+ * Preference Controller for Location for Work Profile.
+ */
 public class LocationForWorkPreferenceController extends LocationBasePreferenceController {
 
     private RestrictedSwitchPreference mPreference;
diff --git a/src/com/android/settings/location/LocationServiceForWorkPreferenceController.java b/src/com/android/settings/location/LocationInjectedServicesForWorkPreferenceController.java
similarity index 83%
rename from src/com/android/settings/location/LocationServiceForWorkPreferenceController.java
rename to src/com/android/settings/location/LocationInjectedServicesForWorkPreferenceController.java
index 6b172dd..571b4a7 100644
--- a/src/com/android/settings/location/LocationServiceForWorkPreferenceController.java
+++ b/src/com/android/settings/location/LocationInjectedServicesForWorkPreferenceController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,13 +27,13 @@
 import java.util.Map;
 
 /**
- * Retrieve the Location Services used in profile user.
+ * Retrieve the Location Services used in work profile user.
  */
-public class LocationServiceForWorkPreferenceController extends
-        LocationServicePreferenceController {
+public class LocationInjectedServicesForWorkPreferenceController extends
+        LocationInjectedServicesPreferenceController {
     private static final String TAG = "LocationWorkPrefCtrl";
 
-    public LocationServiceForWorkPreferenceController(Context context, String key) {
+    public LocationInjectedServicesForWorkPreferenceController(Context context, String key) {
         super(context, key);
     }
 
diff --git a/src/com/android/settings/location/LocationServicePreferenceController.java b/src/com/android/settings/location/LocationInjectedServicesPreferenceController.java
similarity index 87%
rename from src/com/android/settings/location/LocationServicePreferenceController.java
rename to src/com/android/settings/location/LocationInjectedServicesPreferenceController.java
index 04a9250..8573307 100644
--- a/src/com/android/settings/location/LocationServicePreferenceController.java
+++ b/src/com/android/settings/location/LocationInjectedServicesPreferenceController.java
@@ -1,15 +1,17 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * 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.
+ * 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.location;
 
@@ -36,7 +38,10 @@
 import java.util.List;
 import java.util.Map;
 
-public class LocationServicePreferenceController extends LocationBasePreferenceController
+/**
+ * Preference controller for the injected Location Services.
+ */
+public class LocationInjectedServicesPreferenceController extends LocationBasePreferenceController
         implements LifecycleObserver, OnResume, OnPause {
 
     private static final String TAG = "LocationPrefCtrl";
@@ -51,7 +56,7 @@
     @VisibleForTesting
     BroadcastReceiver mInjectedSettingsReceiver;
 
-    public LocationServicePreferenceController(Context context, String key) {
+    public LocationInjectedServicesPreferenceController(Context context, String key) {
         super(context, key);
     }
 
diff --git a/src/com/android/settings/location/LocationPersonalSettings.java b/src/com/android/settings/location/LocationPersonalSettings.java
index 92796a4..bdf2d2b 100644
--- a/src/com/android/settings/location/LocationPersonalSettings.java
+++ b/src/com/android/settings/location/LocationPersonalSettings.java
@@ -50,12 +50,14 @@
         super.onAttach(context);
 
         use(AppLocationPermissionPreferenceController.class).init(this);
-        use(LocationServicePreferenceController.class).init(this);
+        // STOPSHIP(b/180533061): resolve the personal/work location services issue before we can
+        // ship.
         use(LocationFooterPreferenceController.class).init(this);
+        use(RecentLocationAccessSeeAllButtonPreferenceController.class).init(this);
 
         final int profileType = getArguments().getInt(ProfileSelectFragment.EXTRA_PROFILE);
-        final RecentLocationRequestPreferenceController controller = use(
-                RecentLocationRequestPreferenceController.class);
+        final RecentLocationAccessPreferenceController controller = use(
+                RecentLocationAccessPreferenceController.class);
         controller.init(this);
         controller.setProfileType(profileType);
     }
diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/LocationServices.java
similarity index 79%
copy from src/com/android/settings/location/ScanningSettings.java
copy to src/com/android/settings/location/LocationServices.java
index 90f4e2a..aceb9d5 100644
--- a/src/com/android/settings/location/ScanningSettings.java
+++ b/src/com/android/settings/location/LocationServices.java
@@ -29,20 +29,21 @@
 import java.util.List;
 
 /**
- * A page that configures the background scanning settings for Wi-Fi and Bluetooth.
+ * A page that configures the Location Services settings including Wi-Fi scanning, Bluetooth
+ * scanning, and injected location services.
  */
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
-public class ScanningSettings extends DashboardFragment {
-    private static final String TAG = "ScanningSettings";
+public class LocationServices extends DashboardFragment {
+    private static final String TAG = "LocationServicesSettings";
 
     @Override
     public int getMetricsCategory() {
-        return SettingsEnums.LOCATION_SCANNING;
+        return SettingsEnums.LOCATION_SERVICES;
     }
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.location_scanning;
+        return R.xml.location_services;
     }
 
     @Override
@@ -55,6 +56,13 @@
         return buildPreferenceControllers(context);
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+
+        use(LocationInjectedServicesPreferenceController.class).init(this);
+    }
+
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new WifiScanningPreferenceController(context));
@@ -66,7 +74,7 @@
      * For Search.
      */
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.location_scanning) {
+            new BaseSearchIndexProvider(R.xml.location_services) {
 
                 @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(Context
diff --git a/src/com/android/settings/location/LocationServicesBluetoothScanningPreferenceController.java b/src/com/android/settings/location/LocationServicesBluetoothScanningPreferenceController.java
new file mode 100644
index 0000000..9913848
--- /dev/null
+++ b/src/com/android/settings/location/LocationServicesBluetoothScanningPreferenceController.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.location;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * Preference controller for Bluetooth scanning in Location Services.
+ */
+public class LocationServicesBluetoothScanningPreferenceController extends
+        BasePreferenceController {
+
+    public LocationServicesBluetoothScanningPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        final boolean bleScanOn = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1;
+        int resId =
+                bleScanOn ? R.string.scanning_status_text_on : R.string.scanning_status_text_off;
+        return mContext.getString(resId);
+    }
+
+    @AvailabilityStatus
+    public int getAvailabilityStatus() {
+        return mContext.getResources().getBoolean(R.bool.config_show_location_scanning)
+                ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+}
diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/LocationServicesForWork.java
similarity index 76%
copy from src/com/android/settings/location/ScanningSettings.java
copy to src/com/android/settings/location/LocationServicesForWork.java
index 90f4e2a..4b3124e 100644
--- a/src/com/android/settings/location/ScanningSettings.java
+++ b/src/com/android/settings/location/LocationServicesForWork.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,20 +29,20 @@
 import java.util.List;
 
 /**
- * A page that configures the background scanning settings for Wi-Fi and Bluetooth.
+ * A page that configures the Location Services settings for work profile.
  */
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
-public class ScanningSettings extends DashboardFragment {
-    private static final String TAG = "ScanningSettings";
+public class LocationServicesForWork extends DashboardFragment {
+    private static final String TAG = "LocationServicesForWork";
 
     @Override
     public int getMetricsCategory() {
-        return SettingsEnums.LOCATION_SCANNING;
+        return SettingsEnums.LOCATION_SERVICES;
     }
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.location_scanning;
+        return R.xml.location_services_workprofile;
     }
 
     @Override
@@ -55,10 +55,14 @@
         return buildPreferenceControllers(context);
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        use(LocationInjectedServicesForWorkPreferenceController.class).init(this);
+    }
+
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
-        controllers.add(new WifiScanningPreferenceController(context));
-        controllers.add(new BluetoothScanningPreferenceController(context));
         return controllers;
     }
 
@@ -66,7 +70,7 @@
      * For Search.
      */
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.location_scanning) {
+            new BaseSearchIndexProvider(R.xml.location_services_workprofile) {
 
                 @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(Context
diff --git a/src/com/android/settings/applications/specialaccess/HighPowerAppsController.java b/src/com/android/settings/location/LocationServicesForWorkPreferenceController.java
similarity index 62%
copy from src/com/android/settings/applications/specialaccess/HighPowerAppsController.java
copy to src/com/android/settings/location/LocationServicesForWorkPreferenceController.java
index b893b88..f8167df 100644
--- a/src/com/android/settings/applications/specialaccess/HighPowerAppsController.java
+++ b/src/com/android/settings/location/LocationServicesForWorkPreferenceController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,23 +14,28 @@
  * limitations under the License.
  */
 
-package com.android.settings.applications.specialaccess;
+package com.android.settings.location;
 
 import android.content.Context;
 
-import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 
-public class HighPowerAppsController extends BasePreferenceController {
+/**
+ * Preference controller for Location Services for Work Profile.
+ */
+public class LocationServicesForWorkPreferenceController extends BasePreferenceController {
 
-    public HighPowerAppsController(Context context, String key) {
+    public LocationServicesForWorkPreferenceController(Context context, String key) {
         super(context, key);
     }
 
+    @Override
+    public CharSequence getSummary() {
+        return null;
+    }
+
     @AvailabilityStatus
     public int getAvailabilityStatus() {
-        return mContext.getResources().getBoolean(R.bool.config_show_high_power_apps)
-                ? AVAILABLE
-                : UNSUPPORTED_ON_DEVICE;
+        return AVAILABLE;
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/applications/specialaccess/HighPowerAppsController.java b/src/com/android/settings/location/LocationServicesPreferenceController.java
similarity index 72%
rename from src/com/android/settings/applications/specialaccess/HighPowerAppsController.java
rename to src/com/android/settings/location/LocationServicesPreferenceController.java
index b893b88..53150a8 100644
--- a/src/com/android/settings/applications/specialaccess/HighPowerAppsController.java
+++ b/src/com/android/settings/location/LocationServicesPreferenceController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * 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.
@@ -14,23 +14,26 @@
  * limitations under the License.
  */
 
-package com.android.settings.applications.specialaccess;
+package com.android.settings.location;
 
 import android.content.Context;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 
-public class HighPowerAppsController extends BasePreferenceController {
+/**
+ * Preference controller for Location Services.
+ */
+public class LocationServicesPreferenceController extends BasePreferenceController {
 
-    public HighPowerAppsController(Context context, String key) {
+    public LocationServicesPreferenceController(Context context, String key) {
         super(context, key);
     }
 
     @AvailabilityStatus
     public int getAvailabilityStatus() {
-        return mContext.getResources().getBoolean(R.bool.config_show_high_power_apps)
+        return mContext.getResources().getBoolean(R.bool.config_show_location_scanning)
                 ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/location/LocationScanningPreferenceController.java b/src/com/android/settings/location/LocationServicesWifiScanningPreferenceController.java
similarity index 60%
rename from src/com/android/settings/location/LocationScanningPreferenceController.java
rename to src/com/android/settings/location/LocationServicesWifiScanningPreferenceController.java
index a0c3241..080a023 100644
--- a/src/com/android/settings/location/LocationScanningPreferenceController.java
+++ b/src/com/android/settings/location/LocationServicesWifiScanningPreferenceController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 The Android Open Source Project
+ * Copyright 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.android.settings.location;
 
 import android.content.Context;
 import android.net.wifi.WifiManager;
-import android.provider.Settings;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 
-
-public class LocationScanningPreferenceController extends BasePreferenceController {
+/**
+ * Preference controller for Wi-Fi scanning in Location Services.
+ */
+public class LocationServicesWifiScanningPreferenceController extends BasePreferenceController {
 
     private final WifiManager mWifiManager;
 
-    public LocationScanningPreferenceController(Context context, String key) {
+    public LocationServicesWifiScanningPreferenceController(Context context, String key) {
         super(context, key);
         mWifiManager = context.getSystemService(WifiManager.class);
     }
@@ -36,18 +36,8 @@
     @Override
     public CharSequence getSummary() {
         final boolean wifiScanOn = mWifiManager.isScanAlwaysAvailable();
-        final boolean bleScanOn = Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1;
-        int resId;
-        if (wifiScanOn && bleScanOn) {
-            resId = R.string.scanning_status_text_wifi_on_ble_on;
-        } else if (wifiScanOn && !bleScanOn) {
-            resId = R.string.scanning_status_text_wifi_on_ble_off;
-        } else if (!wifiScanOn && bleScanOn) {
-            resId = R.string.scanning_status_text_wifi_off_ble_on;
-        } else {
-            resId = R.string.scanning_status_text_wifi_off_ble_off;
-        }
+        int resId =
+                wifiScanOn ? R.string.scanning_status_text_on : R.string.scanning_status_text_off;
         return mContext.getString(resId);
     }
 
@@ -57,4 +47,4 @@
                 ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index b4f0f1f..bb971bf 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -82,11 +82,11 @@
         super.onAttach(context);
 
         use(AppLocationPermissionPreferenceController.class).init(this);
-        use(RecentLocationRequestPreferenceController.class).init(this);
-        use(LocationServicePreferenceController.class).init(this);
+        use(RecentLocationAccessPreferenceController.class).init(this);
+        use(RecentLocationAccessSeeAllButtonPreferenceController.class).init(this);
         use(LocationFooterPreferenceController.class).init(this);
         use(LocationForWorkPreferenceController.class).init(this);
-        use(LocationServiceForWorkPreferenceController.class).init(this);
+        use(LocationInjectedServicesForWorkPreferenceController.class).init(this);
     }
 
     @Override
diff --git a/src/com/android/settings/location/LocationWorkProfileSettings.java b/src/com/android/settings/location/LocationWorkProfileSettings.java
index 2bf5f98..6783075 100644
--- a/src/com/android/settings/location/LocationWorkProfileSettings.java
+++ b/src/com/android/settings/location/LocationWorkProfileSettings.java
@@ -50,13 +50,13 @@
         super.onAttach(context);
 
         use(AppLocationPermissionPreferenceController.class).init(this);
-        use(LocationServiceForWorkPreferenceController.class).init(this);
         use(LocationFooterPreferenceController.class).init(this);
         use(LocationForWorkPreferenceController.class).init(this);
+        use(RecentLocationAccessSeeAllButtonPreferenceController.class).init(this);
 
         final int profileType = getArguments().getInt(ProfileSelectFragment.EXTRA_PROFILE);
-        final RecentLocationRequestPreferenceController controller = use(
-                RecentLocationRequestPreferenceController.class);
+        final RecentLocationAccessPreferenceController controller = use(
+                RecentLocationAccessPreferenceController.class);
         controller.init(this);
         controller.setProfileType(profileType);
     }
diff --git a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
index c835a51..97de4a7 100644
--- a/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationAccessPreferenceController.java
@@ -13,114 +13,152 @@
  */
 package com.android.settings.location;
 
-import static java.util.concurrent.TimeUnit.DAYS;
+import static android.Manifest.permission_group.LOCATION;
 
-import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.icu.text.RelativeDateTimeFormatter;
-import android.provider.DeviceConfig;
-import android.view.View;
+import android.os.UserHandle;
+import android.os.UserManager;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
 import com.android.settingslib.location.RecentLocationAccesses;
 import com.android.settingslib.utils.StringUtil;
-import com.android.settingslib.widget.AppEntitiesHeaderController;
-import com.android.settingslib.widget.AppEntityInfo;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.AppPreference;
 
+import java.util.ArrayList;
 import java.util.List;
 
-public class RecentLocationAccessPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin {
-    /** Key for the recent location apps dashboard */
-    private static final String KEY_APPS_DASHBOARD = "apps_dashboard";
-    private final RecentLocationAccesses mRecentLocationAccesses;
-    private AppEntitiesHeaderController mController;
-    private static final int MAXIMUM_APP_COUNT = 3;
+/**
+ * Preference controller that handles the display of apps that access locations.
+ */
+public class RecentLocationAccessPreferenceController extends LocationBasePreferenceController {
+    public static final int MAX_APPS = 3;
+    @VisibleForTesting
+    RecentLocationAccesses mRecentLocationApps;
+    private PreferenceCategory mCategoryRecentLocationRequests;
+    private int mType = ProfileSelectFragment.ProfileType.ALL;
 
-    public RecentLocationAccessPreferenceController(Context context) {
-        this(context, new RecentLocationAccesses(context));
+    private static class PackageEntryClickedListener implements
+            Preference.OnPreferenceClickListener {
+        private final Context mContext;
+        private final String mPackage;
+        private final UserHandle mUserHandle;
+
+        PackageEntryClickedListener(Context context, String packageName,
+                UserHandle userHandle) {
+            mContext = context;
+            mPackage = packageName;
+            mUserHandle = userHandle;
+        }
+
+        @Override
+        public boolean onPreferenceClick(Preference preference) {
+            final Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSION);
+            intent.putExtra(Intent.EXTRA_PERMISSION_GROUP_NAME, LOCATION);
+            intent.putExtra(Intent.EXTRA_PACKAGE_NAME, mPackage);
+            intent.putExtra(Intent.EXTRA_USER, mUserHandle);
+            mContext.startActivity(intent);
+            return true;
+        }
+    }
+
+    public RecentLocationAccessPreferenceController(Context context, String key) {
+        this(context, key, new RecentLocationAccesses(context));
     }
 
     @VisibleForTesting
-    RecentLocationAccessPreferenceController(Context context,
-            RecentLocationAccesses recentAccesses) {
-        super(context);
-        mRecentLocationAccesses = recentAccesses;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_APPS_DASHBOARD;
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return Boolean.parseBoolean(
-                DeviceConfig.getProperty(DeviceConfig.NAMESPACE_PRIVACY,
-                        Utils.PROPERTY_PERMISSIONS_HUB_ENABLED));
+    public RecentLocationAccessPreferenceController(Context context, String key,
+            RecentLocationAccesses recentLocationApps) {
+        super(context, key);
+        mRecentLocationApps = recentLocationApps;
     }
 
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        final LayoutPreference preference = screen.findPreference(KEY_APPS_DASHBOARD);
-        final View view = preference.findViewById(R.id.app_entities_header);
-        mController = AppEntitiesHeaderController.newInstance(mContext, view)
-                .setHeaderTitleRes(R.string.location_category_recent_location_access)
-                .setHeaderDetailsRes(R.string.location_recent_location_access_view_details)
-                .setHeaderEmptyRes(R.string.location_no_recent_accesses)
-                .setHeaderDetailsClickListener((View v) -> {
-                    final Intent intent = new Intent(Intent.ACTION_REVIEW_PERMISSION_USAGE);
-                    intent.putExtra(Intent.EXTRA_PERMISSION_NAME,
-                            Manifest.permission.ACCESS_FINE_LOCATION);
-                    intent.putExtra(Intent.EXTRA_DURATION_MILLIS, DAYS.toMillis(1));
-                    mContext.startActivity(intent);
-                });
+        mCategoryRecentLocationRequests = screen.findPreference(getPreferenceKey());
+        final Context prefContext = mCategoryRecentLocationRequests.getContext();
+        final List<RecentLocationAccesses.Access> recentLocationAccesses = new ArrayList<>();
+        final UserManager userManager = UserManager.get(mContext);
+        for (RecentLocationAccesses.Access access : mRecentLocationApps.getAppListSorted(
+                /* showSystemApps= */ false)) {
+            if (isRequestMatchesProfileType(userManager, access, mType)) {
+                recentLocationAccesses.add(access);
+                if (recentLocationAccesses.size() == MAX_APPS) {
+                    break;
+                }
+            }
+        }
+
+        if (recentLocationAccesses.size() > 0) {
+            // Add preferences to container in original order (already sorted by recency).
+            for (RecentLocationAccesses.Access access : recentLocationAccesses) {
+                mCategoryRecentLocationRequests.addPreference(
+                        createAppPreference(prefContext, access, mFragment));
+            }
+        } else {
+            // If there's no item to display, add a "No recent apps" item.
+            final Preference banner = new AppPreference(prefContext);
+            banner.setTitle(R.string.location_no_recent_accesses);
+            banner.setSelectable(false);
+            mCategoryRecentLocationRequests.addPreference(banner);
+        }
     }
 
     @Override
-    public void updateState(Preference preference) {
-        updateRecentApps();
+    public void onLocationModeChanged(int mode, boolean restricted) {
+        boolean enabled = mLocationEnabler.isEnabled(mode);
+        mCategoryRecentLocationRequests.setVisible(enabled);
     }
 
-    private void updateRecentApps() {
-        final List<RecentLocationAccesses.Access> recentLocationAccesses =
-                mRecentLocationAccesses.getAppListSorted();
-        if (recentLocationAccesses.size() > 0) {
-            // Display the top 3 preferences to container in original order.
-            int i = 0;
-            for (; i < Math.min(recentLocationAccesses.size(), MAXIMUM_APP_COUNT); i++) {
-                final RecentLocationAccesses.Access access = recentLocationAccesses.get(i);
-                final AppEntityInfo appEntityInfo = new AppEntityInfo.Builder()
-                        .setIcon(access.icon)
-                        .setTitle(access.label)
-                        .setSummary(StringUtil.formatRelativeTime(mContext,
-                                System.currentTimeMillis() - access.accessFinishTime, false,
-                                RelativeDateTimeFormatter.Style.SHORT))
-                        .setOnClickListener((v) -> {
-                            final Intent intent = new Intent(Intent.ACTION_MANAGE_APP_PERMISSION);
-                            intent.putExtra(Intent.EXTRA_PERMISSION_NAME,
-                                    Manifest.permission.ACCESS_FINE_LOCATION);
-                            intent.putExtra(Intent.EXTRA_PACKAGE_NAME, access.packageName);
-                            intent.putExtra(Intent.EXTRA_USER, access.userHandle);
-                            mContext.startActivity(intent);
-                        })
-                        .build();
-                mController.setAppEntity(i, appEntityInfo);
-            }
-            for (; i < MAXIMUM_APP_COUNT; i++) {
-                mController.removeAppEntity(i);
-            }
+    /**
+     * Initialize {@link ProfileSelectFragment.ProfileType} of the controller
+     *
+     * @param type {@link ProfileSelectFragment.ProfileType} of the controller.
+     */
+    public void setProfileType(@ProfileSelectFragment.ProfileType int type) {
+        mType = type;
+    }
+
+    /**
+     * Create a {@link AppPreference}
+     */
+    public static AppPreference createAppPreference(Context prefContext,
+            RecentLocationAccesses.Access access, DashboardFragment fragment) {
+        final AppPreference pref = new AppPreference(prefContext);
+        pref.setIcon(access.icon);
+        pref.setTitle(access.label);
+        pref.setSummary(StringUtil.formatRelativeTime(prefContext,
+                System.currentTimeMillis() - access.accessFinishTime, false,
+                RelativeDateTimeFormatter.Style.SHORT));
+        pref.setOnPreferenceClickListener(new PackageEntryClickedListener(
+                fragment.getContext(), access.packageName, access.userHandle));
+        return pref;
+    }
+
+    /**
+     * Return if the {@link RecentLocationAccesses.Access} matches current UI
+     * {@ProfileSelectFragment.ProfileType}
+     */
+    public static boolean isRequestMatchesProfileType(UserManager userManager,
+            RecentLocationAccesses.Access access, @ProfileSelectFragment.ProfileType int type) {
+
+        final boolean isWorkProfile = userManager.isManagedProfile(
+                access.userHandle.getIdentifier());
+        if (isWorkProfile && (type & ProfileSelectFragment.ProfileType.WORK) != 0) {
+            return true;
         }
-        mController.apply();
+        if (!isWorkProfile && (type & ProfileSelectFragment.ProfileType.PERSONAL) != 0) {
+            return true;
+        }
+        return false;
     }
 }
diff --git a/src/com/android/settings/location/RecentLocationAccessSeeAllButtonPreferenceController.java b/src/com/android/settings/location/RecentLocationAccessSeeAllButtonPreferenceController.java
new file mode 100644
index 0000000..68cde63
--- /dev/null
+++ b/src/com/android/settings/location/RecentLocationAccessSeeAllButtonPreferenceController.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.location;
+
+import android.content.Context;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+/**
+ * Preference controller that handles the "See All" button for recent location access.
+ */
+public class RecentLocationAccessSeeAllButtonPreferenceController extends
+        LocationBasePreferenceController {
+
+    private Preference mPreference;
+
+    /**
+     * Constructor of {@link RecentLocationAccessSeeAllButtonPreferenceController}.
+     */
+    public RecentLocationAccessSeeAllButtonPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void onLocationModeChanged(int mode, boolean restricted) {
+        boolean enabled = mLocationEnabler.isEnabled(mode);
+        mPreference.setVisible(enabled);
+    }
+}
diff --git a/src/com/android/settings/location/RecentLocationAccessSeeAllFragment.java b/src/com/android/settings/location/RecentLocationAccessSeeAllFragment.java
new file mode 100644
index 0000000..e8e3c59
--- /dev/null
+++ b/src/com/android/settings/location/RecentLocationAccessSeeAllFragment.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.location;
+
+import android.content.Context;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+/** Dashboard Fragment to display all recent location access (apps), sorted by recency. */
+@SearchIndexable
+public class RecentLocationAccessSeeAllFragment extends DashboardFragment {
+    private static final String TAG = "RecentLocAccessSeeAll";
+    public static final String PATH =
+            "com.android.settings.location.RecentLocationAccessSeeAllFragment";
+
+    private static final int MENU_SHOW_SYSTEM = Menu.FIRST + 1;
+    private static final int MENU_HIDE_SYSTEM = Menu.FIRST + 2;
+
+    private boolean mShowSystem = false;
+    private MenuItem mShowSystemMenu;
+    private MenuItem mHideSystemMenu;
+    private RecentLocationAccessSeeAllPreferenceController mController;
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.RECENT_LOCATION_REQUESTS_ALL;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        final int profileType = getArguments().getInt(ProfileSelectFragment.EXTRA_PROFILE);
+
+        mController = use(RecentLocationAccessSeeAllPreferenceController.class);
+        mController.init(this);
+        if (profileType != 0) {
+            mController.setProfileType(profileType);
+        }
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.location_recent_access_see_all;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem menuItem) {
+        switch (menuItem.getItemId()) {
+            case MENU_SHOW_SYSTEM:
+            case MENU_HIDE_SYSTEM:
+                mShowSystem = menuItem.getItemId() == MENU_SHOW_SYSTEM;
+                updateMenu();
+                if (mController != null) {
+                    mController.setShowSystem(mShowSystem);
+                }
+                return true;
+            default:
+                return super.onOptionsItemSelected(menuItem);
+        }
+    }
+
+    private void updateMenu() {
+        mShowSystemMenu.setVisible(!mShowSystem);
+        mHideSystemMenu.setVisible(mShowSystem);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        mShowSystemMenu = menu.add(Menu.NONE, MENU_SHOW_SYSTEM, Menu.NONE,
+                R.string.menu_show_system);
+        mHideSystemMenu = menu.add(Menu.NONE, MENU_HIDE_SYSTEM, Menu.NONE,
+                R.string.menu_hide_system);
+        updateMenu();
+    }
+
+    /**
+     * For Search.
+     */
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.location_recent_access_see_all);
+}
diff --git a/src/com/android/settings/location/RecentLocationAccessSeeAllPreferenceController.java b/src/com/android/settings/location/RecentLocationAccessSeeAllPreferenceController.java
new file mode 100644
index 0000000..a05092d
--- /dev/null
+++ b/src/com/android/settings/location/RecentLocationAccessSeeAllPreferenceController.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.location;
+
+import static com.android.settings.location.RecentLocationAccessPreferenceController.createAppPreference;
+import static com.android.settings.location.RecentLocationAccessPreferenceController.isRequestMatchesProfileType;
+
+import android.content.Context;
+import android.os.UserManager;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
+import com.android.settingslib.location.RecentLocationAccesses;
+import com.android.settingslib.widget.AppPreference;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** Preference controller for preference category displaying all recent location access (apps). */
+public class RecentLocationAccessSeeAllPreferenceController
+        extends LocationBasePreferenceController {
+
+    private PreferenceScreen mCategoryAllRecentLocationAccess;
+    private final RecentLocationAccesses mRecentLocationAccesses;
+    private boolean mShowSystem = false;
+    private Preference mPreference;
+    private int mType = ProfileSelectFragment.ProfileType.ALL;
+
+    public RecentLocationAccessSeeAllPreferenceController(Context context, String key) {
+        super(context, key);
+        mRecentLocationAccesses = new RecentLocationAccesses(context);
+    }
+
+    @Override
+    public void onLocationModeChanged(int mode, boolean restricted) {
+        mCategoryAllRecentLocationAccess.setEnabled(mLocationEnabler.isEnabled(mode));
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mCategoryAllRecentLocationAccess = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        mCategoryAllRecentLocationAccess.removeAll();
+        mPreference = preference;
+
+        final UserManager userManager = UserManager.get(mContext);
+
+        final List<RecentLocationAccesses.Access> recentLocationAccesses = new ArrayList<>();
+        for (RecentLocationAccesses.Access access : mRecentLocationAccesses.getAppListSorted(
+                mShowSystem)) {
+            if (isRequestMatchesProfileType(userManager, access, mType)) {
+                recentLocationAccesses.add(access);
+            }
+        }
+
+        if (recentLocationAccesses.isEmpty()) {
+            // If there's no item to display, add a "No recent apps" item.
+            final Preference banner = new AppPreference(mContext);
+            banner.setTitle(R.string.location_no_recent_apps);
+            banner.setSelectable(false);
+            mCategoryAllRecentLocationAccess.addPreference(banner);
+        } else {
+            for (RecentLocationAccesses.Access request : recentLocationAccesses) {
+                final Preference appPreference = createAppPreference(
+                        preference.getContext(),
+                        request, mFragment);
+                mCategoryAllRecentLocationAccess.addPreference(appPreference);
+            }
+        }
+    }
+
+    /**
+     * Initialize {@link ProfileSelectFragment.ProfileType} of the controller
+     *
+     * @param type {@link ProfileSelectFragment.ProfileType} of the controller.
+     */
+    public void setProfileType(@ProfileSelectFragment.ProfileType int type) {
+        mType = type;
+    }
+
+    /**
+     * Set the value of {@link #mShowSystem}.
+     */
+    public void setShowSystem(boolean showSystem) {
+        mShowSystem = showSystem;
+        if (mPreference != null) {
+            updateState(mPreference);
+        }
+    }
+}
diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/WifiScanningFragment.java
similarity index 80%
rename from src/com/android/settings/location/ScanningSettings.java
rename to src/com/android/settings/location/WifiScanningFragment.java
index 90f4e2a..f5cb0ae 100644
--- a/src/com/android/settings/location/ScanningSettings.java
+++ b/src/com/android/settings/location/WifiScanningFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,20 +29,20 @@
 import java.util.List;
 
 /**
- * A page that configures the background scanning settings for Wi-Fi and Bluetooth.
+ * A page that configures the Wi-Fi scanning setting.
  */
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
-public class ScanningSettings extends DashboardFragment {
-    private static final String TAG = "ScanningSettings";
+public class WifiScanningFragment extends DashboardFragment {
+    private static final String TAG = "WifiScanningFragment";
 
     @Override
     public int getMetricsCategory() {
-        return SettingsEnums.LOCATION_SCANNING;
+        return SettingsEnums.LOCATION_SERVICES;
     }
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.location_scanning;
+        return R.xml.location_services_wifi_scanning;
     }
 
     @Override
@@ -55,10 +55,14 @@
         return buildPreferenceControllers(context);
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+    }
+
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new WifiScanningPreferenceController(context));
-        controllers.add(new BluetoothScanningPreferenceController(context));
         return controllers;
     }
 
@@ -66,7 +70,7 @@
      * For Search.
      */
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.location_scanning) {
+            new BaseSearchIndexProvider(R.xml.location_services_wifi_scanning) {
 
                 @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(Context
diff --git a/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java b/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java
new file mode 100644
index 0000000..a69fdb8
--- /dev/null
+++ b/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.location;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.widget.Switch;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
+
+/**
+ * Preference controller for Wi-Fi scanning main switch.
+ */
+public class WifiScanningMainSwitchPreferenceController extends TogglePreferenceController
+        implements OnMainSwitchChangeListener {
+
+    private static final String KEY_WIFI_SCANNING_SWITCH = "wifi_always_scanning_switch";
+    private final WifiManager mWifiManager;
+
+    public WifiScanningMainSwitchPreferenceController(Context context) {
+        super(context, KEY_WIFI_SCANNING_SWITCH);
+        mWifiManager = context.getSystemService(WifiManager.class);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        MainSwitchPreference pref = screen.findPreference(getPreferenceKey());
+        pref.addOnSwitchChangeListener(this);
+        pref.updateStatus(isChecked());
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mContext.getResources().getBoolean(R.bool.config_show_location_scanning)
+                ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return mWifiManager.isScanAlwaysAvailable();
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        mWifiManager.setScanAlwaysAvailable(isChecked);
+        // Returning true means the underlying setting is updated.
+        return true;
+    }
+
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        if (isChecked != isChecked()) {
+            setChecked(isChecked);
+        }
+    }
+}
diff --git a/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java b/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
index e072b5c..e1e56a8 100644
--- a/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
+++ b/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
@@ -17,6 +17,7 @@
 package com.android.settings.network;
 
 import android.content.Context;
+import android.net.wifi.WifiManager;
 import android.provider.Settings;
 
 import androidx.preference.PreferenceScreen;
@@ -28,8 +29,11 @@
  */
 public class AdaptiveConnectivityTogglePreferenceController extends TogglePreferenceController {
 
+    private final WifiManager mWifiManager;
+
     public AdaptiveConnectivityTogglePreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
+        mWifiManager = context.getSystemService(WifiManager.class);
     }
 
     @Override
@@ -53,6 +57,7 @@
         Settings.Secure.putInt(mContext.getContentResolver(),
                 Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED,
                 isChecked ? 1 : 0);
+        mWifiManager.setWifiScoringEnabled(isChecked);
         return true;
     }
 }
diff --git a/src/com/android/settings/network/AirplaneSafeNetworksSlice.java b/src/com/android/settings/network/AirplaneSafeNetworksSlice.java
deleted file mode 100644
index 763e0c7..0000000
--- a/src/com/android/settings/network/AirplaneSafeNetworksSlice.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.net.wifi.WifiManager;
-import android.util.Log;
-
-import androidx.annotation.IntDef;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.ListBuilder.RowBuilder;
-import androidx.slice.builders.SliceAction;
-import androidx.slice.core.SliceHints;
-
-import com.android.settings.AirplaneModeEnabler;
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.slices.CustomSliceRegistry;
-import com.android.settings.slices.CustomSliceable;
-import com.android.settings.slices.SliceBackgroundWorker;
-import com.android.settings.slices.SliceBroadcastReceiver;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * {@link CustomSliceable} for airplane-safe networks, used by generic clients.
- */
-public class AirplaneSafeNetworksSlice implements CustomSliceable,
-        AirplaneModeEnabler.OnAirplaneModeChangedListener {
-
-    private static final String TAG = "AirplaneSafeNetworksSlice";
-
-    public static final String ACTION_INTENT_EXTRA = "action";
-
-    /**
-     * Annotation for different action of the slice.
-     *
-     * {@code TURN_ON_NETWORKS} for action of turning on Wi-Fi networks.
-     * {@code TURN_OFF_NETWORKS} for action of turning off Wi-Fi networks.
-     */
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef(value = {
-            Action.TURN_ON_NETWORKS,
-            Action.TURN_OFF_NETWORKS,
-    })
-    public @interface Action {
-        int TURN_ON_NETWORKS = 1;
-        int TURN_OFF_NETWORKS = 2;
-    }
-
-    private final Context mContext;
-    private final AirplaneModeEnabler mAirplaneModeEnabler;
-    private final WifiManager mWifiManager;
-
-    private boolean mIsAirplaneModeOn;
-
-    public AirplaneSafeNetworksSlice(Context context) {
-        mContext = context;
-        mAirplaneModeEnabler = new AirplaneModeEnabler(context, this);
-        mIsAirplaneModeOn = mAirplaneModeEnabler.isAirplaneModeOn();
-        mWifiManager = mContext.getSystemService(WifiManager.class);
-    }
-
-    private static void logd(String s) {
-        Log.d(TAG, s);
-    }
-
-    @Override
-    public Slice getSlice() {
-        final ListBuilder listBuilder = new ListBuilder(mContext, getUri(), ListBuilder.INFINITY);
-        if (mIsAirplaneModeOn) {
-            listBuilder.addRow(new RowBuilder()
-                    .setTitle(getTitle())
-                    .addEndItem(getEndIcon(), SliceHints.ICON_IMAGE)
-                    .setPrimaryAction(getSliceAction()));
-        }
-        return listBuilder.build();
-    }
-
-    @Override
-    public Uri getUri() {
-        return CustomSliceRegistry.AIRPLANE_SAFE_NETWORKS_SLICE_URI;
-    }
-
-    @Override
-    public void onNotifyChange(Intent intent) {
-        final int action = intent.getIntExtra(ACTION_INTENT_EXTRA, 0);
-        if (action == Action.TURN_ON_NETWORKS) {
-            if (!mWifiManager.isWifiEnabled()) {
-                logd("Action: turn on Wi-Fi networks");
-                mWifiManager.setWifiEnabled(true);
-            }
-        } else if (action == Action.TURN_OFF_NETWORKS) {
-            if (mWifiManager.isWifiEnabled()) {
-                logd("Action: turn off Wi-Fi networks");
-                mWifiManager.setWifiEnabled(false);
-            }
-        }
-    }
-
-    @Override
-    public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
-        mIsAirplaneModeOn = isAirplaneModeOn;
-        final AirplaneSafeNetworksWorker worker = SliceBackgroundWorker.getInstance(getUri());
-        if (worker != null) {
-            worker.updateSlice();
-        }
-    }
-
-    @Override
-    public Intent getIntent() {
-        return new Intent(getUri().toString())
-                .setData(getUri())
-                .setClass(mContext, SliceBroadcastReceiver.class)
-                .putExtra(ACTION_INTENT_EXTRA, getAction());
-    }
-
-    @Action
-    private int getAction() {
-        return mWifiManager.isWifiEnabled()
-                ? Action.TURN_OFF_NETWORKS
-                : Action.TURN_ON_NETWORKS;
-    }
-
-    private String getTitle() {
-        return mContext.getText(
-                (getAction() == Action.TURN_ON_NETWORKS)
-                        ? R.string.turn_on_networks
-                        : R.string.turn_off_networks).toString();
-    }
-
-    private IconCompat getEndIcon() {
-        final Drawable drawable = mContext.getDrawable(
-                (getAction() == Action.TURN_ON_NETWORKS) ? R.drawable.ic_airplane_safe_networks_24dp
-                        : R.drawable.ic_airplanemode_active);
-        if (drawable == null) {
-            return Utils.createIconWithDrawable(new ColorDrawable(Color.TRANSPARENT));
-        }
-        drawable.setTintList(Utils.getColorAttr(mContext, android.R.attr.colorAccent));
-        return Utils.createIconWithDrawable(drawable);
-    }
-
-    private SliceAction getSliceAction() {
-        final PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext,
-                0 /* requestCode */, getIntent(),
-                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
-        final IconCompat icon = Utils.createIconWithDrawable(new ColorDrawable(Color.TRANSPARENT));
-        return SliceAction.create(pendingIntent, icon, ListBuilder.ACTION_WITH_LABEL, getTitle());
-    }
-
-    @Override
-    public Class getBackgroundWorkerClass() {
-        return AirplaneSafeNetworksWorker.class;
-    }
-
-    public static class AirplaneSafeNetworksWorker extends SliceBackgroundWorker {
-
-        private final IntentFilter mIntentFilter;
-        private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                if (WifiManager.WIFI_STATE_CHANGED_ACTION.equals(intent.getAction())) {
-                    notifySliceChange();
-                }
-            }
-        };
-
-        public AirplaneSafeNetworksWorker(Context context, Uri uri) {
-            super(context, uri);
-            mIntentFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
-        }
-
-        @Override
-        protected void onSlicePinned() {
-            getContext().registerReceiver(mBroadcastReceiver, mIntentFilter);
-        }
-
-        @Override
-        protected void onSliceUnpinned() {
-            getContext().unregisterReceiver(mBroadcastReceiver);
-        }
-
-        @Override
-        public void close() {
-            // Do nothing.
-        }
-
-        public void updateSlice() {
-            notifySliceChange();
-        }
-    }
-}
diff --git a/src/com/android/settings/network/AllowedNetworkTypesListener.java b/src/com/android/settings/network/AllowedNetworkTypesListener.java
index a11f3b4..972e4d6 100644
--- a/src/com/android/settings/network/AllowedNetworkTypesListener.java
+++ b/src/com/android/settings/network/AllowedNetworkTypesListener.java
@@ -17,25 +17,23 @@
 package com.android.settings.network;
 
 import android.content.Context;
-import android.telephony.PhoneStateListener;
+import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 
-import java.util.Map;
 import java.util.concurrent.Executor;
 
-
 /**
- * {@link PhoneStateListener} to listen to Allowed Network Types changed
+ * {@link TelephonyCallback} to listen to Allowed Network Types changed
  */
-public class AllowedNetworkTypesListener extends PhoneStateListener implements
-        PhoneStateListener.AllowedNetworkTypesChangedListener {
+public class AllowedNetworkTypesListener extends TelephonyCallback implements
+        TelephonyCallback.AllowedNetworkTypesListener {
     private static final String LOG_TAG = "NetworkModeListener";
 
     @VisibleForTesting
-    AllowedNetworkTypesListener.OnAllowedNetworkTypesChangedListener mListener;
+    OnAllowedNetworkTypesListener mListener;
     private long mAllowedNetworkType = -1;
     private Executor mExecutor;
 
@@ -44,36 +42,37 @@
         mExecutor = executor;
     }
 
-    public void setAllowedNetworkTypesChangedListener(OnAllowedNetworkTypesChangedListener lsn) {
+    public void setAllowedNetworkTypesListener(OnAllowedNetworkTypesListener lsn) {
         mListener = lsn;
     }
 
     /**
-     * Register a PhoneStateListener for Allowed Network Types changed.
+     * Register a TelephonyCallback for Allowed Network Types changed.
      * @param context the Context
      * @param subId the subscription id.
      */
     public void register(Context context, int subId) {
         TelephonyManager telephonyManager = context.getSystemService(
                 TelephonyManager.class).createForSubscriptionId(subId);
-        telephonyManager.registerPhoneStateListener(mExecutor, this);
+        telephonyManager.registerTelephonyCallback(mExecutor, this);
     }
 
     /**
-     * Unregister a PhoneStateListener for Allowed Network Types changed.
+     * Unregister a TelephonyCallback for Allowed Network Types changed.
      * @param context the Context
      * @param subId the subscription id.
      */
     public void unregister(Context context, int subId) {
         TelephonyManager telephonyManager = context.getSystemService(
                 TelephonyManager.class).createForSubscriptionId(subId);
-        telephonyManager.unregisterPhoneStateListener(this);
+        telephonyManager.unregisterTelephonyCallback(this);
     }
 
     @Override
-    public void onAllowedNetworkTypesChanged(Map<Integer, Long> allowedNetworkTypesList) {
-        long newAllowedNetworkType = allowedNetworkTypesList.get(
-                TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER);
+    public void onAllowedNetworkTypesChanged(int reason, long newAllowedNetworkType) {
+        if (reason != TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER) {
+            return;
+        }
         if (mListener != null && mAllowedNetworkType != newAllowedNetworkType) {
             mListener.onAllowedNetworkTypesChanged();
             Log.d(LOG_TAG, "onAllowedNetworkChanged: " + mAllowedNetworkType);
@@ -84,7 +83,7 @@
     /**
      * Listener for update of Preferred Network Mode change
      */
-    public interface OnAllowedNetworkTypesChangedListener {
+    public interface OnAllowedNetworkTypesListener {
         /**
          * Notify the allowed network type changed.
          */
diff --git a/src/com/android/settings/network/BluetoothTetherPreferenceController.java b/src/com/android/settings/network/BluetoothTetherPreferenceController.java
index ab507da..96d39e3 100644
--- a/src/com/android/settings/network/BluetoothTetherPreferenceController.java
+++ b/src/com/android/settings/network/BluetoothTetherPreferenceController.java
@@ -70,7 +70,7 @@
 
     @Override
     public boolean shouldShow() {
-        final String[] bluetoothRegexs = mCm.getTetherableBluetoothRegexs();
+        final String[] bluetoothRegexs = mTm.getTetherableBluetoothRegexs();
         return bluetoothRegexs != null && bluetoothRegexs.length != 0;
     }
 
diff --git a/src/com/android/settings/network/ConnectedEthernetNetworkController.java b/src/com/android/settings/network/ConnectedEthernetNetworkController.java
index 5918331..2f7b4a9 100644
--- a/src/com/android/settings/network/ConnectedEthernetNetworkController.java
+++ b/src/com/android/settings/network/ConnectedEthernetNetworkController.java
@@ -33,7 +33,7 @@
  * PreferenceController to show the connected ethernet network.
  */
 public class ConnectedEthernetNetworkController extends AbstractPreferenceController
-        implements InternetUpdater.OnInternetTypeChangedListener {
+        implements InternetUpdater.InternetChangeListener {
 
     public static final String KEY = "connected_ethernet_network";
 
diff --git a/src/com/android/settings/network/EraseEuiccDataController.java b/src/com/android/settings/network/EraseEuiccDataController.java
index d221fbd..7d71096 100644
--- a/src/com/android/settings/network/EraseEuiccDataController.java
+++ b/src/com/android/settings/network/EraseEuiccDataController.java
@@ -28,8 +28,7 @@
 /**
  * Controller for erasing Euicc data
  */
-public class EraseEuiccDataController extends BasePreferenceController implements
-        PreferenceControllerMixin {
+public class EraseEuiccDataController extends BasePreferenceController {
     private ResetDashboardFragment mHostFragment;
 
     public EraseEuiccDataController(Context context, String preferenceKey) {
diff --git a/src/com/android/settings/network/EraseEuiccDataDialogFragment.java b/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
index 3aee9b1..a141f0c 100644
--- a/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
+++ b/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
@@ -67,7 +67,7 @@
 
     @Override
     public void onClick(DialogInterface dialog, int which) {
-        Fragment fragment = getTargetFragment();
+        final Fragment fragment = getTargetFragment();
         if (!(fragment instanceof ResetDashboardFragment)) {
             Log.e(TAG, "getTargetFragment return unexpected type");
         }
diff --git a/src/com/android/settings/network/EthernetTetherPreferenceController.java b/src/com/android/settings/network/EthernetTetherPreferenceController.java
index 19c410d..06cd6a7 100644
--- a/src/com/android/settings/network/EthernetTetherPreferenceController.java
+++ b/src/com/android/settings/network/EthernetTetherPreferenceController.java
@@ -65,7 +65,7 @@
 
     @Override
     public boolean shouldEnable() {
-        String[] available = mCm.getTetherableIfaces();
+        String[] available = mTm.getTetherableIfaces();
         for (String s : available) {
             if (s.matches(mEthernetRegex)) {
                 return true;
diff --git a/src/com/android/settings/network/InternetPreferenceController.java b/src/com/android/settings/network/InternetPreferenceController.java
index 24fe284..a6c8574 100644
--- a/src/com/android/settings/network/InternetPreferenceController.java
+++ b/src/com/android/settings/network/InternetPreferenceController.java
@@ -19,10 +19,10 @@
 import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
 import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
 
-import static com.android.settings.network.InternetUpdater.INTERNET_APM;
-import static com.android.settings.network.InternetUpdater.INTERNET_APM_NETWORKS;
 import static com.android.settings.network.InternetUpdater.INTERNET_CELLULAR;
 import static com.android.settings.network.InternetUpdater.INTERNET_ETHERNET;
+import static com.android.settings.network.InternetUpdater.INTERNET_NETWORKS_AVAILABLE;
+import static com.android.settings.network.InternetUpdater.INTERNET_OFF;
 import static com.android.settings.network.InternetUpdater.INTERNET_WIFI;
 
 import android.content.Context;
@@ -53,7 +53,7 @@
  */
 public class InternetPreferenceController extends AbstractPreferenceController implements
         LifecycleObserver, SummaryUpdater.OnSummaryChangeListener,
-        InternetUpdater.OnInternetTypeChangedListener {
+        InternetUpdater.InternetChangeListener {
 
     public static final String KEY = "internet_settings";
 
@@ -65,8 +65,8 @@
     @VisibleForTesting
     static Map<Integer, Integer> sIconMap = new HashMap<>();
     static {
-        sIconMap.put(INTERNET_APM, R.drawable.ic_airplanemode_active);
-        sIconMap.put(INTERNET_APM_NETWORKS, R.drawable.ic_airplane_safe_networks_24dp);
+        sIconMap.put(INTERNET_OFF, R.drawable.ic_no_internet_airplane);
+        sIconMap.put(INTERNET_NETWORKS_AVAILABLE, R.drawable.ic_no_internet_available);
         sIconMap.put(INTERNET_WIFI, R.drawable.ic_wifi_signal_4);
         sIconMap.put(INTERNET_CELLULAR, R.drawable.ic_network_cell);
         sIconMap.put(INTERNET_ETHERNET, R.drawable.ic_settings_ethernet);
@@ -74,8 +74,8 @@
 
     private static Map<Integer, Integer> sSummaryMap = new HashMap<>();
     static {
-        sSummaryMap.put(INTERNET_APM, R.string.condition_airplane_title);
-        sSummaryMap.put(INTERNET_APM_NETWORKS, R.string.airplane_mode_network_available);
+        sSummaryMap.put(INTERNET_OFF, R.string.condition_airplane_title);
+        sSummaryMap.put(INTERNET_NETWORKS_AVAILABLE, R.string.disconnected);
         sSummaryMap.put(INTERNET_WIFI, 0);
         sSummaryMap.put(INTERNET_CELLULAR, 0);
         sSummaryMap.put(INTERNET_ETHERNET, R.string.to_switch_networks_disconnect_ethernet);
@@ -114,8 +114,8 @@
             }
         }
 
-        if (mustUseWiFiHelperSummary(mSummaryHelper.isWifiConnected(),
-                mSummaryHelper.getSummary())) {
+        if (mInternetType == INTERNET_WIFI) {
+            mPreference.setSummary(mSummaryHelper.getSummary());
             return;
         }
 
@@ -157,6 +157,7 @@
      *
      * @param internetType the internet type
      */
+    @Override
     public void onInternetTypeChanged(@InternetUpdater.InternetType int internetType) {
         final boolean needUpdate = (internetType != mInternetType);
         mInternetType = internetType;
@@ -167,19 +168,21 @@
         }
     }
 
+    /**
+     * Called when airplane mode state is changed.
+     */
     @Override
-    public void onSummaryChanged(String summary) {
-        mustUseWiFiHelperSummary(mSummaryHelper.isWifiConnected(), summary);
+    public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
+        ThreadUtils.postOnMainThread(() -> {
+            updateState(mPreference);
+        });
     }
 
-    @VisibleForTesting
-    boolean mustUseWiFiHelperSummary(boolean isWifiConnected, String summary) {
-        final boolean needUpdate = (mInternetType == INTERNET_WIFI)
-                || (mInternetType == INTERNET_APM_NETWORKS && isWifiConnected);
-        if (needUpdate && mPreference != null) {
+    @Override
+    public void onSummaryChanged(String summary) {
+        if (mInternetType == INTERNET_WIFI && mPreference != null) {
             mPreference.setSummary(summary);
         }
-        return needUpdate;
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/network/InternetUpdater.java b/src/com/android/settings/network/InternetUpdater.java
index d415b10..2f704e7 100644
--- a/src/com/android/settings/network/InternetUpdater.java
+++ b/src/com/android/settings/network/InternetUpdater.java
@@ -34,6 +34,7 @@
 import android.net.NetworkCapabilities;
 import android.net.NetworkCapabilities.Transport;
 import android.net.wifi.WifiManager;
+import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.Lifecycle;
@@ -55,27 +56,45 @@
 
     private static final String TAG = "InternetUpdater";
 
-    private OnInternetTypeChangedListener mOnInternetTypeChangedListener;
+    private InternetChangeListener mListener;
 
-    /** Interface that handles the internet type changed callback */
-    public interface OnInternetTypeChangedListener {
+    /** Interface that handles the internet updater callback */
+    public interface InternetChangeListener {
         /**
          * Called when internet type is changed.
          *
          * @param internetType the internet type
          */
-        void onInternetTypeChanged(@InternetType int internetType);
+        default void onInternetTypeChanged(@InternetType int internetType) {};
+
+        /**
+         * Called when airplane mode state is changed.
+         */
+        default void onAirplaneModeChanged(boolean isAirplaneModeOn) {};
+
+        /**
+         * Called when Wi-Fi enabled is changed.
+         */
+        default void onWifiEnabledChanged(boolean enabled) {};
     }
 
     /**
-     * Indicates this internet is unavailable type in airplane mode on.
+     * Indicates the internet is off when airplane mode is on.
      */
-    public static final int INTERNET_APM = 0;
+    public static final int INTERNET_OFF = 0;
 
     /**
-     * Indicates this internet uses an airplane mode network type.
+     * Indicates this internet is not connected (includes no networks connected) or network(s)
+     * available.
+     *
+     * Examples include:
+     * <p>When airplane mode is turned off, and some networks (Wi-Fi, Mobile-data) are turned on,
+     * but no network can access the Internet.
+     *
+     * <p>When the airplane mode is turned on, and the WiFi is also turned on, but the WiFi is not
+     * connected or cannot access the Internet.
      */
-    public static final int INTERNET_APM_NETWORKS = 1;
+    public static final int INTERNET_NETWORKS_AVAILABLE = 1;
 
     /**
      * Indicates this internet uses a Wi-Fi network type.
@@ -94,8 +113,8 @@
 
     @Retention(RetentionPolicy.SOURCE)
     @android.annotation.IntDef(prefix = { "INTERNET_" }, value = {
-            INTERNET_APM,
-            INTERNET_APM_NETWORKS,
+            INTERNET_OFF,
+            INTERNET_NETWORKS_AVAILABLE,
             INTERNET_WIFI,
             INTERNET_CELLULAR,
             INTERNET_ETHERNET,
@@ -111,6 +130,8 @@
     AirplaneModeEnabler mAirplaneModeEnabler;
 
     @VisibleForTesting
+    boolean mInternetAvailable;
+    @VisibleForTesting
     @Transport int mTransport;
     private static Map<Integer, Integer> sTransportMap = new HashMap<>();
     static {
@@ -120,22 +141,14 @@
     }
 
     private NetworkCallback mNetworkCallback = new NetworkCallback() {
+        public void onCapabilitiesChanged(@NonNull Network network,
+                @NonNull NetworkCapabilities networkCapabilities) {
+            checkNetworkCapabilities(networkCapabilities);
+        }
+
         @Override
-        public void onAvailable(@NonNull Network network) {
-            if (network == null) {
-                return;
-            }
-            final NetworkCapabilities networkCapabilities =
-                    mConnectivityManager.getNetworkCapabilities(network);
-            if (networkCapabilities == null) {
-                return;
-            }
-            for (@Transport int transport : networkCapabilities.getTransportTypes()) {
-                if (sTransportMap.containsKey(transport)) {
-                    mTransport = transport;
-                    break;
-                }
-            }
+        public void onLost(@NonNull Network network) {
+            mInternetAvailable = false;
             update();
         }
     };
@@ -143,18 +156,21 @@
     private final BroadcastReceiver mWifiStateReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            update();
+            fetchActiveNetwork();
+            if (mListener != null) {
+                mListener.onWifiEnabledChanged(mWifiManager.isWifiEnabled());
+            }
         }
     };
 
-    public InternetUpdater(Context context, Lifecycle lifecycle,
-            OnInternetTypeChangedListener listener) {
+    public InternetUpdater(Context context, Lifecycle lifecycle, InternetChangeListener listener) {
         mContext = context;
         mAirplaneModeEnabler = new AirplaneModeEnabler(mContext, this);
         mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
         mWifiManager = mContext.getSystemService(WifiManager.class);
         mWifiStateFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
-        mOnInternetTypeChangedListener = listener;
+        mListener = listener;
+        fetchActiveNetwork();
         if (lifecycle != null) {
             lifecycle.addObserver(this);
         }
@@ -178,18 +194,65 @@
 
     @Override
     public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
+        fetchActiveNetwork();
+        if (mListener != null) {
+            mListener.onAirplaneModeChanged(isAirplaneModeOn);
+        }
+    }
+
+    private void fetchActiveNetwork() {
+        Network activeNetwork = mConnectivityManager.getActiveNetwork();
+        if (activeNetwork == null) {
+            mInternetAvailable = false;
+            update();
+            return;
+        }
+
+        NetworkCapabilities activeNetworkCapabilities =
+                mConnectivityManager.getNetworkCapabilities(activeNetwork);
+        if (activeNetworkCapabilities == null) {
+            mInternetAvailable = false;
+            update();
+            return;
+        }
+
+        checkNetworkCapabilities(activeNetworkCapabilities);
+    }
+
+    private void checkNetworkCapabilities(@NonNull NetworkCapabilities networkCapabilities) {
+        if (!networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
+            mInternetAvailable = false;
+            update();
+            return;
+        }
+
+        boolean internetAvailable = false;
+        for (@Transport int transport : networkCapabilities.getTransportTypes()) {
+            if (sTransportMap.containsKey(transport)) {
+                mTransport = transport;
+                internetAvailable = true;
+                Log.i(TAG, "Detect an internet capability network with transport type: "
+                        + mTransport);
+                break;
+            }
+        }
+        mInternetAvailable = internetAvailable;
         update();
     }
 
     @VisibleForTesting
     void update() {
-        if (mAirplaneModeEnabler.isAirplaneModeOn()) {
-            mInternetType = mWifiManager.isWifiEnabled() ? INTERNET_APM_NETWORKS : INTERNET_APM;
-        } else {
-            mInternetType = sTransportMap.get(mTransport);
+        @InternetType int internetType = INTERNET_NETWORKS_AVAILABLE;
+        if (mInternetAvailable) {
+            internetType = sTransportMap.get(mTransport);
+        } else if (mAirplaneModeEnabler.isAirplaneModeOn()
+                && mWifiManager.getWifiState() != WifiManager.WIFI_STATE_ENABLED) {
+            internetType = INTERNET_OFF;
         }
-        if (mOnInternetTypeChangedListener != null) {
-            mOnInternetTypeChangedListener.onInternetTypeChanged(mInternetType);
+        mInternetType = internetType;
+
+        if (mListener != null) {
+            mListener.onInternetTypeChanged(mInternetType);
         }
     }
 
@@ -199,4 +262,18 @@
     public @InternetType int getInternetType() {
         return mInternetType;
     }
+
+    /**
+     * Return ture when the airplane mode is on.
+     */
+    public boolean isAirplaneModeOn() {
+        return mAirplaneModeEnabler.isAirplaneModeOn();
+    }
+
+    /**
+     * Return ture when the Wi-Fi is enabled.
+     */
+    public boolean isWifiEnabled() {
+        return mWifiManager.isWifiEnabled();
+    }
 }
diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java
index b968438..527a632 100644
--- a/src/com/android/settings/network/MobileNetworkPreferenceController.java
+++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java
@@ -28,6 +28,7 @@
 import android.provider.Settings;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
+import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
 
 import androidx.annotation.VisibleForTesting;
@@ -55,7 +56,7 @@
     private final UserManager mUserManager;
     private Preference mPreference;
     @VisibleForTesting
-    PhoneStateListener mPhoneStateListener;
+    MobileNetworkTelephonyCallback mTelephonyCallback;
 
     private BroadcastReceiver mAirplanModeChangedReceiver;
 
@@ -97,18 +98,22 @@
         return KEY_MOBILE_NETWORK_SETTINGS;
     }
 
+    class MobileNetworkTelephonyCallback extends TelephonyCallback implements
+            TelephonyCallback.ServiceStateListener {
+        @Override
+        public void onServiceStateChanged(ServiceState serviceState) {
+            updateState(mPreference);
+        }
+    }
+
     @OnLifecycleEvent(Event.ON_START)
     public void onStart() {
         if (isAvailable()) {
-            if (mPhoneStateListener == null) {
-                mPhoneStateListener = new PhoneStateListener() {
-                    @Override
-                    public void onServiceStateChanged(ServiceState serviceState) {
-                        updateState(mPreference);
-                    }
-                };
+            if (mTelephonyCallback == null) {
+                mTelephonyCallback = new MobileNetworkTelephonyCallback();
             }
-            mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_SERVICE_STATE);
+            mTelephonyManager.registerTelephonyCallback(
+                    mContext.getMainExecutor(), mTelephonyCallback);
         }
         if (mAirplanModeChangedReceiver != null) {
             mContext.registerReceiver(mAirplanModeChangedReceiver,
@@ -118,8 +123,8 @@
 
     @OnLifecycleEvent(Event.ON_STOP)
     public void onStop() {
-        if (mPhoneStateListener != null) {
-            mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+        if (mTelephonyCallback != null) {
+            mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
         }
         if (mAirplanModeChangedReceiver != null) {
             mContext.unregisterReceiver(mAirplanModeChangedReceiver);
diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java
index b4135b8..d8963ad 100644
--- a/src/com/android/settings/network/MobilePlanPreferenceController.java
+++ b/src/com/android/settings/network/MobilePlanPreferenceController.java
@@ -47,7 +47,6 @@
 
 import java.util.List;
 
-
 public class MobilePlanPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState {
 
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index 14d85e9..f023ced 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -146,7 +146,6 @@
         controllers.add(privateDnsPreferenceController);
         if (Utils.isProviderModelEnabled(context)) {
             controllers.add(new NetworkProviderCallsSmsController(context, lifecycle));
-            controllers.add(new AirplaneSafeNetworksPreferenceController(context, lifecycle));
         }
         return controllers;
     }
diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
index a811978..fcb8345 100644
--- a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
+++ b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
@@ -27,7 +27,6 @@
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.network.telephony.CallsDefaultSubscriptionController;
 import com.android.settings.network.telephony.NetworkProviderBackupCallingPreferenceController;
-import com.android.settings.network.telephony.NetworkProviderWfcFooterPreferenceController;
 import com.android.settings.network.telephony.NetworkProviderWifiCallingPreferenceController;
 import com.android.settings.network.telephony.SmsDefaultSubscriptionController;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -46,8 +45,6 @@
     @VisibleForTesting
     static final String KEY_PREFERENCE_CATEGORY_BACKUP_CALLING =
             "provider_model_backup_calling_category";
-    static final String KEY_PREFERENCE_CATEGORY_WFC_FOOTER =
-            "provider_model_calls_sms_footer";
 
     @VisibleForTesting
     static final String KEY_PREFERENCE_CALLS= "provider_model_calls_preference";
@@ -74,12 +71,6 @@
         backupCallingPrefCtrl.init(getSettingsLifecycle());
         controllers.add(backupCallingPrefCtrl);
 
-        NetworkProviderWfcFooterPreferenceController wfcFooterPreferenceController =
-                new NetworkProviderWfcFooterPreferenceController(context,
-                        KEY_PREFERENCE_CATEGORY_WFC_FOOTER);
-        wfcFooterPreferenceController.init(getSettingsLifecycle());
-        controllers.add(wfcFooterPreferenceController);
-
         return controllers;
     }
 
diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index ebf59a2..803b981 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -55,6 +55,7 @@
 import androidx.preference.PreferenceScreen;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.android.settings.AirplaneModeEnabler;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
 import com.android.settings.core.FeatureFlags;
@@ -98,7 +99,8 @@
 public class NetworkProviderSettings extends RestrictedSettingsFragment
         implements Indexable, WifiPickerTracker.WifiPickerTrackerCallback,
         WifiDialog2.WifiDialog2Listener, DialogInterface.OnDismissListener,
-        ConnectivitySubsystemsRecoveryManager.RecoveryStatusCallback {
+        ConnectivitySubsystemsRecoveryManager.RecoveryStatusCallback,
+        AirplaneModeEnabler.OnAirplaneModeChangedListener {
 
     public static final String ACTION_NETWORK_PROVIDER_SETTINGS =
             "android.settings.NETWORK_PROVIDER_SETTINGS";
@@ -118,6 +120,7 @@
     static final int CONFIG_NETWORK_REQUEST = 3;
     static final int MANAGE_SUBSCRIPTION = 4;
 
+    private static final String PREF_KEY_AIRPLANE_MODE_MSG = "airplane_mode_message";
     private static final String PREF_KEY_EMPTY_WIFI_LIST = "wifi_empty_list";
     // TODO(b/70983952): Rename these to use WifiEntry instead of AccessPoint.
     private static final String PREF_KEY_CONNECTED_ACCESS_POINTS = "connected_access_point";
@@ -185,6 +188,8 @@
     private boolean mIsRestricted;
 
     @VisibleForTesting
+    AirplaneModeEnabler mAirplaneModeEnabler;
+    @VisibleForTesting
     WifiPickerTracker mWifiPickerTracker;
     private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
 
@@ -196,6 +201,7 @@
     private PreferenceCategory mWifiEntryPreferenceCategory;
     @VisibleForTesting
     AddWifiNetworkPreference mAddWifiNetworkPreference;
+    private WifiSwitchPreferenceController mWifiSwitchPreferenceController;
     @VisibleForTesting
     Preference mConfigureWifiSettingsPreference;
     @VisibleForTesting
@@ -203,8 +209,7 @@
     @VisibleForTesting
     DataUsagePreference mDataUsagePreference;
     @VisibleForTesting
-    ViewAirplaneModeNetworksLayoutPreferenceController
-            mViewAirplaneModeNetworksButtonPreference;
+    Preference mAirplaneModeMsgPreference;
     @VisibleForTesting
     LayoutPreference mResetInternetPreference;
     @VisibleForTesting
@@ -240,6 +245,7 @@
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        mAirplaneModeEnabler = new AirplaneModeEnabler(getContext(), this);
 
         // TODO(b/37429702): Add animations and preference comparator back after initial screen is
         // loaded (ODR).
@@ -253,6 +259,8 @@
     private void addPreferences() {
         addPreferencesFromResource(R.xml.network_provider_settings);
 
+        mAirplaneModeMsgPreference = findPreference(PREF_KEY_AIRPLANE_MODE_MSG);
+        updateAirplaneModeMsgPreference(mAirplaneModeEnabler.isAirplaneModeOn() /* visible */);
         mConnectedWifiEntryPreferenceCategory = findPreference(PREF_KEY_CONNECTED_ACCESS_POINTS);
         mWifiEntryPreferenceCategory = findPreference(PREF_KEY_ACCESS_POINTS);
         mConfigureWifiSettingsPreference = findPreference(PREF_KEY_CONFIGURE_WIFI_SETTINGS);
@@ -268,8 +276,14 @@
             mResetInternetPreference.setVisible(false);
         }
         addNetworkMobileProviderController();
-        addViewAirplaneModeNetworksButtonController();
         addConnectedEthernetNetworkController();
+        addWifiSwitchPreferenceController();
+    }
+
+    private void updateAirplaneModeMsgPreference(boolean visible) {
+        if (mAirplaneModeMsgPreference != null) {
+            mAirplaneModeMsgPreference.setVisible(visible);
+        }
     }
 
     private void addNetworkMobileProviderController() {
@@ -281,15 +295,6 @@
         mNetworkMobileProviderController.displayPreference(getPreferenceScreen());
     }
 
-    private void addViewAirplaneModeNetworksButtonController() {
-        if (mViewAirplaneModeNetworksButtonPreference == null) {
-            mViewAirplaneModeNetworksButtonPreference =
-                    new ViewAirplaneModeNetworksLayoutPreferenceController(
-                            getContext(), getSettingsLifecycle());
-        }
-        mViewAirplaneModeNetworksButtonPreference.displayPreference(getPreferenceScreen());
-    }
-
     private void addConnectedEthernetNetworkController() {
         if (mConnectedEthernetNetworkController == null) {
             mConnectedEthernetNetworkController =
@@ -298,6 +303,14 @@
         mConnectedEthernetNetworkController.displayPreference(getPreferenceScreen());
     }
 
+    private void addWifiSwitchPreferenceController() {
+        if (mWifiSwitchPreferenceController == null) {
+            mWifiSwitchPreferenceController =
+                    new WifiSwitchPreferenceController(getContext(), getSettingsLifecycle());
+        }
+        mWifiSwitchPreferenceController.displayPreference(getPreferenceScreen());
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -376,10 +389,11 @@
     @Override
     public void onStart() {
         super.onStart();
-
         if (mIsRestricted) {
             restrictUi();
+            return;
         }
+        mAirplaneModeEnabler.start();
     }
 
     private void restrictUi() {
@@ -409,6 +423,7 @@
     public void onStop() {
         getView().removeCallbacks(mUpdateWifiEntryPreferencesRunnable);
         getView().removeCallbacks(mHideProgressBarRunnable);
+        mAirplaneModeEnabler.stop();
         super.onStop();
     }
 
@@ -1178,9 +1193,7 @@
         if (mResetInternetPreference != null) {
             mResetInternetPreference.setVisible(true);
         }
-        if (mViewAirplaneModeNetworksButtonPreference != null) {
-            mViewAirplaneModeNetworksButtonPreference.setVisible(false);
-        }
+        updateAirplaneModeMsgPreference(false /* visible */);
     }
 
     /**
@@ -1190,9 +1203,18 @@
         if (mResetInternetPreference != null) {
             mResetInternetPreference.setVisible(false);
         }
-        if (mViewAirplaneModeNetworksButtonPreference != null
-                && mViewAirplaneModeNetworksButtonPreference.isAvailable()) {
-            mViewAirplaneModeNetworksButtonPreference.setVisible(true);
+        if (mAirplaneModeEnabler.isAirplaneModeOn()) {
+            updateAirplaneModeMsgPreference(true /* visible */);
         }
     }
+
+    /**
+     * Called when airplane mode status is changed.
+     *
+     * @param isAirplaneModeOn The airplane mode is on
+     */
+    @Override
+    public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
+        updateAirplaneModeMsgPreference(isAirplaneModeOn /* visible */);
+    }
 }
diff --git a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
index 7239b00..4b452c0 100644
--- a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
+++ b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
@@ -23,7 +23,6 @@
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
 
diff --git a/src/com/android/settings/network/OWNERS b/src/com/android/settings/network/OWNERS
index 4f17e3f..ee5b494 100644
--- a/src/com/android/settings/network/OWNERS
+++ b/src/com/android/settings/network/OWNERS
@@ -2,10 +2,12 @@
 allenwtsu@google.com
 andychou@google.com
 bonianchen@google.com
+changbetty@google.com
 goldmanj@google.com
 leechou@google.com
 songferngwang@google.com
 tomhsu@google.com
+wengsu@google.com
 zoeychen@google.com
 
 # Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
index 4878f31..822aad0 100644
--- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
+++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
@@ -15,7 +15,6 @@
  */
 package com.android.settings.network;
 
-import static android.net.ConnectivityManager.PRIVATE_DNS_DEFAULT_MODE_FALLBACK;
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF;
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
@@ -28,6 +27,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.net.ConnectivityManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -84,14 +84,6 @@
     @VisibleForTesting
     static final String HOSTNAME_KEY = Settings.Global.PRIVATE_DNS_SPECIFIER;
 
-    public static String getModeFromSettings(ContentResolver cr) {
-        String mode = Settings.Global.getString(cr, MODE_KEY);
-        if (!PRIVATE_DNS_MAP.containsKey(mode)) {
-            mode = Settings.Global.getString(cr, Settings.Global.PRIVATE_DNS_DEFAULT_MODE);
-        }
-        return PRIVATE_DNS_MAP.containsKey(mode) ? mode : PRIVATE_DNS_DEFAULT_MODE_FALLBACK;
-    }
-
     public static String getHostnameFromSettings(ContentResolver cr) {
         return Settings.Global.getString(cr, HOSTNAME_KEY);
     }
@@ -168,7 +160,7 @@
         final Context context = getContext();
         final ContentResolver contentResolver = context.getContentResolver();
 
-        mMode = getModeFromSettings(context.getContentResolver());
+        mMode = ConnectivityManager.getPrivateDnsMode(context);
 
         mEditText = view.findViewById(R.id.private_dns_mode_provider_hostname);
         mEditText.addTextChangedListener(this);
diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java
index 84cae88..4aa92f4 100644
--- a/src/com/android/settings/network/PrivateDnsPreferenceController.java
+++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java
@@ -118,7 +118,7 @@
     public CharSequence getSummary() {
         final Resources res = mContext.getResources();
         final ContentResolver cr = mContext.getContentResolver();
-        final String mode = PrivateDnsModeDialogPreference.getModeFromSettings(cr);
+        final String mode = ConnectivityManager.getPrivateDnsMode(mContext);
         final LinkProperties lp = mLatestLinkProperties;
         final List<InetAddress> dnses = (lp == null) ? null : lp.getValidatedPrivateDnsServers();
         final boolean dnsesResolved = !ArrayUtils.isEmpty(dnses);
diff --git a/src/com/android/settings/network/ProviderModelSlice.java b/src/com/android/settings/network/ProviderModelSlice.java
index c020f06..18765a8 100644
--- a/src/com/android/settings/network/ProviderModelSlice.java
+++ b/src/com/android/settings/network/ProviderModelSlice.java
@@ -83,8 +83,9 @@
         // Second section:  Add a carrier item.
         // Third section:  Add the Wi-Fi items which are not connected.
         // Fourth section:  If device has connection problem, this row show the message for user.
+        boolean hasEthernet = isEthernetConnected();
         final ListBuilder listBuilder = mHelper.createListBuilder(getUri());
-        if (mHelper.isAirplaneModeEnabled() && !mWifiManager.isWifiEnabled()) {
+        if (mHelper.isAirplaneModeEnabled() && !mWifiManager.isWifiEnabled() && !hasEthernet) {
             log("Airplane mode is enabled.");
             return listBuilder.build();
         }
@@ -104,12 +105,12 @@
         log("hasCarrier: " + hasCarrier);
 
         // First section:  Add a Ethernet or Wi-Fi item which state is connected.
-        if (isEthernetConnected()) {
+        final WifiSliceItem connectedWifiItem = mHelper.getConnectedWifiItem(wifiList);
+        if (hasEthernet) {
             log("get Ethernet item which is connected");
             listBuilder.addRow(createEthernetRow());
             maxListSize--;
         } else {
-            final WifiSliceItem connectedWifiItem = mHelper.getConnectedWifiItem(wifiList);
             if (connectedWifiItem != null) {
                 log("get Wi-Fi item which is connected");
                 listBuilder.addRow(getWifiSliceItemRow(connectedWifiItem));
@@ -126,7 +127,14 @@
             maxListSize--;
         }
 
-        // Third section:  Add the Wi-Fi items which are not connected.
+        // Third section:  Add the connected Wi-Fi item to Wi-Fi list if the Ethernet is connected.
+        if (connectedWifiItem != null && hasEthernet) {
+            log("get Wi-Fi item which is connected");
+            listBuilder.addRow(getWifiSliceItemRow(connectedWifiItem));
+            maxListSize--;
+        }
+
+        // Fourth section:  Add the Wi-Fi items which are not connected.
         if (wifiList != null && wifiList.size() > 0) {
             log("get Wi-Fi items which are not connected. Wi-Fi items : " + wifiList.size());
 
@@ -139,31 +147,6 @@
                 listBuilder.addRow(getWifiSliceItemRow(item));
             }
         }
-
-        // Fourth section:  If device has connection problem, this row show the message for user.
-        // 1) show non_carrier_network_unavailable:
-        //    - while no wifi item
-        // 2) show all_network_unavailable:
-        //    - while no wifi item + no carrier
-        //    - while no wifi item + no data capability
-        if (worker == null || wifiList == null || wifiList.size() == 0) {
-            log("no wifi item");
-            int resId = R.string.non_carrier_network_unavailable;
-            if (!hasCarrier || !mHelper.isDataSimActive()) {
-                log("No carrier item or no carrier data.");
-                resId = R.string.all_network_unavailable;
-            }
-
-            if (!hasCarrier) {
-                // If there is no item in ProviderModelItem, slice needs a header.
-                listBuilder.setHeader(mHelper.createHeader(
-                        NetworkProviderSettings.ACTION_NETWORK_PROVIDER_SETTINGS));
-            }
-            listBuilder.addGridRow(
-                    mHelper.createMessageGridRow(resId,
-                            NetworkProviderSettings.ACTION_NETWORK_PROVIDER_SETTINGS));
-        }
-
         return listBuilder.build();
     }
 
diff --git a/src/com/android/settings/network/ProviderModelSliceHelper.java b/src/com/android/settings/network/ProviderModelSliceHelper.java
index 8ae4197..440d425 100644
--- a/src/com/android/settings/network/ProviderModelSliceHelper.java
+++ b/src/com/android/settings/network/ProviderModelSliceHelper.java
@@ -36,7 +36,6 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.builders.GridRowBuilder;
 import androidx.slice.builders.ListBuilder;
 import androidx.slice.builders.SliceAction;
 
@@ -79,12 +78,6 @@
         Log.d(TAG, s);
     }
 
-    protected ListBuilder.HeaderBuilder createHeader(String intentAction) {
-        return new ListBuilder.HeaderBuilder()
-                .setTitle(mContext.getText(R.string.summary_placeholder))
-                .setPrimaryAction(getPrimarySliceAction(intentAction));
-    }
-
     protected ListBuilder createListBuilder(Uri uri) {
         final ListBuilder builder = new ListBuilder(mContext, uri, ListBuilder.INFINITY)
                 .setAccentColor(-1)
@@ -92,14 +85,6 @@
         return builder;
     }
 
-    protected GridRowBuilder createMessageGridRow(int messageResId, String intentAction) {
-        final CharSequence title = mContext.getText(messageResId);
-        return new GridRowBuilder()
-                // Add cells to the grid row.
-                .addCell(new GridRowBuilder.CellBuilder().addTitleText(title))
-                .setPrimaryAction(getPrimarySliceAction(intentAction));
-    }
-
     @Nullable
     protected WifiSliceItem getConnectedWifiItem(List<WifiSliceItem> wifiList) {
         if (wifiList == null) {
@@ -111,7 +96,10 @@
         return item.isPresent() ? item.get() : null;
     }
 
-    protected boolean hasCarrier() {
+    /**
+     * @return whether there is the carrier item in the slice.
+     */
+    public boolean hasCarrier() {
         if (isAirplaneModeEnabled()
                 || mSubscriptionManager == null || mTelephonyManager == null
                 || mSubscriptionManager.getDefaultDataSubscriptionId()
@@ -175,7 +163,12 @@
         return mTelephonyManager.isDataEnabled();
     }
 
-    protected boolean isDataSimActive() {
+    /**
+     * To check the carrier data status.
+     *
+     * @return whether the carrier data is active.
+     */
+    public boolean isDataSimActive() {
         return isNoCarrierData() ? false : MobileNetworkUtils.activeNetworkIsCellular(mContext);
     }
 
@@ -193,11 +186,6 @@
         return mobileDataOnAndNoData || mobileDataOffAndOutOfService;
     }
 
-    private boolean isAirplaneSafeNetworksModeEnabled() {
-        // TODO: isAirplaneSafeNetworksModeEnabled is not READY
-        return false;
-    }
-
     @VisibleForTesting
     Drawable getMobileDrawable(Drawable drawable) throws Throwable {
         // set color and drawable
diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index aa70459..be8f257 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -70,6 +70,9 @@
         if (sActiveResultsForTesting != null) {
             return sActiveResultsForTesting;
         }
+        if (manager == null) {
+            return Collections.emptyList();
+        }
         final List<SubscriptionInfo> subscriptions = manager.getActiveSubscriptionInfoList();
         if (subscriptions == null) {
             return new ArrayList<>();
diff --git a/src/com/android/settings/network/SubscriptionsPreferenceController.java b/src/com/android/settings/network/SubscriptionsPreferenceController.java
index d028c58..f89ccfd 100644
--- a/src/com/android/settings/network/SubscriptionsPreferenceController.java
+++ b/src/com/android/settings/network/SubscriptionsPreferenceController.java
@@ -35,6 +35,7 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyDisplayInfo;
 import android.telephony.TelephonyManager;
+import android.text.Html;
 import android.util.ArraySet;
 
 import androidx.annotation.VisibleForTesting;
@@ -255,14 +256,18 @@
         mUpdateListener.onChildrenUpdated();
     }
 
-    private String getMobilePreferenceSummary(int subId) {
+    private CharSequence getMobilePreferenceSummary(int subId) {
+        TelephonyManager tm = mTelephonyManager.createForSubscriptionId(subId);
         String result = mSubsPrefCtrlInjector.getNetworkType(
                 mContext, mConfig, mTelephonyDisplayInfo, subId);
+        if (!tm.isDataEnabled()) {
+            return mContext.getString(R.string.mobile_data_off_summary);
+        }
         if (!result.isEmpty() && mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext)) {
             result = mContext.getString(R.string.preference_summary_default_combination,
                     mContext.getString(R.string.mobile_data_connection_active), result);
         }
-        return result;
+        return Html.fromHtml(result, Html.FROM_HTML_MODE_LEGACY);
     }
 
     private Drawable getIcon(int subId) {
diff --git a/src/com/android/settings/network/TetherBasePreferenceController.java b/src/com/android/settings/network/TetherBasePreferenceController.java
index 1919770..822aa72 100644
--- a/src/com/android/settings/network/TetherBasePreferenceController.java
+++ b/src/com/android/settings/network/TetherBasePreferenceController.java
@@ -17,7 +17,7 @@
 package com.android.settings.network;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
@@ -33,7 +33,7 @@
         TetherEnabler.OnTetherStateUpdateListener {
 
     private static final String TAG = "TetherBasePreferenceController";
-    final ConnectivityManager mCm;
+    final TetheringManager mTm;
     private final DataSaverBackend mDataSaverBackend;
 
     private TetherEnabler mTetherEnabler;
@@ -43,7 +43,7 @@
 
     TetherBasePreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mCm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        mTm = context.getSystemService(TetheringManager.class);
         mDataSaverBackend = new DataSaverBackend(context);
         mDataSaverEnabled = mDataSaverBackend.isDataSaverEnabled();
     }
diff --git a/src/com/android/settings/network/TetherEnabler.java b/src/com/android/settings/network/TetherEnabler.java
index 6ab4cb2..ef031f6 100644
--- a/src/com/android/settings/network/TetherEnabler.java
+++ b/src/com/android/settings/network/TetherEnabler.java
@@ -147,7 +147,7 @@
         mSwitchWidgetController.setListener(this);
         mSwitchWidgetController.startListening();
         final IntentFilter filter = new IntentFilter(
-                ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
+                TetheringManager.ACTION_TETHER_STATE_CHANGED);
         filter.addAction(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
         filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
         mContext.registerReceiver(mTetherChangeReceiver, filter);
@@ -222,7 +222,7 @@
     int getTetheringState(@Nullable String[] tethered) {
         int tetherState = TETHERING_OFF;
         if (tethered == null) {
-            tethered = mConnectivityManager.getTetheredIfaces();
+            tethered = mTetheringManager.getTetheredIfaces();
         }
 
         if (mWifiManager.isWifiApEnabled()) {
@@ -239,7 +239,7 @@
             }
         }
 
-        String[] usbRegexs = mConnectivityManager.getTetherableUsbRegexs();
+        String[] usbRegexs = mTetheringManager.getTetherableUsbRegexs();
         for (String s : tethered) {
             for (String regex : usbRegexs) {
                 if (s.matches(regex)) {
diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index 2409544..f91f787 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -27,7 +27,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.database.ContentObserver;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -60,8 +60,8 @@
 
     private final boolean mAdminDisallowedTetherConfig;
     private final AtomicReference<BluetoothPan> mBluetoothPan;
-    private final ConnectivityManager mConnectivityManager;
     private final BluetoothAdapter mBluetoothAdapter;
+    private final TetheringManager mTetheringManager;
     @VisibleForTesting
     final BluetoothProfile.ServiceListener mBtProfileServiceListener =
             new android.bluetooth.BluetoothProfile.ServiceListener() {
@@ -84,17 +84,16 @@
         super(null);
         mAdminDisallowedTetherConfig = false;
         mBluetoothPan = new AtomicReference<>();
-        mConnectivityManager = null;
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        mTetheringManager = null;
     }
 
     public TetherPreferenceController(Context context, Lifecycle lifecycle) {
         super(context);
         mBluetoothPan = new AtomicReference<>();
         mAdminDisallowedTetherConfig = isTetherConfigDisallowed(context);
-        mConnectivityManager =
-                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        mTetheringManager = context.getSystemService(TetheringManager.class);
         if (lifecycle != null) {
             lifecycle.addObserver(this);
         }
@@ -106,7 +105,7 @@
         mPreference = screen.findPreference(KEY_TETHER_SETTINGS);
         if (mPreference != null && !mAdminDisallowedTetherConfig) {
             mPreference.setTitle(
-                    com.android.settingslib.Utils.getTetheringLabel(mConnectivityManager));
+                    com.android.settingslib.Utils.getTetheringLabel(mTetheringManager));
         }
     }
 
@@ -144,7 +143,7 @@
             mTetherReceiver = new TetherBroadcastReceiver();
         }
         mContext.registerReceiver(
-                mTetherReceiver, new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED));
+                mTetherReceiver, new IntentFilter(TetheringManager.ACTION_TETHER_STATE_CHANGED));
         mContext.getContentResolver()
                 .registerContentObserver(mAirplaneModeObserver.uri, false, mAirplaneModeObserver);
     }
@@ -178,9 +177,9 @@
             // Preference is not ready yet.
             return;
         }
-        String[] allTethered = mConnectivityManager.getTetheredIfaces();
-        String[] wifiTetherRegex = mConnectivityManager.getTetherableWifiRegexs();
-        String[] bluetoothRegex = mConnectivityManager.getTetherableBluetoothRegexs();
+        String[] allTethered = mTetheringManager.getTetheredIfaces();
+        String[] wifiTetherRegex = mTetheringManager.getTetherableWifiRegexs();
+        String[] bluetoothRegex = mTetheringManager.getTetherableBluetoothRegexs();
 
         boolean hotSpotOn = false;
         boolean tetherOn = false;
@@ -211,7 +210,7 @@
                 && bluetoothRegex != null && bluetoothRegex.length > 0
                 && mBluetoothAdapter != null
                 && mBluetoothAdapter.getState() == BluetoothAdapter.STATE_ON) {
-            // Check bluetooth state. It's not included in mConnectivityManager.getTetheredIfaces.
+            // Check bluetooth state. It's not included in mTetheringManager.getTetheredIfaces.
             final BluetoothPan pan = mBluetoothPan.get();
             tetherOn = pan != null && pan.isTetheringOn();
         }
diff --git a/src/com/android/settings/network/TurnOnWifiSlice.java b/src/com/android/settings/network/TurnOnWifiSlice.java
new file mode 100644
index 0000000..05a873f
--- /dev/null
+++ b/src/com/android/settings/network/TurnOnWifiSlice.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.net.wifi.WifiManager;
+import android.util.Log;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.ListBuilder.RowBuilder;
+import androidx.slice.builders.SliceAction;
+import androidx.slice.core.SliceHints;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.slices.CustomSliceRegistry;
+import com.android.settings.slices.CustomSliceable;
+import com.android.settings.slices.SliceBackgroundWorker;
+import com.android.settings.slices.SliceBroadcastReceiver;
+
+/**
+ * {@link CustomSliceable} for turning on Wi-Fi, used by generic clients.
+ */
+public class TurnOnWifiSlice implements CustomSliceable {
+
+    private static final String TAG = "TurnOnWifiSlice";
+
+    private final Context mContext;
+    private final WifiManager mWifiManager;
+
+    public TurnOnWifiSlice(Context context) {
+        mContext = context;
+        mWifiManager = mContext.getSystemService(WifiManager.class);
+    }
+
+    private static void logd(String s) {
+        Log.d(TAG, s);
+    }
+
+    @Override
+    public Slice getSlice() {
+        if (mWifiManager.isWifiEnabled()) {
+            return null;
+        }
+        final String title = mContext.getText(R.string.turn_on_wifi).toString();
+        final SliceAction primaryAction = SliceAction.create(getBroadcastIntent(mContext),
+                getEndIcon(), ListBuilder.ICON_IMAGE, title);
+        final ListBuilder listBuilder = new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
+                .addRow(new RowBuilder()
+                        .setTitle(title)
+                        .addEndItem(getEndIcon(), SliceHints.ICON_IMAGE)
+                        .setPrimaryAction(primaryAction));
+        return listBuilder.build();
+    }
+
+    @Override
+    public Uri getUri() {
+        return CustomSliceRegistry.TURN_ON_WIFI_SLICE_URI;
+    }
+
+    @Override
+    public void onNotifyChange(Intent intent) {
+        logd("Action: turn on Wi-Fi networks");
+        mWifiManager.setWifiEnabled(true);
+    }
+
+    @Override
+    public Intent getIntent() {
+        return new Intent(getUri().toString())
+                .setData(getUri())
+                .setClass(mContext, SliceBroadcastReceiver.class);
+    }
+
+    private IconCompat getEndIcon() {
+        final Drawable drawable = mContext.getDrawable(R.drawable.ic_settings_wireless);
+        if (drawable == null) {
+            return Utils.createIconWithDrawable(new ColorDrawable(Color.TRANSPARENT));
+        }
+        drawable.setTintList(Utils.getColorAttr(mContext, android.R.attr.colorAccent));
+        return Utils.createIconWithDrawable(drawable);
+    }
+
+    @Override
+    public Class getBackgroundWorkerClass() {
+        return TurnOnWifiWorker.class;
+    }
+
+    /**
+     * The Slice background worker {@link SliceBackgroundWorker} is used to listen the Wi-Fi
+     * status change, and then notifies the Slice {@link Uri} to update.
+     */
+    public static class TurnOnWifiWorker extends SliceBackgroundWorker {
+
+        private final IntentFilter mIntentFilter;
+        private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (WifiManager.WIFI_STATE_CHANGED_ACTION.equals(intent.getAction())) {
+                    notifySliceChange();
+                }
+            }
+        };
+
+        public TurnOnWifiWorker(Context context, Uri uri) {
+            super(context, uri);
+            mIntentFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
+        }
+
+        @Override
+        protected void onSlicePinned() {
+            getContext().registerReceiver(mBroadcastReceiver, mIntentFilter);
+        }
+
+        @Override
+        protected void onSliceUnpinned() {
+            getContext().unregisterReceiver(mBroadcastReceiver);
+        }
+
+        @Override
+        public void close() {
+            // Do nothing.
+        }
+    }
+}
diff --git a/src/com/android/settings/network/UsbTetherPreferenceController.java b/src/com/android/settings/network/UsbTetherPreferenceController.java
index 7cf1ddf..7a5cc21 100644
--- a/src/com/android/settings/network/UsbTetherPreferenceController.java
+++ b/src/com/android/settings/network/UsbTetherPreferenceController.java
@@ -68,7 +68,7 @@
 
     @Override
     public boolean shouldShow() {
-        String[] usbRegexs = mCm.getTetherableUsbRegexs();
+        String[] usbRegexs = mTm.getTetherableUsbRegexs();
         return  usbRegexs != null && usbRegexs.length != 0 && !Utils.isMonkeyRunning();
     }
 
diff --git a/src/com/android/settings/network/ViewAirplaneModeNetworksLayoutPreferenceController.java b/src/com/android/settings/network/ViewAirplaneModeNetworksLayoutPreferenceController.java
deleted file mode 100644
index 923e773..0000000
--- a/src/com/android/settings/network/ViewAirplaneModeNetworksLayoutPreferenceController.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.wifi.WifiManager;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.OnLifecycleEvent;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.AirplaneModeEnabler;
-import com.android.settings.R;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.widget.LayoutPreference;
-
-/**
- * This controls the airplane mode message and click button of the "View airplane mode networks"
- * item on the Network & internet page.
- */
-public class ViewAirplaneModeNetworksLayoutPreferenceController extends AbstractPreferenceController
-        implements LifecycleObserver, AirplaneModeEnabler.OnAirplaneModeChangedListener,
-        View.OnClickListener {
-
-    public static final String KEY = "view_airplane_mode_netwokrs_button";
-
-    private LayoutPreference mPreference;
-    @VisibleForTesting
-    TextView mTextView;
-    @VisibleForTesting
-    Button mButton;
-
-    private AirplaneModeEnabler mAirplaneModeEnabler;
-    private final WifiManager mWifiManager;
-    private final IntentFilter mIntentFilter;
-    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (WifiManager.WIFI_STATE_CHANGED_ACTION.equals(intent.getAction())) {
-                refreshLayout();
-            }
-        }
-    };
-
-    public ViewAirplaneModeNetworksLayoutPreferenceController(Context context,
-            Lifecycle lifecycle) {
-        super(context);
-        if (lifecycle == null) {
-            throw new IllegalArgumentException("Lifecycle must be set");
-        }
-        mAirplaneModeEnabler = new AirplaneModeEnabler(context, this);
-        mWifiManager = context.getSystemService(WifiManager.class);
-        mIntentFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
-        lifecycle.addObserver(this);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return mAirplaneModeEnabler.isAirplaneModeOn();
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreference = screen.findPreference(getPreferenceKey());
-        generateLayout();
-    }
-
-    /** Lifecycle.Event.ON_START */
-    @OnLifecycleEvent(Lifecycle.Event.ON_START)
-    public void onStart() {
-        mAirplaneModeEnabler.start();
-    }
-
-    /** Lifecycle.Event.ON_STOP */
-    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
-    public void onStop() {
-        mAirplaneModeEnabler.stop();
-    }
-
-    /** Lifecycle.Event.ON_RESUME */
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
-    public void onResume() {
-        mContext.registerReceiver(mBroadcastReceiver, mIntentFilter);
-    }
-
-    /** Lifecycle.Event.ON_PAUSE */
-    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
-    public void onPause() {
-        mContext.unregisterReceiver(mBroadcastReceiver);
-    }
-
-    @Override
-    public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
-        if (mPreference != null) {
-            mPreference.setVisible(isAirplaneModeOn);
-        }
-    }
-
-    @Override
-    public void onClick(View v) {
-        mWifiManager.setWifiEnabled(true);
-    }
-
-    private void generateLayout() {
-        if (mPreference == null) {
-            return;
-        }
-        if (mTextView == null) {
-            mTextView = mPreference.findViewById(R.id.airplane_mode_text);
-        }
-        if (mButton == null) {
-            mButton = mPreference.findViewById(R.id.view_airplane_mode_networks_button);
-        }
-        if (mButton != null) {
-            mButton.setOnClickListener(this);
-        }
-        refreshLayout();
-    }
-
-    @VisibleForTesting
-    void refreshLayout() {
-        boolean isWifiEnabled = mWifiManager.isWifiEnabled();
-        if (mTextView != null) {
-            mTextView.setText(isWifiEnabled ? R.string.viewing_airplane_mode_networks
-                    : R.string.condition_airplane_title);
-        }
-        if (mButton != null) {
-            mButton.setVisibility(isWifiEnabled ? View.GONE : View.VISIBLE);
-        }
-    }
-
-    /**
-     * Sets the visibility of the preference.
-     */
-    public void setVisible(boolean visible) {
-        if (mPreference != null) {
-            mPreference.setVisible(visible);
-        }
-    }
-}
diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java
index 9295414..e815d49 100644
--- a/src/com/android/settings/network/VpnPreferenceController.java
+++ b/src/com/android/settings/network/VpnPreferenceController.java
@@ -47,7 +47,6 @@
 
 import java.util.List;
 
-
 public class VpnPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
 
diff --git a/src/com/android/settings/network/AirplaneSafeNetworksPreferenceController.java b/src/com/android/settings/network/WifiSwitchPreferenceController.java
similarity index 74%
rename from src/com/android/settings/network/AirplaneSafeNetworksPreferenceController.java
rename to src/com/android/settings/network/WifiSwitchPreferenceController.java
index fa80c38..2ee407a 100644
--- a/src/com/android/settings/network/AirplaneSafeNetworksPreferenceController.java
+++ b/src/com/android/settings/network/WifiSwitchPreferenceController.java
@@ -23,41 +23,41 @@
 import androidx.lifecycle.OnLifecycleEvent;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.AirplaneModeEnabler;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.GenericSwitchController;
 import com.android.settings.wifi.WifiEnabler;
 import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 
-public class AirplaneSafeNetworksPreferenceController extends AbstractPreferenceController
-        implements LifecycleObserver, AirplaneModeEnabler.OnAirplaneModeChangedListener {
+/**
+ * This controller helps to manage the state of wifi switch preference.
+ */
+public class WifiSwitchPreferenceController extends AbstractPreferenceController implements
+        LifecycleObserver {
 
-    private static final String PREFERENCE_KEY = "airplane_safe_networks";
+    public static final String KEY = "wifi_switch";
 
     private RestrictedSwitchPreference mPreference;
 
-    private AirplaneModeEnabler mAirplaneModeEnabler;
     private WifiEnabler mWifiEnabler;
 
-    public AirplaneSafeNetworksPreferenceController(Context context, Lifecycle lifecycle) {
+    public WifiSwitchPreferenceController(Context context, Lifecycle lifecycle) {
         super(context);
         if (lifecycle == null) {
             throw new IllegalArgumentException("Lifecycle must be set");
         }
 
-        mAirplaneModeEnabler = new AirplaneModeEnabler(mContext, this);
         lifecycle.addObserver(this);
     }
 
     @Override
     public String getPreferenceKey() {
-        return PREFERENCE_KEY;
+        return KEY;
     }
 
     @Override
     public boolean isAvailable() {
-        return mAirplaneModeEnabler.isAirplaneModeOn();
+        return true;
     }
 
     @Override
@@ -66,23 +66,24 @@
         mPreference = screen.findPreference(getPreferenceKey());
     }
 
+    /** Lifecycle.Event.ON_START */
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
     public void onStart() {
-        mAirplaneModeEnabler.start();
         if (mPreference != null) {
             mWifiEnabler = new WifiEnabler(mContext, new GenericSwitchController(mPreference),
                     FeatureFactory.getFactory(mContext).getMetricsFeatureProvider());
         }
     }
 
+    /** Lifecycle.Event.ON_STOP */
     @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
     public void onStop() {
-        mAirplaneModeEnabler.stop();
         if (mWifiEnabler != null) {
             mWifiEnabler.teardownSwitchController();
         }
     }
 
+    /** Lifecycle.Event.ON_RESUME */
     @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
     public void onResume() {
         if (mWifiEnabler != null) {
@@ -90,17 +91,11 @@
         }
     }
 
+    /** Lifecycle.Event.ON_PAUSE */
     @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
     public void onPause() {
         if (mWifiEnabler != null) {
             mWifiEnabler.pause();
         }
     }
-
-    @Override
-    public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
-        if (mPreference != null) {
-            mPreference.setVisible(isAirplaneModeOn);
-        }
-    }
 }
diff --git a/src/com/android/settings/network/WifiTetherDisablePreferenceController.java b/src/com/android/settings/network/WifiTetherDisablePreferenceController.java
index 38e831b..783f78f 100644
--- a/src/com/android/settings/network/WifiTetherDisablePreferenceController.java
+++ b/src/com/android/settings/network/WifiTetherDisablePreferenceController.java
@@ -68,7 +68,7 @@
 
     @Override
     public boolean shouldShow() {
-        final String[] wifiRegexs = mCm.getTetherableWifiRegexs();
+        final String[] wifiRegexs = mTm.getTetherableWifiRegexs();
         return wifiRegexs != null && wifiRegexs.length != 0 && !Utils.isMonkeyRunning()
                 && getTetheringStateOfOtherInterfaces() != TetherEnabler.TETHERING_OFF;
     }
diff --git a/src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java b/src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java
index 34d8430..c6c5ad3 100644
--- a/src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java
+++ b/src/com/android/settings/network/ims/ImsQueryEnhanced4gLteModeUserSetting.java
@@ -19,7 +19,6 @@
 import android.telephony.ims.ImsMmTelManager;
 import android.util.Log;
 
-
 /**
  * An {@link ImsQuery} for accessing IMS user setting for enhanced 4G LTE
  */
diff --git a/src/com/android/settings/network/ims/ImsQueryProvisioningStat.java b/src/com/android/settings/network/ims/ImsQueryProvisioningStat.java
index b52d22c..44c4519 100644
--- a/src/com/android/settings/network/ims/ImsQueryProvisioningStat.java
+++ b/src/com/android/settings/network/ims/ImsQueryProvisioningStat.java
@@ -21,7 +21,6 @@
 import android.telephony.ims.stub.ImsRegistrationImplBase;
 import android.util.Log;
 
-
 /**
  * An {@link ImsQuery} for accessing IMS provision stat
  */
diff --git a/src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java b/src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java
index e2719dd..8a306c5 100644
--- a/src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java
+++ b/src/com/android/settings/network/ims/ImsQueryTtyOnVolteStat.java
@@ -19,7 +19,6 @@
 import android.telephony.ims.ImsMmTelManager;
 import android.util.Log;
 
-
 /**
  * An {@link ImsQuery} for accessing IMS tty on VoLte stat
  */
diff --git a/src/com/android/settings/network/ims/ImsQueryVtUserSetting.java b/src/com/android/settings/network/ims/ImsQueryVtUserSetting.java
index 6da4a4c..91cecb1 100644
--- a/src/com/android/settings/network/ims/ImsQueryVtUserSetting.java
+++ b/src/com/android/settings/network/ims/ImsQueryVtUserSetting.java
@@ -19,7 +19,6 @@
 import android.telephony.ims.ImsMmTelManager;
 import android.util.Log;
 
-
 /**
  * An {@link ImsQuery} for accessing IMS VT enabled settings from user
  */
diff --git a/src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java b/src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java
index 3407413..5e4d471 100644
--- a/src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java
+++ b/src/com/android/settings/network/ims/ImsQueryWfcUserSetting.java
@@ -19,7 +19,6 @@
 import android.telephony.ims.ImsMmTelManager;
 import android.util.Log;
 
-
 /**
  * An {@link ImsQuery} for accessing IMS WFC enabled settings from user
  */
diff --git a/src/com/android/settings/network/ims/VolteQueryImsState.java b/src/com/android/settings/network/ims/VolteQueryImsState.java
index 167b4b1..b09a130 100644
--- a/src/com/android/settings/network/ims/VolteQueryImsState.java
+++ b/src/com/android/settings/network/ims/VolteQueryImsState.java
@@ -16,11 +16,14 @@
 
 package com.android.settings.network.ims;
 
+import static android.telephony.ims.ProvisioningManager.KEY_VOIMS_OPT_IN_STATUS;
+
 import android.content.Context;
 import android.telecom.TelecomManager;
 import android.telephony.AccessNetworkConstants;
 import android.telephony.SubscriptionManager;
 import android.telephony.ims.ImsException;
+import android.telephony.ims.ProvisioningManager;
 import android.telephony.ims.feature.MmTelFeature;
 import android.telephony.ims.stub.ImsRegistrationImplBase;
 import android.util.Log;
@@ -133,4 +136,15 @@
         }
         return isEnabledByUser(mSubId);
     }
+
+    /**
+     * Get VoIMS opt-in configuration.
+     *
+     * @return true when VoIMS opt-in has been enabled, otherwise false
+     */
+    public boolean isVoImsOptInEnabled() {
+        int voImsOptInStatus = ProvisioningManager.createForSubscriptionId(mSubId)
+                .getProvisioningIntValue(KEY_VOIMS_OPT_IN_STATUS);
+        return voImsOptInStatus == ProvisioningManager.PROVISIONING_VALUE_ENABLED;
+    }
 }
diff --git a/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java b/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java
index 2c6c963..d00efc7 100644
--- a/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/BackupCallingPreferenceController.java
@@ -32,6 +32,7 @@
 import com.android.settings.R;
 import com.android.settings.network.SubscriptionUtil;
 
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -67,14 +68,22 @@
 
     @Override
     public int getAvailabilityStatus(int subId) {
-        return hasBackupCallingFeature(subId) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+        if (!hasBackupCallingFeature(subId)) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        List<SubscriptionInfo> subIdList = getActiveSubscriptionList();
+        SubscriptionInfo subInfo = getSubscriptionInfoFromList(subIdList, subId);
+        if (subInfo == null) {  // given subId is not actives
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        return (subIdList.size() > 1) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
     /**
      * Implementation of abstract methods
      **/
     public boolean setChecked(boolean isChecked) {
-        ImsMmTelManager imsMmTelMgr = getImsMmTelManager();
+        ImsMmTelManager imsMmTelMgr = getImsMmTelManager(mSubId);
         if (imsMmTelMgr == null) {
             return false;
         }
@@ -92,12 +101,12 @@
      * Implementation of abstract methods
      **/
     public boolean isChecked() {
-        ImsMmTelManager imsMmTelMgr = getImsMmTelManager();
+        ImsMmTelManager imsMmTelMgr = getImsMmTelManager(mSubId);
         if (imsMmTelMgr == null) {
             return false;
         }
         try {
-            return imsMmTelMgr.isCrossSimCallingEnabledByUser();
+            return imsMmTelMgr.isCrossSimCallingEnabled();
         } catch (ImsException exception) {
             Log.w(LOG_TAG, "fail to get cross SIM calling configuration", exception);
         }
@@ -110,16 +119,17 @@
         if ((preference == null) || (!(preference instanceof SwitchPreference))) {
             return;
         }
+        SubscriptionInfo subInfo = getSubscriptionInfoFromActiveList(mSubId);
+
         mPreference = preference;
 
         final SwitchPreference switchPreference = (SwitchPreference) preference;
-        switchPreference.setChecked(isChecked());
+        switchPreference.setChecked((subInfo != null) ? isChecked() : false);
 
-        updateSummary(getLatestSummary());
+        updateSummary(getLatestSummary(subInfo));
     }
 
-    private String getLatestSummary() {
-        SubscriptionInfo subInfo = getSubscriptionInfo();
+    private String getLatestSummary(SubscriptionInfo subInfo) {
         return Objects.toString((subInfo == null) ? null
                 : SubscriptionUtil.getUniqueSubscriptionDisplayName(subInfo, mContext), "");
     }
@@ -144,19 +154,34 @@
                 CarrierConfigManager.KEY_CARRIER_CROSS_SIM_IMS_AVAILABLE_BOOL, false);
     }
 
-    private ImsMmTelManager getImsMmTelManager() {
-        if (!SubscriptionManager.isUsableSubscriptionId(mSubId)) {
+    private ImsMmTelManager getImsMmTelManager(int subId) {
+        if (!SubscriptionManager.isUsableSubscriptionId(subId)) {
             return null;
         }
         ImsManager imsMgr = mContext.getSystemService(ImsManager.class);
-        return (imsMgr == null) ? null : imsMgr.getImsMmTelManager(mSubId);
+        return (imsMgr == null) ? null : imsMgr.getImsMmTelManager(subId);
     }
 
-    private SubscriptionInfo getSubscriptionInfo() {
-        SubscriptionManager subInfoMgr = mContext.getSystemService(SubscriptionManager.class);
-        if (subInfoMgr == null) {
+    private List<SubscriptionInfo> getActiveSubscriptionList() {
+        SubscriptionManager subscriptionManager =
+                mContext.getSystemService(SubscriptionManager.class);
+        return SubscriptionUtil.getActiveSubscriptions(subscriptionManager);
+    }
+
+    private SubscriptionInfo getSubscriptionInfoFromList(
+            List<SubscriptionInfo> subInfoList, int subId) {
+        for (SubscriptionInfo subInfo : subInfoList) {
+            if ((subInfo != null) && (subInfo.getSubscriptionId() == subId)) {
+                return subInfo;
+            }
+        }
+        return null;
+    }
+
+    private SubscriptionInfo getSubscriptionInfoFromActiveList(int subId) {
+        if (!SubscriptionManager.isUsableSubscriptionId(subId)) {
             return null;
         }
-        return subInfoMgr.getActiveSubscriptionInfo(mSubId);
+        return getSubscriptionInfoFromList(getActiveSubscriptionList(), subId);
     }
 }
diff --git a/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java b/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java
index 26398d7..e43865b 100644
--- a/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java
+++ b/src/com/android/settings/network/telephony/ContactDiscoveryDialogFragment.java
@@ -22,11 +22,9 @@
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.telephony.ims.ImsManager;
-import android.telephony.ims.ImsRcsManager;
 import android.text.TextUtils;
 
 import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.FragmentManager;
 
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
diff --git a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
index b231da2..a2a20bb 100644
--- a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
+++ b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
@@ -37,7 +37,6 @@
 
 import com.android.settings.network.SubscriptionUtil;
 
-
 /**
  * Controller for the "Contact Discovery" option present in MobileNetworkSettings.
  */
diff --git a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
index 1fa4300..cf08d10 100644
--- a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java
@@ -15,6 +15,7 @@
  */
 package com.android.settings.network.telephony;
 
+import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
@@ -22,6 +23,9 @@
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
 /**
  * Preference controller for "Enable 2G"
  */
@@ -31,7 +35,10 @@
     private static final long BITMASK_2G =  TelephonyManager.NETWORK_TYPE_BITMASK_GSM
                 | TelephonyManager.NETWORK_TYPE_BITMASK_GPRS
                 | TelephonyManager.NETWORK_TYPE_BITMASK_EDGE
-                | TelephonyManager.NETWORK_TYPE_BITMASK_CDMA;
+                | TelephonyManager.NETWORK_TYPE_BITMASK_CDMA
+                | TelephonyManager.NETWORK_TYPE_BITMASK_1xRTT;
+
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
 
     private CarrierConfigManager mCarrierConfigManager;
     private TelephonyManager mTelephonyManager;
@@ -45,6 +52,7 @@
     public Enable2gPreferenceController(Context context, String key) {
         super(context, key);
         mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
     }
 
     /**
@@ -97,6 +105,8 @@
         }
         mTelephonyManager.setAllowedNetworkTypesForReason(
                 mTelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G, newAllowedNetworkTypes);
+        mMetricsFeatureProvider.action(
+                mContext, SettingsEnums.ACTION_2G_ENABLED, isChecked);
         return true;
     }
 }
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index 9e7a3a8..f0d4a43 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -35,6 +35,7 @@
 
 import com.android.settings.R;
 import com.android.settings.network.AllowedNetworkTypesListener;
+import com.android.settings.network.SubscriptionsChangeListener;
 import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
 
 import java.util.ArrayList;
@@ -47,7 +48,8 @@
  */
 public class EnabledNetworkModePreferenceController extends
         TelephonyBasePreferenceController implements
-        ListPreference.OnPreferenceChangeListener, LifecycleObserver {
+        ListPreference.OnPreferenceChangeListener, LifecycleObserver,
+        SubscriptionsChangeListener.SubscriptionsChangeListenerClient {
 
     private static final String LOG_TAG = "EnabledNetworkMode";
     private AllowedNetworkTypesListener mAllowedNetworkTypesListener;
@@ -56,9 +58,11 @@
     private TelephonyManager mTelephonyManager;
     private CarrierConfigManager mCarrierConfigManager;
     private PreferenceEntriesBuilder mBuilder;
+    private SubscriptionsChangeListener mSubscriptionsListener;
 
     public EnabledNetworkModePreferenceController(Context context, String key) {
         super(context, key);
+        mSubscriptionsListener = new SubscriptionsChangeListener(context, this);
     }
 
     @Override
@@ -85,6 +89,7 @@
 
     @OnLifecycleEvent(ON_START)
     public void onStart() {
+        mSubscriptionsListener.start();
         if (mAllowedNetworkTypesListener == null) {
             return;
         }
@@ -93,6 +98,7 @@
 
     @OnLifecycleEvent(ON_STOP)
     public void onStop() {
+        mSubscriptionsListener.stop();
         if (mAllowedNetworkTypesListener == null) {
             return;
         }
@@ -145,7 +151,7 @@
         if (mAllowedNetworkTypesListener == null) {
             mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
                     mContext.getMainExecutor());
-            mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
+            mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(
                     () -> updatePreference());
         }
 
@@ -196,11 +202,14 @@
         PreferenceEntriesBuilder(Context context, int subId) {
             this.mContext = context;
             this.mSubId = subId;
-
             mCarrierConfigManager = mContext.getSystemService(CarrierConfigManager.class);
             mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
                     .createForSubscriptionId(mSubId);
+            updateConfig();
+        }
 
+        public void updateConfig() {
+            mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);
             final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
             mAllowed5gNetworkType = checkSupportedRadioBitmask(
                     mTelephonyManager.getAllowedNetworkTypesForReason(
@@ -214,6 +223,11 @@
                     && carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
             mShow4gForLTE = carrierConfig != null && carrierConfig.getBoolean(
                     CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL);
+            Log.d(LOG_TAG, "PreferenceEntriesBuilder: subId" + mSubId
+                    + ",Supported5gRadioAccessFamily :" + mSupported5gRadioAccessFamily
+                    + ",mAllowed5gNetworkType :" + mAllowed5gNetworkType
+                    + ",IsGlobalCdma :" + mIsGlobalCdma
+                    + ",Show4gForLTE :" + mShow4gForLTE);
         }
 
         void setPreferenceEntries() {
@@ -818,4 +832,13 @@
         }
 
     }
+
+    @Override
+    public void onAirplaneModeChanged(boolean airplaneModeEnabled) {
+    }
+
+    @Override
+    public void onSubscriptionsChanged() {
+        mBuilder.updateConfig();
+    }
 }
diff --git a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
index fbbdabc..5ea7c20 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
@@ -20,11 +20,11 @@
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.os.Looper;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 import android.telephony.PhoneStateListener;
 import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
 import android.telephony.ims.ImsMmTelManager;
 import android.util.Log;
@@ -34,6 +34,7 @@
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
 
+import com.android.internal.telephony.util.ArrayUtils;
 import com.android.settings.R;
 import com.android.settings.network.ims.VolteQueryImsState;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -53,7 +54,7 @@
 
     @VisibleForTesting
     Preference mPreference;
-    private PhoneCallStateListener mPhoneStateListener;
+    private PhoneCallStateTelephonyCallback mTelephonyCallback;
     private boolean mShow5gLimitedDialog;
     boolean mIsNrEnabledFromCarrierConfig;
     private boolean mHas5gCapability;
@@ -72,8 +73,8 @@
     }
 
     public Enhanced4gBasePreferenceController init(int subId) {
-        if (mPhoneStateListener == null) {
-            mPhoneStateListener = new PhoneCallStateListener();
+        if (mTelephonyCallback == null) {
+            mTelephonyCallback = new PhoneCallStateTelephonyCallback();
         }
 
         if (mSubId == subId) {
@@ -95,9 +96,10 @@
 
         mShow5gLimitedDialog = carrierConfig.getBoolean(
                 CarrierConfigManager.KEY_VOLTE_5G_LIMITED_ALERT_DIALOG_BOOL);
-        mIsNrEnabledFromCarrierConfig = carrierConfig.getInt(
-                CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITY_INT)
-                != CarrierConfigManager.CARRIER_NR_AVAILABILITY_NONE;
+
+        int[] nrAvailabilities = carrierConfig.getIntArray(
+                CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY);
+        mIsNrEnabledFromCarrierConfig = !ArrayUtils.isEmpty(nrAvailabilities);
         return this;
     }
 
@@ -107,12 +109,18 @@
         if (!isModeMatched()) {
             return CONDITIONALLY_UNAVAILABLE;
         }
+        final VolteQueryImsState queryState = queryImsState(subId);
+        // Show VoLTE settings if VoIMS opt-in has been enabled irrespective of other VoLTE settings
+        if (queryState.isVoImsOptInEnabled()) {
+            return AVAILABLE;
+        }
+
         final PersistableBundle carrierConfig = getCarrierConfigForSubId(subId);
         if ((carrierConfig == null)
                 || carrierConfig.getBoolean(CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL)) {
             return CONDITIONALLY_UNAVAILABLE;
         }
-        final VolteQueryImsState queryState = queryImsState(subId);
+
         if (!queryState.isReadyToVoLte()) {
             return CONDITIONALLY_UNAVAILABLE;
         }
@@ -128,18 +136,18 @@
 
     @Override
     public void onStart() {
-        if (!isModeMatched() || (mPhoneStateListener == null)) {
+        if (!isModeMatched() || (mTelephonyCallback == null)) {
             return;
         }
-        mPhoneStateListener.register(mContext, mSubId);
+        mTelephonyCallback.register(mContext, mSubId);
     }
 
     @Override
     public void onStop() {
-        if (mPhoneStateListener == null) {
+        if (mTelephonyCallback == null) {
             return;
         }
-        mPhoneStateListener.unregister();
+        mTelephonyCallback.unregister();
     }
 
     @Override
@@ -212,16 +220,13 @@
                 CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL);
     }
 
-    private class PhoneCallStateListener extends PhoneStateListener {
-
-        PhoneCallStateListener() {
-            super(Looper.getMainLooper());
-        }
+    private class PhoneCallStateTelephonyCallback extends TelephonyCallback implements
+            TelephonyCallback.CallStateListener {
 
         private TelephonyManager mTelephonyManager;
 
         @Override
-        public void onCallStateChanged(int state, String incomingNumber) {
+        public void onCallStateChanged(int state) {
             mCallState = state;
             updateState(mPreference);
         }
@@ -234,7 +239,8 @@
             // assign current call state so that it helps to show correct preference state even
             // before first onCallStateChanged() by initial registration.
             mCallState = mTelephonyManager.getCallState(subId);
-            mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
+            mTelephonyManager.registerTelephonyCallback(
+                    mContext.getMainExecutor(), mTelephonyCallback);
 
             final long supportedRadioBitmask = mTelephonyManager.getSupportedRadioAccessFamily();
             mHas5gCapability =
@@ -244,7 +250,7 @@
         public void unregister() {
             mCallState = null;
             if (mTelephonyManager != null) {
-                mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+                mTelephonyManager.unregisterTelephonyCallback(this);
             }
         }
     }
diff --git a/src/com/android/settings/network/telephony/MobileDataDialogFragment.java b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
index 9533827..0292c6b 100644
--- a/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
+++ b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
@@ -31,7 +31,6 @@
 import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.wifi.WifiPickerTrackerHelper;
 
-
 /**
  * Dialog Fragment to show dialog for "mobile data"
  *
diff --git a/src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java b/src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java
index 25651f5..4ebcb7a 100644
--- a/src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java
+++ b/src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java
@@ -45,7 +45,7 @@
         mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
         mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
                 context.getMainExecutor());
-        mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
+        mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(
                 () -> updatePreference());
     }
 
diff --git a/src/com/android/settings/network/telephony/NetworkProviderWfcFooterPreferenceController.java b/src/com/android/settings/network/telephony/NetworkProviderWfcFooterPreferenceController.java
deleted file mode 100644
index 166094d..0000000
--- a/src/com/android/settings/network/telephony/NetworkProviderWfcFooterPreferenceController.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.android.settings.network.telephony;
-
-import android.content.Context;
-import android.content.Intent;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.network.SubscriptionUtil;
-import com.android.settings.utils.AnnotationSpan;
-import com.android.settingslib.HelpUtils;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-
-import java.util.List;
-
-public class NetworkProviderWfcFooterPreferenceController extends BasePreferenceController
-        implements LifecycleObserver {
-
-    /**
-     * Constructor.
-     */
-    public NetworkProviderWfcFooterPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    /**
-     * Initialize the binding with Lifecycle
-     *
-     * @param lifecycle Lifecycle of UI which owns this Preference
-     */
-    public void init(Lifecycle lifecycle) {
-        lifecycle.addObserver(this);
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        super.updateState(preference);
-
-        if (preference != null) {
-            // This is necessary to ensure that setting the title to the spannable string returned
-            // by getFooterText will be accepted.  Internally, setTitle does an equality check on
-            // the spannable string being set to the text already set on the preference.  That
-            // equality check apparently only takes into account the raw text and not and spannables
-            // that are part of the text.  So we clear the title before applying the spannable
-            // footer to ensure it is accepted.
-            preference.setTitle("");
-            preference.setTitle(getFooterText());
-        }
-    }
-
-    private CharSequence getFooterText() {
-        final Intent helpIntent = HelpUtils.getHelpIntent(mContext,
-                mContext.getString(R.string.help_uri_wifi_calling),
-                mContext.getClass().getName());
-        final AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan.LinkInfo(mContext,
-                "url", helpIntent);
-
-        return AnnotationSpan.linkify(mContext.getText(R.string.calls_sms_footnote), linkInfo);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        final SubscriptionManager subscriptionManager =
-                mContext.getSystemService(SubscriptionManager.class);
-        final List<SubscriptionInfo> subscriptions = SubscriptionUtil.getActiveSubscriptions(
-                subscriptionManager);
-        if (subscriptions.size() >= 1) {
-            return AVAILABLE;
-        } else {
-            return CONDITIONALLY_UNAVAILABLE;
-        }
-    }
-}
diff --git a/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java b/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java
index 44fd029..c16dbc9 100644
--- a/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java
+++ b/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java
@@ -217,7 +217,12 @@
             pref.setEnabled(getTelephonyManagerForSubscriptionId(subId).getCallState()
                     == TelephonyManager.CALL_STATE_IDLE);
             pref.setOrder(order++);
-            pref.setSummary(R.string.calls_sms_wfc_summary);
+
+            int resId = com.android.internal.R.string.wifi_calling_off_summary;
+            if (queryImsState(subId).isEnabledByUser()) {
+                resId = R.string.calls_sms_wfc_summary;
+            }
+            pref.setSummary(resId);
 
             mWifiCallingForSubPreferences.put(subId, pref);
         }
diff --git a/src/com/android/settings/network/telephony/NetworkProviderWorker.java b/src/com/android/settings/network/telephony/NetworkProviderWorker.java
index 50c56cf..57f17b5 100644
--- a/src/com/android/settings/network/telephony/NetworkProviderWorker.java
+++ b/src/com/android/settings/network/telephony/NetworkProviderWorker.java
@@ -25,9 +25,9 @@
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
-import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyDisplayInfo;
 import android.telephony.TelephonyManager;
 import android.util.Log;
@@ -49,9 +49,8 @@
  */
 public class NetworkProviderWorker extends WifiScanWorker implements
         SignalStrengthListener.Callback, MobileDataEnabledListener.Client,
-        DataConnectivityListener.Client,
-        SubscriptionsChangeListener.SubscriptionsChangeListenerClient,
-        InternetUpdater.OnInternetTypeChangedListener {
+        DataConnectivityListener.Client, InternetUpdater.InternetChangeListener,
+        SubscriptionsChangeListener.SubscriptionsChangeListenerClient {
     private static final String TAG = "NetworkProviderWorker";
     private static final int PROVIDER_MODEL_DEFAULT_EXPANDED_ROW_COUNT = 4;
     private DataContentObserver mMobileDataObserver;
@@ -63,7 +62,7 @@
     private final Context mContext;
     final Handler mHandler;
     @VisibleForTesting
-    final PhoneStateListener mPhoneStateListener;
+    final NetworkProviderTelephonyCallback mTelephonyCallback;
     private TelephonyManager mTelephonyManager;
     private Config mConfig = null;
     private TelephonyDisplayInfo mTelephonyDisplayInfo =
@@ -83,7 +82,7 @@
 
         mTelephonyManager = mContext.getSystemService(
                 TelephonyManager.class).createForSubscriptionId(mDefaultDataSubid);
-        mPhoneStateListener = new NetworkProviderPhoneStateListener();
+        mTelephonyCallback = new NetworkProviderTelephonyCallback();
         mSubscriptionsListener = new SubscriptionsChangeListener(context, this);
         mDataEnabledListener = new MobileDataEnabledListener(context, this);
         mConnectivityListener = new DataConnectivityListener(context, this);
@@ -101,7 +100,7 @@
         mDataEnabledListener.start(mDefaultDataSubid);
         mConnectivityListener.start();
         mSignalStrengthListener.resume();
-        mTelephonyManager.registerPhoneStateListener(mHandler::post, mPhoneStateListener);
+        mTelephonyManager.registerTelephonyCallback(mHandler::post, mTelephonyCallback);
         super.onSlicePinned();
     }
 
@@ -112,7 +111,7 @@
         mDataEnabledListener.stop();
         mConnectivityListener.stop();
         mSignalStrengthListener.pause();
-        mTelephonyManager.unregisterPhoneStateListener(mPhoneStateListener);
+        mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
         super.onSliceUnpinned();
     }
 
@@ -142,12 +141,12 @@
             return;
         }
         if (SubscriptionManager.isUsableSubscriptionId(defaultDataSubId)) {
-            mTelephonyManager.unregisterPhoneStateListener(mPhoneStateListener);
+            mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
             mMobileDataObserver.unregister(mContext);
 
             mSignalStrengthListener.updateSubscriptionIds(Collections.singleton(defaultDataSubId));
             mTelephonyManager = mTelephonyManager.createForSubscriptionId(defaultDataSubId);
-            mTelephonyManager.registerPhoneStateListener(mHandler::post, mPhoneStateListener);
+            mTelephonyManager.registerTelephonyCallback(mHandler::post, mTelephonyCallback);
             mMobileDataObserver.register(mContext, mDefaultDataSubid);
             mConfig = getConfig(mContext);
         } else {
@@ -217,10 +216,10 @@
         }
     }
 
-    class NetworkProviderPhoneStateListener extends PhoneStateListener implements
-            PhoneStateListener.DataConnectionStateChangedListener,
-            PhoneStateListener.DisplayInfoChangedListener,
-            PhoneStateListener.ServiceStateChangedListener {
+    class NetworkProviderTelephonyCallback extends TelephonyCallback implements
+            TelephonyCallback.DataConnectionStateListener,
+            TelephonyCallback.DisplayInfoListener,
+            TelephonyCallback.ServiceStateListener {
         @Override
         public void onServiceStateChanged(ServiceState state) {
             Log.d(TAG, "onServiceStateChanged voiceState=" + state.getState()
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index ff641e9..c8121c4 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -343,16 +343,6 @@
                     mPreferenceCategory.getPreference(numberOfPreferences));
         }
 
-        // update selected preference instance by index
-        for (int index = 0; index < mCellInfoList.size(); index++) {
-            final CellInfo cellInfo = mCellInfoList.get(index);
-
-            if ((mSelectedPreference != null) && mSelectedPreference.isSameCell(cellInfo)) {
-                mSelectedPreference = (NetworkOperatorPreference)
-                        (mPreferenceCategory.getPreference(index));
-            }
-        }
-
         // update the content of preference
         NetworkOperatorPreference connectedPref = null;
         for (int index = 0; index < mCellInfoList.size(); index++) {
@@ -386,6 +376,16 @@
             }
         }
 
+        // update selected preference instance by index
+        for (int index = 0; index < mCellInfoList.size(); index++) {
+            final CellInfo cellInfo = mCellInfoList.get(index);
+
+            if ((mSelectedPreference != null) && mSelectedPreference.isSameCell(cellInfo)) {
+                mSelectedPreference = (NetworkOperatorPreference)
+                        (mPreferenceCategory.getPreference(index));
+            }
+        }
+
         return connectedPref;
     }
 
diff --git a/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java b/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
index 78dfe51..fd5df6f 100644
--- a/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
+++ b/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
@@ -28,7 +28,6 @@
 import com.android.settings.utils.AnnotationSpan;
 import com.android.settingslib.HelpUtils;
 
-
 /**
  * Class to show the footer that can't connect to 5G when device is in DSDS mode.
  */
diff --git a/src/com/android/settings/network/telephony/SignalStrengthListener.java b/src/com/android/settings/network/telephony/SignalStrengthListener.java
index 0e29a45..8d7304d 100644
--- a/src/com/android/settings/network/telephony/SignalStrengthListener.java
+++ b/src/com/android/settings/network/telephony/SignalStrengthListener.java
@@ -19,9 +19,12 @@
 import android.content.Context;
 import android.telephony.PhoneStateListener;
 import android.telephony.SignalStrength;
+import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
 import android.util.ArraySet;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.google.common.collect.Sets;
 
 import java.util.Map;
@@ -34,7 +37,9 @@
 
     private TelephonyManager mBaseTelephonyManager;
     private Callback mCallback;
-    private Map<Integer, PhoneStateListener> mListeners;
+    private Context mContext;
+    @VisibleForTesting
+    Map<Integer, SignalStrengthTelephonyCallback> mTelephonyCallbacks;
 
     public interface Callback {
         void onSignalStrengthChanged();
@@ -43,20 +48,21 @@
     public SignalStrengthListener(Context context, Callback callback) {
         mBaseTelephonyManager = context.getSystemService(TelephonyManager.class);
         mCallback = callback;
-        mListeners = new TreeMap<>();
+        mContext = context;
+        mTelephonyCallbacks = new TreeMap<>();
     }
 
     /** Resumes listening for signal strength changes for the set of ids from the last call to
      * {@link #updateSubscriptionIds(Set)}  */
     public void resume() {
-        for (int subId : mListeners.keySet()) {
+        for (int subId : mTelephonyCallbacks.keySet()) {
             startListening(subId);
         }
     }
 
     /** Pauses listening for signal strength changes */
     public void pause() {
-        for (int subId : mListeners.keySet()) {
+        for (int subId : mTelephonyCallbacks.keySet()) {
             stopListening(subId);
         }
     }
@@ -64,30 +70,36 @@
     /** Updates the set of ids we want to be listening for, beginning to listen for any new ids and
      * stopping listening for any ids not contained in the new set */
     public void updateSubscriptionIds(Set<Integer> ids) {
-        Set<Integer> currentIds = new ArraySet<>(mListeners.keySet());
+        Set<Integer> currentIds = new ArraySet<>(mTelephonyCallbacks.keySet());
         for (int idToRemove : Sets.difference(currentIds, ids)) {
             stopListening(idToRemove);
-            mListeners.remove(idToRemove);
+            mTelephonyCallbacks.remove(idToRemove);
         }
         for (int idToAdd : Sets.difference(ids, currentIds)) {
-            PhoneStateListener listener = new PhoneStateListener() {
-                @Override
-                public void onSignalStrengthsChanged(SignalStrength signalStrength) {
-                    mCallback.onSignalStrengthChanged();
-                }
-            };
-            mListeners.put(idToAdd, listener);
+            SignalStrengthTelephonyCallback telephonyCallback =
+                    new SignalStrengthTelephonyCallback();
+            mTelephonyCallbacks.put(idToAdd, telephonyCallback);
             startListening(idToAdd);
         }
     }
 
+    @VisibleForTesting
+    class SignalStrengthTelephonyCallback extends TelephonyCallback implements
+            TelephonyCallback.SignalStrengthsListener {
+        @Override
+        public void onSignalStrengthsChanged(SignalStrength signalStrength) {
+            mCallback.onSignalStrengthChanged();
+        }
+    }
+
     private void startListening(int subId) {
         TelephonyManager mgr = mBaseTelephonyManager.createForSubscriptionId(subId);
-        mgr.listen(mListeners.get(subId), PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
+        mgr.registerTelephonyCallback(
+                mContext.getMainExecutor(), mTelephonyCallbacks.get(subId));
     }
 
     private void stopListening(int subId) {
         TelephonyManager mgr = mBaseTelephonyManager.createForSubscriptionId(subId);
-        mgr.listen(mListeners.get(subId), PhoneStateListener.LISTEN_NONE);
+        mgr.unregisterTelephonyCallback(mTelephonyCallbacks.get(subId));
     }
 }
diff --git a/src/com/android/settings/network/telephony/TelephonyAvailabilityHandler.java b/src/com/android/settings/network/telephony/TelephonyAvailabilityHandler.java
index c1acd91..557f2c4 100644
--- a/src/com/android/settings/network/telephony/TelephonyAvailabilityHandler.java
+++ b/src/com/android/settings/network/telephony/TelephonyAvailabilityHandler.java
@@ -20,8 +20,6 @@
  */
 package com.android.settings.network.telephony;
 
-import android.content.Context;
-
 public interface TelephonyAvailabilityHandler {
 
     /**
diff --git a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
index fa8b47f..b3421f4 100644
--- a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
@@ -17,11 +17,11 @@
 package com.android.settings.network.telephony;
 
 import android.content.Context;
-import android.os.Looper;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 import android.telephony.PhoneStateListener;
 import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
 import android.telephony.ims.ImsMmTelManager;
 import android.util.Log;
@@ -50,7 +50,7 @@
 
     private Preference mPreference;
     private CarrierConfigManager mCarrierConfigManager;
-    private PhoneCallStateListener mPhoneStateListener;
+    private PhoneTelephonyCallback mTelephonyCallback;
     @VisibleForTesting
     Integer mCallState;
     private MobileDataEnabledListener mDataContentObserver;
@@ -59,7 +59,7 @@
         super(context, key);
         mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
         mDataContentObserver = new MobileDataEnabledListener(context, this);
-        mPhoneStateListener = new PhoneCallStateListener();
+        mTelephonyCallback = new PhoneTelephonyCallback();
     }
 
     @Override
@@ -78,13 +78,13 @@
 
     @Override
     public void onStart() {
-        mPhoneStateListener.register(mContext, mSubId);
+        mTelephonyCallback.register(mContext, mSubId);
         mDataContentObserver.start(mSubId);
     }
 
     @Override
     public void onStop() {
-        mPhoneStateListener.unregister();
+        mTelephonyCallback.unregister();
         mDataContentObserver.stop();
     }
 
@@ -163,16 +163,13 @@
         updateState(mPreference);
     }
 
-    private class PhoneCallStateListener extends PhoneStateListener {
-
-        PhoneCallStateListener() {
-            super(Looper.getMainLooper());
-        }
+    private class PhoneTelephonyCallback extends TelephonyCallback implements
+            TelephonyCallback.CallStateListener {
 
         private TelephonyManager mTelephonyManager;
 
         @Override
-        public void onCallStateChanged(int state, String incomingNumber) {
+        public void onCallStateChanged(int state) {
             mCallState = state;
             updateState(mPreference);
         }
@@ -185,12 +182,12 @@
             // assign current call state so that it helps to show correct preference state even
             // before first onCallStateChanged() by initial registration.
             mCallState = mTelephonyManager.getCallState(subId);
-            mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
+            mTelephonyManager.registerTelephonyCallback(context.getMainExecutor(), this);
         }
 
         public void unregister() {
             mCallState = null;
-            mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+            mTelephonyManager.unregisterTelephonyCallback(this);
         }
     }
 
diff --git a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
index 94a5999..2d7ba38 100644
--- a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
@@ -20,7 +20,6 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.os.Looper;
 import android.os.PersistableBundle;
 import android.provider.Settings;
 import android.telecom.PhoneAccountHandle;
@@ -28,6 +27,7 @@
 import android.telephony.CarrierConfigManager;
 import android.telephony.PhoneStateListener;
 import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
 import android.telephony.ims.ImsMmTelManager;
 import android.util.Log;
@@ -60,13 +60,13 @@
     private ImsMmTelManager mImsMmTelManager;
     @VisibleForTesting
     PhoneAccountHandle mSimCallManager;
-    private PhoneCallStateListener mPhoneStateListener;
+    private PhoneTelephonyCallback mTelephonyCallback;
     private Preference mPreference;
 
     public WifiCallingPreferenceController(Context context, String key) {
         super(context, key);
         mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
-        mPhoneStateListener = new PhoneCallStateListener();
+        mTelephonyCallback = new PhoneTelephonyCallback();
     }
 
     @Override
@@ -79,12 +79,12 @@
 
     @Override
     public void onStart() {
-        mPhoneStateListener.register(mContext, mSubId);
+        mTelephonyCallback.register(mContext, mSubId);
     }
 
     @Override
     public void onStop() {
-        mPhoneStateListener.unregister();
+        mTelephonyCallback.unregister();
     }
 
     @Override
@@ -195,16 +195,13 @@
     }
 
 
-    private class PhoneCallStateListener extends PhoneStateListener {
-
-        PhoneCallStateListener() {
-            super(Looper.getMainLooper());
-        }
+    private class PhoneTelephonyCallback extends TelephonyCallback implements
+            TelephonyCallback.CallStateListener {
 
         private TelephonyManager mTelephonyManager;
 
         @Override
-        public void onCallStateChanged(int state, String incomingNumber) {
+        public void onCallStateChanged(int state) {
             mCallState = state;
             updateState(mPreference);
         }
@@ -214,12 +211,12 @@
             // assign current call state so that it helps to show correct preference state even
             // before first onCallStateChanged() by initial registration.
             mCallState = mTelephonyManager.getCallState(subId);
-            mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
+            mTelephonyManager.registerTelephonyCallback(context.getMainExecutor(), this);
         }
 
         public void unregister() {
             mCallState = null;
-            mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+            mTelephonyManager.unregisterTelephonyCallback(this);
         }
     }
 }
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java
index 06c3edb..4d1d319 100644
--- a/src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java
+++ b/src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java
@@ -77,7 +77,7 @@
         if (mAllowedNetworkTypesListener == null) {
             mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
                     mContext.getMainExecutor());
-            mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
+            mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(
                     () -> updatePreference());
         }
     }
diff --git a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
index 19302da..997235c 100644
--- a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
+++ b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
@@ -81,7 +81,7 @@
         mUiHandler = new Handler(Looper.getMainLooper());
         mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
                 new HandlerExecutor(mUiHandler));
-        mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
+        mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(
                 () -> updatePreference());
     }
 
diff --git a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
index 1b77c6d..4047009 100644
--- a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
+++ b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
@@ -41,7 +41,6 @@
 import com.android.settings.network.telephony.NetworkSelectSettings;
 import com.android.settings.network.telephony.TelephonyBasePreferenceController;
 
-
 /**
  * Preference controller for "Open network select"
  */
@@ -60,7 +59,7 @@
         mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
         mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
                 context.getMainExecutor());
-        mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
+        mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(
                 () -> updatePreference());
 
     }
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index 0f3695a..dcba273 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -127,20 +127,23 @@
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        final PreferenceScreen screen = getPreferenceScreen();
-        final Bundle arguments = getArguments();
+        // TODO(b/182237530): This method should be removed when this flag is deprecated.
+        if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
+            final PreferenceScreen screen = getPreferenceScreen();
+            final Bundle arguments = getArguments();
 
-        if (screen == null) {
-            return;
-        }
-        if (arguments != null) {
-            final String highlightKey = arguments.getString(EXTRA_FRAGMENT_ARG_KEY);
-            if (!TextUtils.isEmpty(highlightKey)) {
-                final PreferenceCategory advancedCategory =
-                        screen.findPreference(KEY_ADVANCED_CATEGORY);
-                // Has highlight row - expand everything
-                advancedCategory.setInitialExpandedChildrenCount(Integer.MAX_VALUE);
-                scrollToPreference(advancedCategory);
+            if (screen == null) {
+                return;
+            }
+            if (arguments != null) {
+                final String highlightKey = arguments.getString(EXTRA_FRAGMENT_ARG_KEY);
+                if (!TextUtils.isEmpty(highlightKey)) {
+                    final PreferenceCategory advancedCategory =
+                            screen.findPreference(KEY_ADVANCED_CATEGORY);
+                    // Has highlight row - expand everything
+                    advancedCategory.setInitialExpandedChildrenCount(Integer.MAX_VALUE);
+                    scrollToPreference(advancedCategory);
+                }
             }
         }
     }
diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java
index 12d6295..a642d9c 100644
--- a/src/com/android/settings/notification/NotificationAccessSettings.java
+++ b/src/com/android/settings/notification/NotificationAccessSettings.java
@@ -20,12 +20,14 @@
 import android.app.NotificationManager;
 import android.app.admin.DevicePolicyManager;
 import android.app.settings.SettingsEnums;
+import android.companion.ICompanionDeviceManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageItemInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.os.Bundle;
+import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -35,6 +37,7 @@
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
@@ -57,6 +60,9 @@
 @SearchIndexable
 public class NotificationAccessSettings extends EmptyTextSettings {
     private static final String TAG = "NotifAccessSettings";
+    private static final String ALLOWED_KEY = "allowed";
+    private static final String NOT_ALLOWED_KEY = "not_allowed";
+
     private static final ManagedServiceSettings.Config CONFIG =
             new ManagedServiceSettings.Config.Builder()
                     .setTag(TAG)
@@ -76,6 +82,7 @@
     private DevicePolicyManager mDpm;
     private ServiceListing mServiceListing;
     private IconDrawableFactory mIconDrawableFactory;
+    private NotificationBackend mBackend = new NotificationBackend();
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -93,7 +100,6 @@
                 .setTag(CONFIG.tag)
                 .build();
         mServiceListing.addCallback(this::updateList);
-        setPreferenceScreen(getPreferenceManager().createPreferenceScreen(mContext));
 
         if (UserManager.get(mContext).isManagedProfile()) {
             // Apps in the work profile do not support notification listeners.
@@ -127,7 +133,11 @@
         final int managedProfileId = Utils.getManagedProfileId(um, UserHandle.myUserId());
 
         final PreferenceScreen screen = getPreferenceScreen();
-        screen.removeAll();
+        final PreferenceCategory allowedCategory = screen.findPreference(ALLOWED_KEY);
+        allowedCategory.removeAll();
+        final PreferenceCategory notAllowedCategory = screen.findPreference(NOT_ALLOWED_KEY);
+        notAllowedCategory.removeAll();
+
         services.sort(new PackageItemInfo.DisplayNameComparator(mPm));
         for (ServiceInfo service : services) {
             final ComponentName cn = new ComponentName(service.packageName, service.name);
@@ -145,9 +155,11 @@
             pref.setIcon(mIconDrawableFactory.getBadgedIcon(service, service.applicationInfo,
                     UserHandle.getUserId(service.applicationInfo.uid)));
             pref.setKey(cn.flattenToString());
-            pref.setSummary(mNm.isNotificationListenerAccessGranted(cn)
-                    ? R.string.app_permission_summary_allowed
-                    : R.string.app_permission_summary_not_allowed);
+            pref.setSummary(mBackend.getDeviceList(ICompanionDeviceManager.Stub.asInterface(
+                    ServiceManager.getService(Context.COMPANION_DEVICE_SERVICE)),
+                    com.android.settings.bluetooth.Utils.getLocalBtManager(mContext),
+                    service.packageName,
+                    UserHandle.myUserId()));
             if (managedProfileId != UserHandle.USER_NULL
                     && !mDpm.isNotificationListenerServicePermitted(
                     service.packageName, managedProfileId)) {
@@ -173,7 +185,11 @@
                         return true;
                     });
             pref.setKey(cn.flattenToString());
-            screen.addPreference(pref);
+            if (mNm.isNotificationListenerAccessGranted(cn)) {
+                allowedCategory.addPreference(pref);
+            } else {
+                notAllowedCategory.addPreference(pref);
+            }
         }
         highlightPreferenceIfNeeded();
     }
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 8a7e737..4347ca5 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -30,6 +30,7 @@
 import android.app.role.RoleManager;
 import android.app.usage.IUsageStatsManager;
 import android.app.usage.UsageEvents;
+import android.companion.ICompanionDeviceManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -55,14 +56,18 @@
 
 import com.android.settingslib.R;
 import com.android.settingslib.Utils;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 import com.android.settingslib.notification.ConversationIconFactory;
 import com.android.settingslib.utils.StringUtil;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 public class NotificationBackend {
     private static final String TAG = "NotificationBackend";
@@ -138,6 +143,35 @@
         }
     }
 
+    static public CharSequence getDeviceList(ICompanionDeviceManager cdm, LocalBluetoothManager lbm,
+            String pkg, int userId) {
+        boolean multiple = false;
+        StringBuilder sb = new StringBuilder();
+
+        try {
+            List<String> associatedMacAddrs = cdm.getAssociations(pkg, userId);
+            if (associatedMacAddrs != null) {
+                for (String assocMac : associatedMacAddrs) {
+                    final Collection<CachedBluetoothDevice> cachedDevices =
+                            lbm.getCachedDeviceManager().getCachedDevicesCopy();
+                    for (CachedBluetoothDevice cachedBluetoothDevice : cachedDevices) {
+                        if (Objects.equals(assocMac, cachedBluetoothDevice.getAddress())) {
+                            if (multiple) {
+                                sb.append(", ");
+                            } else {
+                                multiple = true;
+                            }
+                            sb.append(cachedBluetoothDevice.getName());
+                        }
+                    }
+                }
+            }
+        } catch (RemoteException e) {
+            Log.w(TAG, "Error calling CDM", e);
+        }
+        return sb.toString();
+    }
+
     public boolean isSystemApp(Context context, ApplicationInfo app) {
         try {
             PackageInfo info = context.getPackageManager().getPackageInfo(
diff --git a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
index bab0d5f..5396be5 100644
--- a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
+++ b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
@@ -46,10 +46,10 @@
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.notification.app.AppNotificationSettings;
 import com.android.settings.widget.PrimarySwitchPreference;
-import com.android.settingslib.TwoTargetPreference;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.utils.StringUtil;
+import com.android.settingslib.widget.TwoTargetPreference;
 
 import java.util.ArrayList;
 import java.util.Calendar;
diff --git a/src/com/android/settings/notification/app/ChannelNotificationSettings.java b/src/com/android/settings/notification/app/ChannelNotificationSettings.java
index bdea30d..296863c 100644
--- a/src/com/android/settings/notification/app/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/app/ChannelNotificationSettings.java
@@ -68,12 +68,16 @@
 
         if (mChannel != null && !TextUtils.isEmpty(mChannel.getConversationId())
             && !mChannel.isDemoted()) {
-            startActivity(new SubSettingLauncher(mContext)
+            Intent intent = new SubSettingLauncher(mContext)
                     .setDestination(ConversationNotificationSettings.class.getName())
                     .setArguments(getArguments())
                     .setExtras(getIntent() != null ? getIntent().getExtras(): null)
                     .setSourceMetricsCategory(SettingsEnums.NOTIFICATION_TOPIC_NOTIFICATION)
-                    .toIntent());
+                    .toIntent();
+            if (mPreferenceFilter != null) {
+                intent.setClass(mContext, ChannelPanelActivity.class);
+            }
+            startActivity(intent);
             finish();
             return;
         }
@@ -84,6 +88,7 @@
             controller.displayPreference(getPreferenceScreen());
         }
         updatePreferenceStates();
+        animatePanel();
     }
 
     @Override
diff --git a/src/com/android/settings/notification/app/ChannelPanelActivity.java b/src/com/android/settings/notification/app/ChannelPanelActivity.java
new file mode 100644
index 0000000..3ba118e
--- /dev/null
+++ b/src/com/android/settings/notification/app/ChannelPanelActivity.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.notification.app;
+
+import android.app.settings.SettingsEnums;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.Window;
+import android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settings.core.HideNonSystemOverlayMixin;
+import com.android.settings.core.SubSettingLauncher;
+
+/**
+ * Dialog Activity to host channel settings
+ */
+public class ChannelPanelActivity extends FragmentActivity {
+
+    private static final String TAG = "ChannelPanelActivity";
+
+    final Bundle mBundle = new Bundle();
+    NotificationSettings mPanelFragment;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (!getIntent().hasExtra(Settings.EXTRA_CHANNEL_FILTER_LIST)) {
+            launchFullSettings();
+        }
+
+        getApplicationContext().getTheme().rebase();
+        createOrUpdatePanel();
+        getLifecycle().addObserver(new HideNonSystemOverlayMixin(this));
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+        createOrUpdatePanel();
+    }
+
+    @Override
+    public void onConfigurationChanged(@NonNull Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    private void launchFullSettings() {
+        Bundle extras = getIntent().getExtras();
+        extras.remove(Settings.EXTRA_CHANNEL_FILTER_LIST);
+        startActivity(new SubSettingLauncher(this)
+                .setDestination(ChannelNotificationSettings.class.getName())
+                .setExtras(extras)
+                .setSourceMetricsCategory(SettingsEnums.NOTIFICATION_TOPIC_NOTIFICATION)
+                .toIntent());
+        finish();
+    }
+
+    private void createOrUpdatePanel() {
+        final Intent callingIntent = getIntent();
+        if (callingIntent == null) {
+            Log.e(TAG, "Null intent, closing Panel Activity");
+            finish();
+            return;
+        }
+
+        final FragmentManager fragmentManager = getSupportFragmentManager();
+        setContentView(R.layout.notification_channel_panel);
+
+        // Move the window to the bottom of screen, and make it take up the entire screen width.
+        final Window window = getWindow();
+        window.setGravity(Gravity.BOTTOM);
+        window.setLayout(WindowManager.LayoutParams.MATCH_PARENT,
+                WindowManager.LayoutParams.WRAP_CONTENT);
+
+        findViewById(R.id.done).setOnClickListener(v -> finish());
+        findViewById(R.id.see_more).setOnClickListener(v -> launchFullSettings());
+
+        mPanelFragment = callingIntent.hasExtra(Settings.EXTRA_CONVERSATION_ID)
+                ? new ConversationNotificationSettings()
+                : new ChannelNotificationSettings();
+        mPanelFragment.setArguments(new Bundle(mBundle));
+        fragmentManager.beginTransaction().replace(
+                android.R.id.list_container, mPanelFragment).commit();
+    }
+}
diff --git a/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java b/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java
index 313b387..73659b8 100644
--- a/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java
+++ b/src/com/android/settings/notification/app/ConversationHeaderPreferenceController.java
@@ -93,6 +93,7 @@
                     .done(activity, mContext);
 
             pref.findViewById(R.id.entity_header).setVisibility(View.VISIBLE);
+            pref.findViewById(R.id.entity_header).setBackground(null);
         }
     }
 
diff --git a/src/com/android/settings/notification/app/ConversationNotificationSettings.java b/src/com/android/settings/notification/app/ConversationNotificationSettings.java
index 819ba83..d712c84 100644
--- a/src/com/android/settings/notification/app/ConversationNotificationSettings.java
+++ b/src/com/android/settings/notification/app/ConversationNotificationSettings.java
@@ -49,10 +49,11 @@
 
         for (NotificationPreferenceController controller : mControllers) {
             controller.onResume(mAppRow, mChannel, mChannelGroup, mConversationDrawable,
-                    mConversationInfo, mSuspendedAppsAdmin, null);
+                    mConversationInfo, mSuspendedAppsAdmin, mPreferenceFilter);
             controller.displayPreference(getPreferenceScreen());
         }
         updatePreferenceStates();
+        animatePanel();
     }
 
     @Override
diff --git a/src/com/android/settings/notification/app/HeaderPreferenceController.java b/src/com/android/settings/notification/app/HeaderPreferenceController.java
index 6482943..4e9c039 100644
--- a/src/com/android/settings/notification/app/HeaderPreferenceController.java
+++ b/src/com/android/settings/notification/app/HeaderPreferenceController.java
@@ -92,6 +92,7 @@
                     .setRecyclerView(mFragment.getListView(), mFragment.getSettingsLifecycle())
                     .done(activity, mContext);
             pref.findViewById(R.id.entity_header).setVisibility(View.VISIBLE);
+            pref.findViewById(R.id.entity_header).setBackground(null);
         }
     }
 
diff --git a/src/com/android/settings/notification/app/NotificationSettings.java b/src/com/android/settings/notification/app/NotificationSettings.java
index 44c735a..99f067d 100644
--- a/src/com/android/settings/notification/app/NotificationSettings.java
+++ b/src/com/android/settings/notification/app/NotificationSettings.java
@@ -18,6 +18,9 @@
 
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
@@ -39,8 +42,13 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.view.animation.DecelerateInterpolator;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
@@ -85,6 +93,20 @@
     protected Intent mIntent;
     protected Bundle mArgs;
 
+    private ViewGroup mLayoutView;
+    private static final int DURATION_ANIMATE_PANEL_EXPAND_MS = 250;
+
+    private final ViewTreeObserver.OnGlobalLayoutListener mOnGlobalLayoutListener =
+            new ViewTreeObserver.OnGlobalLayoutListener() {
+                @Override
+                public void onGlobalLayout() {
+                    animateIn();
+                    if (mLayoutView != null) {
+                        mLayoutView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                    }
+                }
+            };
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -187,6 +209,50 @@
         collectConfigActivities();
     }
 
+    protected void animatePanel() {
+        if (mPreferenceFilter != null) {
+            mLayoutView = getActivity().findViewById(R.id.main_content);
+            mLayoutView.getViewTreeObserver().addOnGlobalLayoutListener(mOnGlobalLayoutListener);
+        }
+    }
+
+    /**
+     * Animate a Panel onto the screen.
+     * <p>
+     * Takes the entire panel and animates in from behind the navigation bar.
+     * <p>
+     * Relies on the Panel being having a fixed height to begin the animation.
+     */
+    private void animateIn() {
+        final AnimatorSet animatorSet = buildAnimatorSet(mLayoutView,
+                mLayoutView.getHeight() /* startY */, 0.0f /* endY */,
+                0.0f /* startAlpha */, 1.0f /* endAlpha */,
+                DURATION_ANIMATE_PANEL_EXPAND_MS);
+        final ValueAnimator animator = new ValueAnimator();
+        animator.setFloatValues(0.0f, 1.0f);
+        animatorSet.play(animator);
+        animatorSet.start();
+    }
+
+    /**
+     * Build an {@link AnimatorSet} to animate the Panel, {@param parentView} in or out of the
+     * screen, based on the positional parameters {@param startY}, {@param endY}, the parameters
+     * for alpha changes {@param startAlpha}, {@param endAlpha}, and the {@param duration} in
+     * milliseconds.
+     */
+    @NonNull
+    private static AnimatorSet buildAnimatorSet(@NonNull View targetView,
+            float startY, float endY,
+            float startAlpha, float endAlpha, int duration) {
+        final AnimatorSet animatorSet = new AnimatorSet();
+        animatorSet.setDuration(duration);
+        animatorSet.setInterpolator(new DecelerateInterpolator());
+        animatorSet.playTogether(
+                ObjectAnimator.ofFloat(targetView, View.TRANSLATION_Y, startY, endY),
+                ObjectAnimator.ofFloat(targetView, View.ALPHA, startAlpha, endAlpha));
+        return animatorSet;
+    }
+
     private void loadPreferencesFilter() {
         Intent intent = getActivity().getIntent();
         mPreferenceFilter = intent != null
diff --git a/src/com/android/settings/notification/app/RecentConversationPreference.java b/src/com/android/settings/notification/app/RecentConversationPreference.java
index 49e2c02..167fdd6 100644
--- a/src/com/android/settings/notification/app/RecentConversationPreference.java
+++ b/src/com/android/settings/notification/app/RecentConversationPreference.java
@@ -21,7 +21,7 @@
 import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
-import com.android.settingslib.TwoTargetPreference;
+import com.android.settingslib.widget.TwoTargetPreference;
 
 import com.google.common.annotations.VisibleForTesting;
 
diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index d5745ac..4958f1b 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -21,7 +21,6 @@
 import static androidx.core.view.accessibility.AccessibilityEventCompat.TYPE_VIEW_ACCESSIBILITY_FOCUSED;
 
 import android.app.ActionBar;
-import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.INotificationManager;
 import android.content.ComponentName;
@@ -55,6 +54,7 @@
 import com.android.internal.logging.UiEventLoggerImpl;
 import com.android.settings.R;
 import com.android.settings.notification.NotificationBackend;
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
 import com.android.settingslib.utils.ThreadUtils;
 import com.android.settingslib.widget.MainSwitchBar;
 import com.android.settingslib.widget.OnMainSwitchChangeListener;
@@ -65,7 +65,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-public class NotificationHistoryActivity extends Activity {
+public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity {
 
     private static String TAG = "NotifHistory";
 
diff --git a/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
index a431883..8bfcd13 100644
--- a/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeButtonPreferenceController.java
@@ -25,6 +25,7 @@
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.notification.SettingsEnableZenModeDialog;
@@ -90,9 +91,11 @@
             case Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
             case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
                 mPreference.updateStatus(true);
+                mPreference.setTitle(R.string.do_not_disturb_main_switch_title_on);
                 break;
             case Settings.Global.ZEN_MODE_OFF:
             default:
+                mPreference.setTitle(R.string.do_not_disturb_main_switch_title_off);
                 mPreference.updateStatus(false);
         }
     }
diff --git a/src/com/android/settings/notification/zen/ZenRulePreference.java b/src/com/android/settings/notification/zen/ZenRulePreference.java
index 1f1283d..b8c8354 100644
--- a/src/com/android/settings/notification/zen/ZenRulePreference.java
+++ b/src/com/android/settings/notification/zen/ZenRulePreference.java
@@ -33,8 +33,8 @@
 import com.android.settings.R;
 import com.android.settings.utils.ManagedServiceSettings;
 import com.android.settings.utils.ZenServiceListing;
-import com.android.settingslib.TwoTargetPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.widget.TwoTargetPreference;
 
 import java.util.Map;
 
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
index a15075e..42d98e0 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -25,6 +25,7 @@
 import com.android.settings.R;
 import com.android.settings.accounts.AccountFeatureProvider;
 import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.applications.appinfo.ExtraAppInfoFeatureProvider;
 import com.android.settings.aware.AwareFeatureProvider;
 import com.android.settings.biometrics.face.FaceFeatureProvider;
 import com.android.settings.bluetooth.BluetoothFeatureProvider;
@@ -149,6 +150,11 @@
      */
     public abstract WifiTrackerLibProvider getWifiTrackerLibProvider();
 
+    /**
+     * Retrieve implementation for Extra App Info feature.
+     */
+    public abstract ExtraAppInfoFeatureProvider getExtraAppInfoFeatureProvider();
+
     public static final class FactoryNotFoundException extends RuntimeException {
         public FactoryNotFoundException(Throwable throwable) {
             super("Unable to create factory. Did you misconfigure Proguard?", throwable);
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index a1b70d9..46b263a 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -29,6 +29,8 @@
 import com.android.settings.accounts.AccountFeatureProviderImpl;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.applications.ApplicationFeatureProviderImpl;
+import com.android.settings.applications.appinfo.ExtraAppInfoFeatureProvider;
+import com.android.settings.applications.appinfo.ExtraAppInfoFeatureProviderImpl;
 import com.android.settings.aware.AwareFeatureProvider;
 import com.android.settings.aware.AwareFeatureProviderImpl;
 import com.android.settings.biometrics.face.FaceFeatureProvider;
@@ -94,6 +96,7 @@
     private AwareFeatureProvider mAwareFeatureProvider;
     private FaceFeatureProvider mFaceFeatureProvider;
     private WifiTrackerLibProvider mWifiTrackerLibProvider;
+    private ExtraAppInfoFeatureProvider mExtraAppInfoFeatureProvider;
 
     @Override
     public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -291,4 +294,12 @@
         }
         return mWifiTrackerLibProvider;
     }
+
+    @Override
+    public ExtraAppInfoFeatureProvider getExtraAppInfoFeatureProvider() {
+        if (mExtraAppInfoFeatureProvider == null) {
+            mExtraAppInfoFeatureProvider = new ExtraAppInfoFeatureProviderImpl();
+        }
+        return mExtraAppInfoFeatureProvider;
+    }
 }
diff --git a/src/com/android/settings/panel/InternetConnectivityPanel.java b/src/com/android/settings/panel/InternetConnectivityPanel.java
index c90d22b..238cbb4 100644
--- a/src/com/android/settings/panel/InternetConnectivityPanel.java
+++ b/src/com/android/settings/panel/InternetConnectivityPanel.java
@@ -19,15 +19,26 @@
 import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
 import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
 
-import static com.android.settings.network.InternetUpdater.INTERNET_APM;
-import static com.android.settings.network.InternetUpdater.INTERNET_APM_NETWORKS;
 import static com.android.settings.network.NetworkProviderSettings.ACTION_NETWORK_PROVIDER_SETTINGS;
 
 import android.app.settings.SettingsEnums;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.net.Uri;
+import android.net.wifi.ScanResult;
+import android.net.wifi.WifiManager;
+import android.os.Handler;
+import android.os.HandlerExecutor;
+import android.os.Looper;
 import android.provider.Settings;
+import android.telephony.ServiceState;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyCallback;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.LifecycleObserver;
@@ -37,6 +48,9 @@
 import com.android.settings.Utils;
 import com.android.settings.network.AirplaneModePreferenceController;
 import com.android.settings.network.InternetUpdater;
+import com.android.settings.network.ProviderModelSliceHelper;
+import com.android.settings.network.SubscriptionsChangeListener;
+import com.android.settings.network.telephony.DataConnectivityListener;
 import com.android.settings.slices.CustomSliceRegistry;
 
 import java.util.ArrayList;
@@ -46,24 +60,69 @@
  * Represents the Internet Connectivity Panel.
  */
 public class InternetConnectivityPanel implements PanelContent, LifecycleObserver,
-        InternetUpdater.OnInternetTypeChangedListener {
+        InternetUpdater.InternetChangeListener, DataConnectivityListener.Client,
+        SubscriptionsChangeListener.SubscriptionsChangeListenerClient {
+    private static final String TAG = "InternetConnectivityPanel";
+    private static final int SUBTITLE_TEXT_NONE = -1;
+    private static final int SUBTITLE_TEXT_WIFI_IS_TURNED_ON = R.string.wifi_is_turned_on_subtitle;
+    private static final int SUBTITLE_TEXT_NON_CARRIER_NETWORK_UNAVAILABLE =
+            R.string.non_carrier_network_unavailable;
+    private static final int SUBTITLE_TEXT_ALL_CARRIER_NETWORK_UNAVAILABLE =
+            R.string.all_network_unavailable;
 
     private final Context mContext;
+    private final WifiManager mWifiManager;
+    private final IntentFilter mWifiStateFilter;
+    private final NetworkProviderTelephonyCallback mTelephonyCallback;
+    private final BroadcastReceiver mWifiStateReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent == null) {
+                return;
+            }
+            if (TextUtils.equals(intent.getAction(), WifiManager.NETWORK_STATE_CHANGED_ACTION)
+                    || TextUtils.equals(intent.getAction(),
+                    WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)) {
+                updatePanelTitle();
+            }
+        }
+    };
+
     @VisibleForTesting
     boolean mIsProviderModelEnabled;
-    private PanelContentCallback mCallback;
-    private InternetUpdater mInternetUpdater;
-    private @InternetUpdater.InternetType int mInternetType;
+    @VisibleForTesting
+    InternetUpdater mInternetUpdater;
+    @VisibleForTesting
+    ProviderModelSliceHelper mProviderModelSliceHelper;
 
-    public static InternetConnectivityPanel create(Context context) {
-        return new InternetConnectivityPanel(context);
-    }
+    private int mSubtitle = SUBTITLE_TEXT_NONE;
+    private PanelContentCallback mCallback;
+    private TelephonyManager mTelephonyManager;
+    private SubscriptionsChangeListener mSubscriptionsListener;
+    private DataConnectivityListener mConnectivityListener;
+    private int mDefaultDataSubid = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
 
     private InternetConnectivityPanel(Context context) {
         mContext = context.getApplicationContext();
         mIsProviderModelEnabled = Utils.isProviderModelEnabled(mContext);
         mInternetUpdater = new InternetUpdater(context, null /* Lifecycle */, this);
-        mInternetType = mInternetUpdater.getInternetType();
+
+        mSubscriptionsListener = new SubscriptionsChangeListener(context, this);
+        mConnectivityListener = new DataConnectivityListener(context, this);
+        mTelephonyCallback = new NetworkProviderTelephonyCallback();
+        mDefaultDataSubid = getDefaultDataSubscriptionId();
+        mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
+
+        mWifiManager = mContext.getSystemService(WifiManager.class);
+        mWifiStateFilter = new IntentFilter(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+        mWifiStateFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
+
+        mProviderModelSliceHelper = new ProviderModelSliceHelper(mContext, null);
+    }
+
+    /** create the panel */
+    public static InternetConnectivityPanel create(Context context) {
+        return new InternetConnectivityPanel(context);
     }
 
     /** @OnLifecycleEvent(ON_RESUME) */
@@ -73,6 +132,12 @@
             return;
         }
         mInternetUpdater.onResume();
+        mSubscriptionsListener.start();
+        mConnectivityListener.start();
+        mTelephonyManager.registerTelephonyCallback(
+                new HandlerExecutor(new Handler(Looper.getMainLooper())), mTelephonyCallback);
+        mContext.registerReceiver(mWifiStateReceiver, mWifiStateFilter);
+        updatePanelTitle();
     }
 
     /** @OnLifecycleEvent(ON_PAUSE) */
@@ -82,6 +147,10 @@
             return;
         }
         mInternetUpdater.onPause();
+        mSubscriptionsListener.stop();
+        mConnectivityListener.stop();
+        mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
+        mContext.unregisterReceiver(mWifiStateReceiver);
     }
 
     /**
@@ -90,9 +159,8 @@
     @Override
     public CharSequence getTitle() {
         if (mIsProviderModelEnabled) {
-            return mContext.getText(mInternetType == INTERNET_APM_NETWORKS
-                    ? R.string.airplane_mode_network_panel_title
-                    : R.string.provider_internet_settings);
+            return mContext.getText(mInternetUpdater.isAirplaneModeOn()
+                    ? R.string.airplane_mode : R.string.provider_internet_settings);
         }
         return mContext.getText(R.string.internet_connectivity_panel_title);
     }
@@ -102,8 +170,8 @@
      */
     @Override
     public CharSequence getSubTitle() {
-        if (mIsProviderModelEnabled && mInternetType == INTERNET_APM) {
-            return mContext.getText(R.string.condition_airplane_title);
+        if (mIsProviderModelEnabled && mSubtitle != SUBTITLE_TEXT_NONE) {
+            return mContext.getText(mSubtitle);
         }
         return null;
     }
@@ -113,7 +181,7 @@
         final List<Uri> uris = new ArrayList<>();
         if (mIsProviderModelEnabled) {
             uris.add(CustomSliceRegistry.PROVIDER_MODEL_SLICE_URI);
-            uris.add(CustomSliceRegistry.AIRPLANE_SAFE_NETWORKS_SLICE_URI);
+            uris.add(CustomSliceRegistry.TURN_ON_WIFI_SLICE_URI);
         } else {
             uris.add(CustomSliceRegistry.WIFI_SLICE_URI);
             uris.add(CustomSliceRegistry.MOBILE_DATA_SLICE_URI);
@@ -136,7 +204,7 @@
 
     @Override
     public CharSequence getCustomizedButtonTitle() {
-        if (mInternetType == INTERNET_APM) {
+        if (mInternetUpdater.isAirplaneModeOn() && !mInternetUpdater.isWifiEnabled()) {
             return null;
         }
         return mContext.getText(R.string.settings_button);
@@ -158,40 +226,116 @@
     }
 
     /**
-     * Called when internet type is changed.
-     *
-     * @param internetType the internet type
+     * Called when airplane mode state is changed.
      */
-    public void onInternetTypeChanged(@InternetUpdater.InternetType int internetType) {
-        if (internetType == mInternetType) {
+    @Override
+    public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
+        updatePanelTitle();
+    }
+
+    /**
+     * Called when Wi-Fi enabled is changed.
+     */
+    @Override
+    public void onWifiEnabledChanged(boolean enabled) {
+        updatePanelTitle();
+    }
+
+    @Override
+    public void onSubscriptionsChanged() {
+        final int defaultDataSubId = getDefaultDataSubscriptionId();
+        log("onSubscriptionsChanged: defaultDataSubId:" + defaultDataSubId);
+        if (mDefaultDataSubid == defaultDataSubId) {
+            return;
+        }
+        if (SubscriptionManager.isUsableSubscriptionId(defaultDataSubId)) {
+            mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
+            mTelephonyManager.registerTelephonyCallback(
+                    new HandlerExecutor(new Handler(Looper.getMainLooper())), mTelephonyCallback);
+        }
+        updatePanelTitle();
+    }
+
+    @Override
+    public void onDataConnectivityChange() {
+        log("onDataConnectivityChange");
+        updatePanelTitle();
+    }
+
+    @VisibleForTesting
+    void updatePanelTitle() {
+        if (mCallback == null) {
+            return;
+        }
+        updateSubtitleText();
+
+        log("Subtitle:" + mSubtitle);
+        if (mSubtitle != SUBTITLE_TEXT_NONE) {
+            mCallback.onHeaderChanged();
+        } else {
+            // Other situations.
+            //   Title: Airplane mode / Internet
+            mCallback.onTitleChanged();
+        }
+        mCallback.onCustomizedButtonStateChanged();
+    }
+
+    @VisibleForTesting
+    int getDefaultDataSubscriptionId() {
+        return SubscriptionManager.getDefaultDataSubscriptionId();
+    }
+
+    private void updateSubtitleText() {
+        mSubtitle = SUBTITLE_TEXT_NONE;
+        if (!mInternetUpdater.isWifiEnabled()) {
             return;
         }
 
-        final boolean changeToApm = (internetType == INTERNET_APM);
-        final boolean changeFromApm = (mInternetType == INTERNET_APM);
-        final boolean changeWithApmNetworks =
-                (internetType == INTERNET_APM_NETWORKS || mInternetType == INTERNET_APM_NETWORKS);
-        mInternetType = internetType;
+        if (mInternetUpdater.isAirplaneModeOn()) {
+            // When the airplane mode is on and Wi-Fi is enabled.
+            //   Title: Airplane mode
+            //   Sub-Title: Wi-Fi is turned on
+            log("Airplane mode is on + Wi-Fi on.");
+            mSubtitle = SUBTITLE_TEXT_WIFI_IS_TURNED_ON;
+            return;
+        }
 
-        if (mCallback != null) {
-            if (changeToApm) {
-                // The internet type is changed to the airplane mode.
-                //   Title: Internet
-                //   Sub-Title: Airplane mode is on
-                //   Settings button: Hide
-                mCallback.onHeaderChanged();
-                mCallback.onCustomizedButtonStateChanged();
-            } else if (changeFromApm) {
-                // The internet type is changed from the airplane mode.
-                //   Title: Internet
-                //   Settings button: Show
-                mCallback.onTitleChanged();
-                mCallback.onCustomizedButtonStateChanged();
-            } else if (changeWithApmNetworks) {
-                // The internet type is changed with the airplane mode networks.
-                //   Title: Airplane mode networks / Internet
-                mCallback.onTitleChanged();
+        final List<ScanResult> wifiList = mWifiManager.getScanResults();
+        if (wifiList != null && wifiList.size() == 0) {
+            // Sub-Title:
+            // show non_carrier_network_unavailable
+            //   - while Wi-Fi on + no Wi-Fi item
+            // show all_network_unavailable:
+            //   - while Wi-Fi on + no Wi-Fi item + no carrier
+            //   - while Wi-Fi on + no Wi-Fi item + no data capability
+            log("No Wi-Fi item.");
+            mSubtitle = SUBTITLE_TEXT_NON_CARRIER_NETWORK_UNAVAILABLE;
+            if (!mProviderModelSliceHelper.hasCarrier()
+                    || !mProviderModelSliceHelper.isDataSimActive()) {
+                log("No carrier item or no carrier data.");
+                mSubtitle = SUBTITLE_TEXT_ALL_CARRIER_NETWORK_UNAVAILABLE;
             }
         }
     }
+
+    private class NetworkProviderTelephonyCallback extends TelephonyCallback implements
+            TelephonyCallback.DataConnectionStateListener,
+            TelephonyCallback.ServiceStateListener {
+        @Override
+        public void onServiceStateChanged(ServiceState state) {
+            log("onServiceStateChanged voiceState=" + state.getState()
+                    + " dataState=" + state.getDataRegistrationState());
+            updatePanelTitle();
+        }
+
+        @Override
+        public void onDataConnectionStateChanged(int state, int networkType) {
+            log("onDataConnectionStateChanged: networkType=" + networkType + " state=" + state);
+            updatePanelTitle();
+        }
+    }
+
+    private static void log(String s) {
+        Log.d(TAG, s);
+    }
 }
diff --git a/src/com/android/settings/search/CustomSiteMapRegistry.java b/src/com/android/settings/search/CustomSiteMapRegistry.java
index cd716fa..8448846 100644
--- a/src/com/android/settings/search/CustomSiteMapRegistry.java
+++ b/src/com/android/settings/search/CustomSiteMapRegistry.java
@@ -27,7 +27,7 @@
 import com.android.settings.gestures.GestureNavigationSettingsFragment;
 import com.android.settings.gestures.SystemNavigationGestureSettings;
 import com.android.settings.location.LocationSettings;
-import com.android.settings.location.RecentLocationRequestSeeAllFragment;
+import com.android.settings.location.RecentLocationAccessSeeAllFragment;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.notification.zen.ZenModeBlockedEffectsSettings;
 import com.android.settings.notification.zen.ZenModeRestrictNotificationsSettings;
@@ -57,7 +57,7 @@
         CUSTOM_SITE_MAP.put(
                 WifiSettings.class.getName(), NetworkDashboardFragment.class.getName());
         CUSTOM_SITE_MAP.put(PowerUsageAdvanced.class.getName(), PowerUsageSummary.class.getName());
-        CUSTOM_SITE_MAP.put(RecentLocationRequestSeeAllFragment.class.getName(),
+        CUSTOM_SITE_MAP.put(RecentLocationAccessSeeAllFragment.class.getName(),
                 LocationSettings.class.getName());
         CUSTOM_SITE_MAP.put(UsbDetailsFragment.class.getName(),
                 ConnectedDeviceDashboardFragment.class.getName());
diff --git a/src/com/android/settings/security/CredentialManagementAppButtonsController.java b/src/com/android/settings/security/CredentialManagementAppButtonsController.java
index c6afded..fe5e45b 100644
--- a/src/com/android/settings/security/CredentialManagementAppButtonsController.java
+++ b/src/com/android/settings/security/CredentialManagementAppButtonsController.java
@@ -16,11 +16,8 @@
 
 package com.android.settings.security;
 
-import android.app.AppOpsManager;
 import android.app.admin.DevicePolicyEventLogger;
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.RemoteException;
@@ -29,6 +26,7 @@
 import android.stats.devicepolicy.DevicePolicyEnums;
 import android.util.Log;
 
+import androidx.fragment.app.Fragment;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
@@ -48,16 +46,15 @@
 
     private final ExecutorService mExecutor = Executors.newSingleThreadExecutor();
     private final Handler mHandler = new Handler(Looper.getMainLooper());
-
-    private final PackageManager mPackageManager;
-    private final AppOpsManager mAppOpsManager;
     private boolean mHasCredentialManagerPackage;
-    private String mCredentialManagerPackageName;
+    private Fragment mFragment;
 
     public CredentialManagementAppButtonsController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mPackageManager = context.getPackageManager();
-        mAppOpsManager = context.getSystemService(AppOpsManager.class);
+    }
+
+    public void setParentFragment(Fragment fragment) {
+        mFragment = fragment;
     }
 
     @Override
@@ -73,7 +70,6 @@
             try {
                 IKeyChainService service = KeyChain.bind(mContext).getService();
                 mHasCredentialManagerPackage = service.hasCredentialManagementApp();
-                mCredentialManagerPackageName = service.getCredentialManagementAppPackageName();
             } catch (InterruptedException | RemoteException e) {
                 Log.e(TAG, "Unable to display credential management app buttons");
             }
@@ -91,24 +87,17 @@
     }
 
     private void removeCredentialManagementApp() {
-        try {
-            ApplicationInfo appInfo = mPackageManager.getApplicationInfo(
-                    mCredentialManagerPackageName, 0);
-            mAppOpsManager.setMode(AppOpsManager.OP_MANAGE_CREDENTIALS,
-                    appInfo.uid, mCredentialManagerPackageName, AppOpsManager.MODE_DEFAULT);
-            mExecutor.execute(() -> {
-                try {
-                    IKeyChainService service = KeyChain.bind(mContext).getService();
-                    service.removeCredentialManagementApp();
-                    DevicePolicyEventLogger
-                            .createEvent(DevicePolicyEnums.CREDENTIAL_MANAGEMENT_APP_REMOVED)
-                            .write();
-                } catch (InterruptedException | RemoteException e) {
-                    Log.e(TAG, "Unable to remove the credential management app");
-                }
-            });
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.e(TAG, "Unable to remove the credential management app");
-        }
+        mExecutor.execute(() -> {
+            try {
+                IKeyChainService service = KeyChain.bind(mContext).getService();
+                service.removeCredentialManagementApp();
+                DevicePolicyEventLogger
+                        .createEvent(DevicePolicyEnums.CREDENTIAL_MANAGEMENT_APP_REMOVED)
+                        .write();
+                mFragment.getActivity().finish();
+            } catch (InterruptedException | RemoteException e) {
+                Log.e(TAG, "Unable to remove the credential management app");
+            }
+        });
     }
 }
diff --git a/src/com/android/settings/security/CredentialManagementAppFragment.java b/src/com/android/settings/security/CredentialManagementAppFragment.java
index 5544ee6..74ce003 100644
--- a/src/com/android/settings/security/CredentialManagementAppFragment.java
+++ b/src/com/android/settings/security/CredentialManagementAppFragment.java
@@ -17,6 +17,7 @@
 package com.android.settings.security;
 
 import android.app.settings.SettingsEnums;
+import android.content.Context;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
@@ -47,6 +48,12 @@
         return SettingsEnums.CREDENTIAL_MANAGEMENT_APP;
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        use(CredentialManagementAppButtonsController.class).setParentFragment(this);
+    }
+
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.credential_management_app_fragment);
 }
diff --git a/src/com/android/settings/security/CredentialStorage.java b/src/com/android/settings/security/CredentialStorage.java
index 53a1a59..be42850 100644
--- a/src/com/android/settings/security/CredentialStorage.java
+++ b/src/com/android/settings/security/CredentialStorage.java
@@ -64,7 +64,6 @@
 
     private static final int CONFIRM_CLEAR_SYSTEM_CREDENTIAL_REQUEST = 1;
 
-    private final KeyStore mKeyStore = KeyStore.getInstance();
     private LockPatternUtils mUtils;
 
     /**
diff --git a/src/com/android/settings/security/RequestManageCredentials.java b/src/com/android/settings/security/RequestManageCredentials.java
index 4ee4fdf..eb7a7d8 100644
--- a/src/com/android/settings/security/RequestManageCredentials.java
+++ b/src/com/android/settings/security/RequestManageCredentials.java
@@ -208,7 +208,7 @@
                     .write();
             finishWithResultCancelled();
         });
-        allowButton.setOnClickListener(b -> setOrUpdateCredentialManagementApp());
+        allowButton.setOnClickListener(b -> setOrUpdateCredentialManagementAppAndFinish());
     }
 
     private void loadExtendedFloatingActionButton() {
@@ -220,13 +220,14 @@
         });
     }
 
-    private void setOrUpdateCredentialManagementApp() {
+    private void setOrUpdateCredentialManagementAppAndFinish() {
         try {
             mKeyChainConnection.getService().setCredentialManagementApp(
                     mCredentialManagerPackage, mAuthenticationPolicy);
             DevicePolicyEventLogger
                     .createEvent(DevicePolicyEnums.CREDENTIAL_MANAGEMENT_APP_REQUEST_ACCEPTED)
                     .write();
+            setResult(RESULT_OK);
         } catch (RemoteException e) {
             Log.e(TAG, "Unable to set credential manager app", e);
             logRequestFailure();
diff --git a/src/com/android/settings/security/ResetCredentialsPreferenceController.java b/src/com/android/settings/security/ResetCredentialsPreferenceController.java
index 0700b46..48e7f84 100644
--- a/src/com/android/settings/security/ResetCredentialsPreferenceController.java
+++ b/src/com/android/settings/security/ResetCredentialsPreferenceController.java
@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.os.UserManager;
-import android.security.KeyStore;
 
 import androidx.preference.PreferenceScreen;
 
@@ -27,6 +26,9 @@
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+
 public class ResetCredentialsPreferenceController extends RestrictedEncryptionPreferenceController
         implements LifecycleObserver, OnResume {
 
@@ -38,7 +40,13 @@
 
     public ResetCredentialsPreferenceController(Context context, Lifecycle lifecycle) {
         super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS);
-        mKeyStore = KeyStore.getInstance();
+        KeyStore keyStore = null;
+        try {
+            keyStore = KeyStore.getInstance("AndroidKeyStore");
+            keyStore.load(null);
+        } catch (Exception e) {
+        }
+        mKeyStore = keyStore;
         if (lifecycle != null) {
             lifecycle.addObserver(this);
         }
@@ -58,7 +66,15 @@
     @Override
     public void onResume() {
         if (mPreference != null && !mPreference.isDisabledByAdmin()) {
-            mPreference.setEnabled(!mKeyStore.isEmpty());
+            boolean isEnabled = false;
+            try {
+                if (mKeyStore != null) {
+                    isEnabled = mKeyStore.aliases().hasMoreElements();
+                }
+            } catch (KeyStoreException e) {
+                // If access to keystore fails, treat as disabled.
+            }
+            mPreference.setEnabled(isEnabled);
         }
     }
 }
diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java
index a8cb1c9..3fa098b 100644
--- a/src/com/android/settings/security/ScreenPinningSettings.java
+++ b/src/com/android/settings/security/ScreenPinningSettings.java
@@ -215,7 +215,7 @@
 
     private void updateDisplay() {
         if (isLockToAppEnabled(getActivity())) {
-            mUseScreenLock.setVisible(true);
+            mUseScreenLock.setEnabled(true);
             mUseScreenLock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newValue) {
@@ -226,7 +226,7 @@
             mUseScreenLock.setTitle(getCurrentSecurityTitle());
         } else {
             mFooterPreference.setSummary(getAppPinningContent());
-            mUseScreenLock.setVisible(false);
+            mUseScreenLock.setEnabled(false);
         }
     }
 
diff --git a/src/com/android/settings/security/UriAuthenticationPolicyAdapter.java b/src/com/android/settings/security/UriAuthenticationPolicyAdapter.java
index 8aeb074..0a6c398 100644
--- a/src/com/android/settings/security/UriAuthenticationPolicyAdapter.java
+++ b/src/com/android/settings/security/UriAuthenticationPolicyAdapter.java
@@ -74,7 +74,7 @@
     public void onBindViewHolder(UriAuthenticationPolicyAdapter.UriViewHolder holder,
             int position) {
         Uri uri = mUris.get(position);
-        holder.mUriNameView.setText(uri.toString());
+        holder.mUriNameView.setText(Uri.decode(uri.toString()));
     }
 
     @Override
diff --git a/src/com/android/settings/sim/CallsSimListDialogFragment.java b/src/com/android/settings/sim/CallsSimListDialogFragment.java
index 6dd262b..58da111 100644
--- a/src/com/android/settings/sim/CallsSimListDialogFragment.java
+++ b/src/com/android/settings/sim/CallsSimListDialogFragment.java
@@ -18,7 +18,6 @@
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.SubscriptionInfo;
diff --git a/src/com/android/settings/sim/OWNERS b/src/com/android/settings/sim/OWNERS
index e6569f4..68cee36 100644
--- a/src/com/android/settings/sim/OWNERS
+++ b/src/com/android/settings/sim/OWNERS
@@ -1,7 +1,8 @@
 # Default reviewers for this and subdirectories.
+allenwtsu@google.com
 andychou@google.com
 bonianchen@google.com
 goldmanj@google.com
-allenwtsu@google.com
+songferngwang@google.com
 
 # Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/slices/CustomSliceRegistry.java b/src/com/android/settings/slices/CustomSliceRegistry.java
index e40b164..713d61a 100644
--- a/src/com/android/settings/slices/CustomSliceRegistry.java
+++ b/src/com/android/settings/slices/CustomSliceRegistry.java
@@ -39,8 +39,8 @@
 import com.android.settings.location.LocationSlice;
 import com.android.settings.media.MediaOutputIndicatorSlice;
 import com.android.settings.media.RemoteMediaSlice;
-import com.android.settings.network.AirplaneSafeNetworksSlice;
 import com.android.settings.network.ProviderModelSlice;
+import com.android.settings.network.TurnOnWifiSlice;
 import com.android.settings.network.telephony.MobileDataSlice;
 import com.android.settings.notification.zen.ZenModeButtonPreferenceController;
 import com.android.settings.wifi.calling.WifiCallingSliceHelper;
@@ -307,13 +307,13 @@
             .build();
 
     /**
-     * Backing Uri for the Always On Slice.
+     * Backing Uri for the Turn on Wi-Fi Slice.
      */
-    public static final Uri AIRPLANE_SAFE_NETWORKS_SLICE_URI = new Uri.Builder()
+    public static final Uri TURN_ON_WIFI_SLICE_URI = new Uri.Builder()
             .scheme(ContentResolver.SCHEME_CONTENT)
             .authority(SettingsSliceProvider.SLICE_AUTHORITY)
             .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
-            .appendPath("airplane_safe_networks")
+            .appendPath("turn_on_wifi")
             .build();
 
     @VisibleForTesting
@@ -337,7 +337,7 @@
         sUriToSlice.put(DARK_THEME_SLICE_URI, DarkThemeSlice.class);
         sUriToSlice.put(REMOTE_MEDIA_SLICE_URI, RemoteMediaSlice.class);
         sUriToSlice.put(ALWAYS_ON_SLICE_URI, AlwaysOnDisplaySlice.class);
-        sUriToSlice.put(AIRPLANE_SAFE_NETWORKS_SLICE_URI, AirplaneSafeNetworksSlice.class);
+        sUriToSlice.put(TURN_ON_WIFI_SLICE_URI, TurnOnWifiSlice.class);
     }
 
     public static Class<? extends CustomSliceable> getSliceClassByUri(Uri uri) {
diff --git a/src/com/android/settings/system/FactoryResetPreferenceController.java b/src/com/android/settings/system/FactoryResetPreferenceController.java
index cdeeaef..a307171 100644
--- a/src/com/android/settings/system/FactoryResetPreferenceController.java
+++ b/src/com/android/settings/system/FactoryResetPreferenceController.java
@@ -16,9 +16,13 @@
 package com.android.settings.system;
 
 import android.content.Context;
+import android.content.Intent;
 import android.os.UserManager;
 
+import androidx.preference.Preference;
+
 import com.android.settings.R;
+import com.android.settings.Settings;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -45,4 +49,14 @@
     public String getPreferenceKey() {
         return KEY_FACTORY_RESET;
     }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_FACTORY_RESET.equals(preference.getKey())) {
+            final Intent intent = new Intent(mContext, Settings.FactoryResetActivity.class);
+            mContext.startActivity(intent);
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/src/com/android/settings/users/UserDialogs.java b/src/com/android/settings/users/UserDialogs.java
index 0fb9636..9aab5b0 100644
--- a/src/com/android/settings/users/UserDialogs.java
+++ b/src/com/android/settings/users/UserDialogs.java
@@ -92,8 +92,7 @@
         View view = inflater.inflate(R.layout.delete_managed_profile_dialog, null);
         ImageView imageView =
                 (ImageView) view.findViewById(R.id.delete_managed_profile_mdm_icon_view);
-        Drawable badgedApplicationIcon = packageManager.getUserBadgedIcon(
-                packageManager.getApplicationIcon(mdmApplicationInfo), new UserHandle(userId));
+        Drawable badgedApplicationIcon = packageManager.getApplicationIcon(mdmApplicationInfo);
         imageView.setImageDrawable(badgedApplicationIcon);
 
         CharSequence appLabel = packageManager.getApplicationLabel(mdmApplicationInfo);
diff --git a/src/com/android/settings/utils/AndroidKeystoreAliasLoader.java b/src/com/android/settings/utils/AndroidKeystoreAliasLoader.java
new file mode 100644
index 0000000..e8eab68
--- /dev/null
+++ b/src/com/android/settings/utils/AndroidKeystoreAliasLoader.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.utils;
+
+import android.os.Process;
+import android.security.keystore.AndroidKeyStoreProvider;
+import android.security.keystore.KeyProperties;
+import android.security.keystore2.AndroidKeyStoreLoadStoreParameter;
+import android.util.Log;
+
+import java.security.Key;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.Certificate;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+
+/**
+ * This class provides a portable and unified way to load the content of AndroidKeyStore through
+ * public API.
+ * @hide
+ */
+public class AndroidKeystoreAliasLoader {
+    private static final String TAG = "SettingsKeystoreUtils";
+
+    private final Collection<String> mKeyCertAliases;
+    private final Collection<String> mCaCertAliases;
+    /**
+     * This Constructor loads all aliases of asymmetric keys pairs and certificates in the
+     * AndroidKeyStore within the given namespace.
+     * Viable namespaces are {@link KeyProperties#NAMESPACE_WIFI},
+     * {@link KeyProperties#NAMESPACE_APPLICATION}, or null. The latter two are equivalent in
+     * that they will load the keystore content of the app's own namespace. In case of settings,
+     * this is the namespace of the AID_SYSTEM.
+     *
+     * @param namespace {@link KeyProperties#NAMESPACE_WIFI},
+     *                  {@link KeyProperties#NAMESPACE_APPLICATION}, or null
+     * @hide
+     */
+    public AndroidKeystoreAliasLoader(Integer namespace) {
+        mKeyCertAliases = new ArrayList<>();
+        mCaCertAliases = new ArrayList<>();
+        KeyStore keyStore = null;
+        final Enumeration<String> aliases;
+        try {
+            if (namespace != null && namespace != KeyProperties.NAMESPACE_APPLICATION) {
+                if (AndroidKeyStoreProvider.isKeystore2Enabled()) {
+                    keyStore = KeyStore.getInstance("AndroidKeyStore");
+                    keyStore.load(new AndroidKeyStoreLoadStoreParameter(namespace));
+                } else {
+                    // In the legacy case we pass in the WIFI UID because that is the only
+                    // possible special namespace that existed as of this writing,
+                    // and new namespaces must only be added using the new mechanism.
+                    keyStore = AndroidKeyStoreProvider.getKeyStoreForUid(Process.WIFI_UID);
+                }
+            } else {
+                keyStore = KeyStore.getInstance("AndroidKeyStore");
+                keyStore.load(null);
+            }
+            aliases = keyStore.aliases();
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to open Android Keystore.", e);
+            // Will return empty lists.
+            return;
+        }
+
+        while (aliases.hasMoreElements()) {
+            final String alias = aliases.nextElement();
+            try {
+                final Key key = keyStore.getKey(alias, null);
+                if (key != null) {
+                    if (key instanceof PrivateKey) {
+                        mKeyCertAliases.add(alias);
+                        final Certificate[] cert = keyStore.getCertificateChain(alias);
+                        if (cert != null && cert.length >= 2) {
+                            mCaCertAliases.add(alias);
+                        }
+                    }
+                } else {
+                    if (keyStore.getCertificate(alias) != null) {
+                        mCaCertAliases.add(alias);
+                    }
+                }
+            } catch (KeyStoreException | NoSuchAlgorithmException | UnrecoverableKeyException e) {
+                Log.e(TAG, "Failed to load alias: "
+                        + alias + " from Android Keystore. Ignoring.", e);
+            }
+        }
+    }
+
+    /**
+     * Returns the aliases of the key pairs and certificates stored in the Android KeyStore at the
+     * time the constructor was called.
+     * @return Collection of keystore aliases.
+     * @hide
+     */
+    public Collection<String> getKeyCertAliases() {
+        return mKeyCertAliases;
+    }
+
+    /**
+     * Returns the aliases of the trusted certificates stored in the Android KeyStore at the
+     * time the constructor was called.
+     * @return Collection of keystore aliases.
+     * @hide
+     */
+    public Collection<String> getCaCertAliases() {
+        return mCaCertAliases;
+    }
+}
diff --git a/src/com/android/settings/vpn2/ConfigDialog.java b/src/com/android/settings/vpn2/ConfigDialog.java
index a0c7a1e..03e3613 100644
--- a/src/com/android/settings/vpn2/ConfigDialog.java
+++ b/src/com/android/settings/vpn2/ConfigDialog.java
@@ -24,8 +24,6 @@
 import android.net.ProxyInfo;
 import android.os.Bundle;
 import android.os.SystemProperties;
-import android.security.Credentials;
-import android.security.KeyStore;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.View;
@@ -42,10 +40,12 @@
 import com.android.internal.net.VpnProfile;
 import com.android.net.module.util.ProxyUtils;
 import com.android.settings.R;
+import com.android.settings.utils.AndroidKeystoreAliasLoader;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -58,7 +58,7 @@
 class ConfigDialog extends AlertDialog implements TextWatcher,
         View.OnClickListener, AdapterView.OnItemSelectedListener,
         CompoundButton.OnCheckedChangeListener {
-    private final KeyStore mKeyStore = KeyStore.getInstance();
+    private static final String TAG = "ConfigDialog";
     private final DialogInterface.OnClickListener mListener;
     private final VpnProfile mProfile;
 
@@ -153,10 +153,13 @@
         mL2tpSecret.setTextAppearance(android.R.style.TextAppearance_DeviceDefault_Medium);
         mIpsecIdentifier.setText(mProfile.ipsecIdentifier);
         mIpsecSecret.setText(mProfile.ipsecSecret);
-        loadCertificates(mIpsecUserCert, Credentials.USER_PRIVATE_KEY, 0, mProfile.ipsecUserCert);
-        loadCertificates(mIpsecCaCert, Credentials.CA_CERTIFICATE,
+        AndroidKeystoreAliasLoader androidKeystoreAliasLoader =
+                new AndroidKeystoreAliasLoader(null);
+        loadCertificates(mIpsecUserCert, androidKeystoreAliasLoader.getKeyCertAliases(), 0,
+                mProfile.ipsecUserCert);
+        loadCertificates(mIpsecCaCert, androidKeystoreAliasLoader.getCaCertAliases(),
                 R.string.vpn_no_ca_cert, mProfile.ipsecCaCert);
-        loadCertificates(mIpsecServerCert, Credentials.USER_CERTIFICATE,
+        loadCertificates(mIpsecServerCert, androidKeystoreAliasLoader.getKeyCertAliases(),
                 R.string.vpn_no_server_cert, mProfile.ipsecServerCert);
         mSaveLogin.setChecked(mProfile.saveLogin);
         mAlwaysOnVpn.setChecked(mProfile.key.equals(VpnUtils.getLockdownVpn()));
@@ -511,27 +514,30 @@
         typeSpinner.setAdapter(adapter);
     }
 
-    private void loadCertificates(Spinner spinner, String prefix, int firstId, String selected) {
+    private void loadCertificates(Spinner spinner, Collection<String> choices, int firstId,
+            String selected) {
         Context context = getContext();
         String first = (firstId == 0) ? "" : context.getString(firstId);
-        String[] certificates = mKeyStore.list(prefix);
+        String[] myChoices;
 
-        if (certificates == null || certificates.length == 0) {
-            certificates = new String[] {first};
+        if (choices == null || choices.size() == 0) {
+            myChoices = new String[] {first};
         } else {
-            String[] array = new String[certificates.length + 1];
-            array[0] = first;
-            System.arraycopy(certificates, 0, array, 1, certificates.length);
-            certificates = array;
+            myChoices = new String[choices.size() + 1];
+            myChoices[0] = first;
+            int i = 1;
+            for (String c : choices) {
+                myChoices[i++] = c;
+            }
         }
 
         ArrayAdapter<String> adapter = new ArrayAdapter<String>(
-                context, android.R.layout.simple_spinner_item, certificates);
+                context, android.R.layout.simple_spinner_item, myChoices);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         spinner.setAdapter(adapter);
 
-        for (int i = 1; i < certificates.length; ++i) {
-            if (certificates[i].equals(selected)) {
+        for (int i = 1; i < myChoices.length; ++i) {
+            if (myChoices[i].equals(selected)) {
                 spinner.setSelection(i);
                 break;
             }
@@ -586,7 +592,7 @@
             // 0 is a last resort default, but the interface validates that the proxy port is
             // present and non-zero.
             int port = proxyPort.isEmpty() ? 0 : Integer.parseInt(proxyPort);
-            profile.proxy = new ProxyInfo(proxyHost, port, null);
+            profile.proxy = ProxyInfo.buildDirectProxy(proxyHost, port);
         } else {
             profile.proxy = null;
         }
diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java
index f339a69..b8825fe 100644
--- a/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -25,7 +25,7 @@
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.security.Credentials;
-import android.security.KeyStore;
+import android.security.LegacyVpnProfileStore;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
@@ -151,9 +151,8 @@
                 return;
             }
 
-            // Delete from KeyStore
-            KeyStore keyStore = KeyStore.getInstance();
-            keyStore.delete(Credentials.VPN + profile.key, KeyStore.UID_SELF);
+            // Delete from profile store.
+            LegacyVpnProfileStore.remove(Credentials.VPN + profile.key);
 
             updateLockdownVpn(false, profile);
         }
@@ -188,8 +187,7 @@
     }
 
     private void save(VpnProfile profile, boolean lockdown) {
-        KeyStore.getInstance().put(Credentials.VPN + profile.key, profile.encode(),
-                KeyStore.UID_SELF, /* flags */ 0);
+        LegacyVpnProfileStore.put(Credentials.VPN + profile.key, profile.encode());
 
         // Flush out old version of profile
         disconnect(profile);
diff --git a/src/com/android/settings/vpn2/OWNERS b/src/com/android/settings/vpn2/OWNERS
index 0419e24..894d604 100644
--- a/src/com/android/settings/vpn2/OWNERS
+++ b/src/com/android/settings/vpn2/OWNERS
@@ -4,6 +4,7 @@
 maze@google.com
 reminv@google.com
 xiaom@google.com
+goldmanj@google.com
 
 # Emergency approvers in case the above are not available
 satk@google.com
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 0a3b2b0..7635733 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -41,7 +41,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.security.Credentials;
-import android.security.KeyStore;
+import android.security.LegacyVpnProfileStore;
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.Log;
@@ -57,7 +57,6 @@
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
 import com.android.internal.net.VpnProfile;
-import com.android.internal.util.ArrayUtils;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
 import com.android.settings.widget.GearPreference;
@@ -94,8 +93,6 @@
     private UserManager mUserManager;
     private VpnManager mVpnManager;
 
-    private final KeyStore mKeyStore = KeyStore.getInstance();
-
     private Map<String, LegacyVpnPreference> mLegacyVpnPreferences = new ArrayMap<>();
     private Map<AppVpnInfo, AppPreference> mAppPreferences = new ArrayMap<>();
 
@@ -222,7 +219,7 @@
         final Context context = activity.getApplicationContext();
 
         // Run heavy RPCs before switching to UI thread
-        final List<VpnProfile> vpnProfiles = loadVpnProfiles(mKeyStore);
+        final List<VpnProfile> vpnProfiles = loadVpnProfiles();
         final List<AppVpnInfo> vpnApps = getVpnApps(context, /* includeProfiles */ true);
 
         final Map<String, LegacyVpnInfo> connectedLegacyVpns = getConnectedLegacyVpns();
@@ -540,12 +537,13 @@
         return result;
     }
 
-    static List<VpnProfile> loadVpnProfiles(KeyStore keyStore, int... excludeTypes) {
+    private static List<VpnProfile> loadVpnProfiles() {
         final ArrayList<VpnProfile> result = Lists.newArrayList();
 
-        for (String key : keyStore.list(Credentials.VPN)) {
-            final VpnProfile profile = VpnProfile.decode(key, keyStore.get(Credentials.VPN + key));
-            if (profile != null && !ArrayUtils.contains(excludeTypes, profile.type)) {
+        for (String key : LegacyVpnProfileStore.list(Credentials.VPN)) {
+            final VpnProfile profile = VpnProfile.decode(key,
+                    LegacyVpnProfileStore.get(Credentials.VPN + key));
+            if (profile != null) {
                 result.add(profile);
             }
         }
diff --git a/src/com/android/settings/vpn2/VpnUtils.java b/src/com/android/settings/vpn2/VpnUtils.java
index 4c9338c..d6a5578 100644
--- a/src/com/android/settings/vpn2/VpnUtils.java
+++ b/src/com/android/settings/vpn2/VpnUtils.java
@@ -20,7 +20,7 @@
 import android.os.RemoteException;
 import android.provider.Settings;
 import android.security.Credentials;
-import android.security.KeyStore;
+import android.security.LegacyVpnProfileStore;
 
 import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
@@ -28,27 +28,25 @@
 /**
  * Utility functions for vpn.
  *
- * Keystore methods should only be called in system user
+ * LegacyVpnProfileStore methods should only be called in system user
  */
 public class VpnUtils {
 
     private static final String TAG = "VpnUtils";
 
     public static String getLockdownVpn() {
-        final byte[] value = KeyStore.getInstance().get(
-            Credentials.LOCKDOWN_VPN, true /* suppressKeyNotFoundWarning */);
+        final byte[] value = LegacyVpnProfileStore.get(Credentials.LOCKDOWN_VPN);
         return value == null ? null : new String(value);
     }
 
     public static void clearLockdownVpn(Context context) {
-        KeyStore.getInstance().delete(Credentials.LOCKDOWN_VPN);
+        LegacyVpnProfileStore.remove(Credentials.LOCKDOWN_VPN);
         // Always notify VpnManager after keystore update
         getVpnManager(context).updateLockdownVpn();
     }
 
     public static void setLockdownVpn(Context context, String lockdownKey) {
-        KeyStore.getInstance().put(Credentials.LOCKDOWN_VPN, lockdownKey.getBytes(),
-                KeyStore.UID_SELF, /* flags */ 0);
+        LegacyVpnProfileStore.put(Credentials.LOCKDOWN_VPN, lockdownKey.getBytes());
         // Always notify VpnManager after keystore update
         getVpnManager(context).updateLockdownVpn();
     }
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index 21352b7..19b6c54 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -64,9 +64,9 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.TwoTargetPreference;
 import com.android.settingslib.search.Indexable;
 import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.widget.TwoTargetPreference;
 
 /**
  * The Settings screen for WifiDisplay configuration and connection management.
diff --git a/src/com/android/settings/widget/FilterTouchesSwitchPreference.java b/src/com/android/settings/widget/FilterTouchesSwitchPreference.java
index 1b4d681..5721854 100644
--- a/src/com/android/settings/widget/FilterTouchesSwitchPreference.java
+++ b/src/com/android/settings/widget/FilterTouchesSwitchPreference.java
@@ -47,6 +47,7 @@
 
     @Override
     public void onBindViewHolder(PreferenceViewHolder holder) {
+         setSingleLineTitle(true);
         super.onBindViewHolder(holder);
         final View switchView = holder.findViewById(android.R.id.switch_widget);
         if (switchView != null) {
diff --git a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
index e89e793..b3ae609 100644
--- a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
+++ b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
@@ -39,10 +39,14 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
+import com.google.android.material.appbar.AppBarLayout;
+
 public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter {
 
     private static final String TAG = "HighlightableAdapter";
     @VisibleForTesting
+    static final long DELAY_COLLAPSE_DURATION_MILLIS = 300L;
+    @VisibleForTesting
     static final long DELAY_HIGHLIGHT_DURATION_MILLIS = 600L;
     private static final long HIGHLIGHT_DURATION = 15000L;
     private static final long HIGHLIGHT_FADE_OUT_DURATION = 500L;
@@ -115,7 +119,7 @@
         View v = holder.itemView;
         if (position == mHighlightPosition
                 && (mHighlightKey != null
-                        && TextUtils.equals(mHighlightKey, getItem(position).getKey()))) {
+                && TextUtils.equals(mHighlightKey, getItem(position).getKey()))) {
             // This position should be highlighted. If it's highlighted before - skip animation.
             addHighlightBackground(v, !mFadeInAnimated);
         } else if (Boolean.TRUE.equals(v.getTag(R.id.preference_highlighted))) {
@@ -124,15 +128,26 @@
         }
     }
 
-    public void requestHighlight(View root, RecyclerView recyclerView) {
+    /**
+     * A function can highlight a specific setting in recycler view.
+     * note: Before highlighting a setting, screen collapses tool bar with an animation.
+     */
+    public void requestHighlight(View root, RecyclerView recyclerView, AppBarLayout appBarLayout) {
         if (mHighlightRequested || recyclerView == null || TextUtils.isEmpty(mHighlightKey)) {
             return;
         }
+        final int position = getPreferenceAdapterPosition(mHighlightKey);
+        if (position < 0) {
+            return;
+        }
+
+        if (appBarLayout != null) {
+            root.postDelayed(() -> {
+                appBarLayout.setExpanded(false, true);
+            }, DELAY_COLLAPSE_DURATION_MILLIS);
+        }
+
         root.postDelayed(() -> {
-            final int position = getPreferenceAdapterPosition(mHighlightKey);
-            if (position < 0) {
-                return;
-            }
             mHighlightRequested = true;
             recyclerView.smoothScrollToPosition(position);
             mHighlightPosition = position;
diff --git a/src/com/android/settings/widget/LabeledSeekBarPreference.java b/src/com/android/settings/widget/LabeledSeekBarPreference.java
index e2b2d68..3a9ac18 100644
--- a/src/com/android/settings/widget/LabeledSeekBarPreference.java
+++ b/src/com/android/settings/widget/LabeledSeekBarPreference.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.widget.SeekBar;
 import android.widget.TextView;
@@ -32,6 +33,7 @@
 
     private final int mTextStartId;
     private final int mTextEndId;
+    private final int mTickMarkId;
     private OnPreferenceChangeListener mStopListener;
 
     public LabeledSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr,
@@ -48,6 +50,8 @@
         mTextEndId = styledAttrs.getResourceId(
                 R.styleable.LabeledSeekBarPreference_textEnd,
                 R.string.summary_placeholder);
+        mTickMarkId = styledAttrs.getResourceId(
+                R.styleable.LabeledSeekBarPreference_tickMark, /* defValue= */ 0);
         styledAttrs.recycle();
     }
 
@@ -65,6 +69,13 @@
         final TextView endText = (TextView) holder.findViewById(android.R.id.text2);
         startText.setText(mTextStartId);
         endText.setText(mTextEndId);
+
+        if (mTickMarkId != 0) {
+            final Drawable tickMark = getContext().getDrawable(mTickMarkId);
+            final SeekBar seekBar = (SeekBar) holder.findViewById(
+                    com.android.internal.R.id.seekbar);
+            seekBar.setTickMark(tickMark);
+        }
     }
 
     public void setOnPreferenceChangeStopListener(OnPreferenceChangeListener listener) {
diff --git a/src/com/android/settings/widget/PrimaryCheckBoxPreference.java b/src/com/android/settings/widget/PrimaryCheckBoxPreference.java
index a784d5d..c90f198 100644
--- a/src/com/android/settings/widget/PrimaryCheckBoxPreference.java
+++ b/src/com/android/settings/widget/PrimaryCheckBoxPreference.java
@@ -25,7 +25,7 @@
 import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
-import com.android.settingslib.TwoTargetPreference;
+import com.android.settingslib.widget.TwoTargetPreference;
 
 /**
  * A custom preference that provides inline checkbox. It has a mandatory field for title, and
diff --git a/src/com/android/settings/widget/SettingsMainSwitchBar.java b/src/com/android/settings/widget/SettingsMainSwitchBar.java
index d7fbd6a..ce2dde5 100644
--- a/src/com/android/settings/widget/SettingsMainSwitchBar.java
+++ b/src/com/android/settings/widget/SettingsMainSwitchBar.java
@@ -20,11 +20,14 @@
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.Switch;
 
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.widget.MainSwitchBar;
+import com.android.settingslib.widget.R;
 
 /**
  * A {@link MainSwitchBar} with a customized Switch and provides the metrics feature.
@@ -43,10 +46,13 @@
         boolean onBeforeCheckedChanged(Switch switchView, boolean isChecked);
     }
 
+    private ImageView mRestrictedIcon;
+    private RestrictedLockUtils.EnforcedAdmin mEnforcedAdmin;
+    private boolean mDisabledByAdmin;
+
     private final MetricsFeatureProvider mMetricsFeatureProvider;
     private OnBeforeCheckedChangeListener mOnBeforeListener;
 
-    private Switch mSwitch;
     private String mMetricsTag;
 
     public SettingsMainSwitchBar(Context context) {
@@ -66,12 +72,56 @@
         super(context, attrs, defStyleAttr, defStyleRes);
         mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
 
-        mSwitch = (Switch) findViewById(android.R.id.switch_widget);
-
         addOnSwitchChangeListener((switchView, isChecked) -> logMetrics(isChecked));
+
+        mRestrictedIcon = findViewById(R.id.restricted_icon);
+        mRestrictedIcon.setOnClickListener((View v) -> {
+            if (mDisabledByAdmin) {
+                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(context, mEnforcedAdmin);
+                onRestrictedIconClick();
+            }
+        });
+    }
+
+    /**
+     * If admin is not null, disables the text and switch but keeps the view clickable (unless the
+     * switch is disabled for other reasons). Otherwise, calls setEnabled.
+     */
+    public void setDisabledByAdmin(RestrictedLockUtils.EnforcedAdmin admin) {
+        mEnforcedAdmin = admin;
+        if (admin != null) {
+            super.setEnabled(true);
+            mDisabledByAdmin = true;
+            mTextView.setEnabled(false);
+            mSwitch.setEnabled(false);
+            mSwitch.setVisibility(View.GONE);
+            mRestrictedIcon.setVisibility(View.VISIBLE);
+        } else {
+            mDisabledByAdmin = false;
+            mSwitch.setVisibility(View.VISIBLE);
+            mRestrictedIcon.setVisibility(View.GONE);
+            setEnabled(isEnabled());
+        }
     }
 
     @Override
+    public void setEnabled(boolean enabled) {
+        if (enabled && mDisabledByAdmin) {
+            setDisabledByAdmin(null);
+            return;
+        }
+        super.setEnabled(enabled);
+    }
+
+    /**
+     * Called by the restricted icon clicked.
+     */
+
+    @Override
+    public boolean performClick() {
+        return getDelegatingView().performClick();
+    }
+
     protected void onRestrictedIconClick() {
         mMetricsFeatureProvider.action(
                 SettingsEnums.PAGE_UNKNOWN,
@@ -105,19 +155,16 @@
     }
 
     /**
-     * Returns if this view is visible.
-     */
-    public boolean isShowing() {
-        return (getVisibility() == View.VISIBLE);
-    }
-
-    /**
      * Set the metrics tag.
      */
     public void setMetricsTag(String tag) {
         mMetricsTag = tag;
     }
 
+    private View getDelegatingView() {
+        return mDisabledByAdmin ? mRestrictedIcon : mSwitch;
+    }
+
     private void logMetrics(boolean isChecked) {
         mMetricsFeatureProvider.action(
                 SettingsEnums.PAGE_UNKNOWN,
diff --git a/src/com/android/settings/widget/SettingsMainSwitchPreference.java b/src/com/android/settings/widget/SettingsMainSwitchPreference.java
index 2a7aa73..f627e31 100644
--- a/src/com/android/settings/widget/SettingsMainSwitchPreference.java
+++ b/src/com/android/settings/widget/SettingsMainSwitchPreference.java
@@ -44,7 +44,8 @@
     private final List<OnMainSwitchChangeListener> mSwitchChangeListeners = new ArrayList<>();
 
     private SettingsMainSwitchBar mMainSwitchBar;
-    private String mTitle;
+    private CharSequence mTitle;
+    private boolean mIsVisible;
 
     private RestrictedLockUtils.EnforcedAdmin mEnforcedAdmin;
 
@@ -77,16 +78,22 @@
         holder.setDividerAllowedBelow(false);
 
         mMainSwitchBar = (SettingsMainSwitchBar) holder.findViewById(R.id.main_switch_bar);
+
         mMainSwitchBar.show();
         updateStatus(isChecked());
         registerListenerToSwitchBar();
+
+        if (!mIsVisible) {
+            mMainSwitchBar.hide();
+        }
     }
 
     private void init(Context context, AttributeSet attrs) {
         setLayoutResource(R.layout.preference_widget_main_switch);
+        mIsVisible = true;
 
         if (attrs != null) {
-            TypedArray a = context.obtainStyledAttributes(attrs,
+            final TypedArray a = context.obtainStyledAttributes(attrs,
                     androidx.preference.R.styleable.Preference, 0/*defStyleAttr*/,
                     0/*defStyleRes*/);
             final CharSequence title = TypedArrayUtils.getText(a,
@@ -99,6 +106,14 @@
         }
     }
 
+    @Override
+    public void setChecked(boolean checked) {
+        super.setChecked(checked);
+        if (mMainSwitchBar != null) {
+            mMainSwitchBar.setChecked(checked);
+        }
+    }
+
     /**
      * Return the SettingsMainSwitchBar
      */
@@ -106,11 +121,9 @@
         return mMainSwitchBar;
     }
 
-    /**
-     * Set the preference title text
-     */
-    public void setTitle(String text) {
-        mTitle = text;
+    @Override
+    public void setTitle(CharSequence title) {
+        mTitle = title;
         if (mMainSwitchBar != null) {
             mMainSwitchBar.setTitle(mTitle);
         }
@@ -133,6 +146,7 @@
      * Show the MainSwitchBar
      */
     public void show() {
+        mIsVisible = true;
         if (mMainSwitchBar != null) {
             mMainSwitchBar.show();
         }
@@ -142,6 +156,7 @@
      * Hide the MainSwitchBar
      */
     public void hide() {
+        mIsVisible = false;
         if (mMainSwitchBar != null) {
             mMainSwitchBar.hide();
         }
@@ -161,6 +176,7 @@
      * Update the status of switch but doesn't notify the mOnBeforeListener.
      */
     public void setCheckedInternal(boolean checked) {
+        super.setChecked(checked);
         if (mMainSwitchBar != null) {
             mMainSwitchBar.setCheckedInternal(checked);
         }
@@ -170,6 +186,7 @@
      * Enable or disable the text and switch.
      */
     public void setSwitchBarEnabled(boolean enabled) {
+        setEnabled(enabled);
         if (mMainSwitchBar != null) {
             mMainSwitchBar.setEnabled(enabled);
         }
diff --git a/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java b/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java
index 727c61e..876f5e9 100644
--- a/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java
+++ b/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java
@@ -27,6 +27,7 @@
 import com.android.settingslib.applications.ApplicationsState.AppFilter;
 
 import java.util.List;
+
 /*
  * Connects info of apps that change wifi state to the ApplicationsState. Wraps around the generic
  * AppStateAppOpsBridge class to tailor to the semantics of CHANGE_WIFI_STATE. Also provides app
diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
index 11f3612..cbc89ae 100644
--- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
+++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
@@ -26,7 +26,6 @@
 import android.graphics.drawable.Drawable;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager.NetworkRequestMatchCallback;
 import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
 import android.os.Bundle;
 import android.os.Handler;
diff --git a/src/com/android/settings/wifi/OWNERS b/src/com/android/settings/wifi/OWNERS
index 5e20fd5..7f39cc7 100644
--- a/src/com/android/settings/wifi/OWNERS
+++ b/src/com/android/settings/wifi/OWNERS
@@ -1,5 +1,7 @@
 # Default reviewers for this and subdirectories.
 andychou@google.com
 arcwang@google.com
+changbetty@google.com
 goldmanj@google.com
+songferngwang@google.com
 wengsu@google.com
diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java
index 87499f5..15465ed 100644
--- a/src/com/android/settings/wifi/WifiAPITest.java
+++ b/src/com/android/settings/wifi/WifiAPITest.java
@@ -32,7 +32,6 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
-
 /**
  * Provide an interface for testing out the Wifi API
  */
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 65e45b7..408ffbe 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -18,12 +18,12 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.net.InetAddresses;
 import android.net.IpConfiguration;
 import android.net.IpConfiguration.IpAssignment;
 import android.net.IpConfiguration.ProxySettings;
 import android.net.LinkAddress;
 import android.net.NetworkInfo.DetailedState;
-import android.net.NetworkUtils;
 import android.net.ProxyInfo;
 import android.net.StaticIpConfiguration;
 import android.net.Uri;
@@ -34,8 +34,7 @@
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.IBinder;
-import android.security.Credentials;
-import android.security.KeyStore;
+import android.security.keystore.KeyProperties;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.text.Editable;
@@ -61,16 +60,17 @@
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
 import android.widget.ImageButton;
-import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
 import androidx.annotation.VisibleForTesting;
 
+import com.android.net.module.util.NetUtils;
 import com.android.net.module.util.ProxyUtils;
 import com.android.settings.ProxySelector;
 import com.android.settings.R;
 import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.utils.AndroidKeystoreAliasLoader;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.Utils;
 import com.android.settingslib.utils.ThreadUtils;
@@ -80,6 +80,7 @@
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -166,7 +167,6 @@
     private String mUseSystemCertsString;
     private String mDoNotProvideEapUserCertString;
 
-    private ScrollView mDialogContainer;
     private Spinner mSecuritySpinner;
     @VisibleForTesting Spinner mEapMethodSpinner;
     @VisibleForTesting Spinner mEapSimSpinner;    // For EAP-SIM, EAP-AKA and EAP-AKA-PRIME.
@@ -274,7 +274,6 @@
             mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
 
         mSsidScanButton = (ImageButton) mView.findViewById(R.id.ssid_scanner_button);
-        mDialogContainer = mView.findViewById(R.id.dialog_scrollview);
         mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
         mIpSettingsSpinner.setOnItemSelectedListener(this);
         mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings);
@@ -321,9 +320,9 @@
                     // Display IP address.
                     StaticIpConfiguration staticConfig = config.getIpConfiguration()
                             .getStaticIpConfiguration();
-                    if (staticConfig != null && staticConfig.ipAddress != null) {
+                    if (staticConfig != null && staticConfig.getIpAddress() != null) {
                         addRow(group, R.string.wifi_ip_address,
-                                staticConfig.ipAddress.getAddress().getHostAddress());
+                                staticConfig.getIpAddress().getAddress().getHostAddress());
                     }
                 } else {
                     mIpSettingsSpinner.setSelection(DHCP);
@@ -535,8 +534,9 @@
         } else {
             enabled = ipAndProxyFieldsAreValid();
         }
-        if ((mAccessPointSecurity == AccessPoint.SECURITY_EAP ||
-                mAccessPointSecurity == AccessPoint.SECURITY_EAP_SUITE_B)
+        if ((mAccessPointSecurity == AccessPoint.SECURITY_EAP
+                || mAccessPointSecurity == AccessPoint.SECURITY_EAP_WPA3_ENTERPRISE
+                || mAccessPointSecurity == AccessPoint.SECURITY_EAP_SUITE_B)
                 && mEapCaCertSpinner != null
                 && mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
             String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
@@ -552,8 +552,9 @@
                 enabled = false;
             }
         }
-        if ((mAccessPointSecurity == AccessPoint.SECURITY_EAP ||
-                mAccessPointSecurity == AccessPoint.SECURITY_EAP_SUITE_B)
+        if ((mAccessPointSecurity == AccessPoint.SECURITY_EAP
+                || mAccessPointSecurity == AccessPoint.SECURITY_EAP_WPA3_ENTERPRISE
+                || mAccessPointSecurity == AccessPoint.SECURITY_EAP_SUITE_B)
                 && mEapUserCertSpinner != null
                 && mView.findViewById(R.id.l_user_cert).getVisibility() != View.GONE
                 && mEapUserCertSpinner.getSelectedItem().equals(mUnspecifiedCertString)) {
@@ -650,10 +651,13 @@
                 break;
 
             case AccessPoint.SECURITY_EAP:
+            case AccessPoint.SECURITY_EAP_WPA3_ENTERPRISE:
             case AccessPoint.SECURITY_EAP_SUITE_B:
                 if (mAccessPointSecurity == AccessPoint.SECURITY_EAP_SUITE_B) {
                     // allowedSuiteBCiphers will be set according to certificate type
                     config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);
+                } else if (mAccessPointSecurity == AccessPoint.SECURITY_EAP_WPA3_ENTERPRISE) {
+                    config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE);
                 } else {
                     config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
                 }
@@ -808,9 +812,12 @@
                     .get(mEapSimSpinner.getSelectedItemPosition()).getCarrierId();
         }
 
-        config.setIpConfiguration(
-                new IpConfiguration(mIpAssignment, mProxySettings,
-                                    mStaticIpConfiguration, mHttpProxy));
+        final IpConfiguration ipConfig = new IpConfiguration();
+        ipConfig.setIpAssignment(mIpAssignment);
+        ipConfig.setProxySettings(mProxySettings);
+        ipConfig.setStaticIpConfiguration(mStaticIpConfiguration);
+        ipConfig.setHttpProxy(mHttpProxy);
+        config.setIpConfiguration(ipConfig);
         if (mMeteredSettingsSpinner != null) {
             config.meteredOverride = mMeteredSettingsSpinner.getSelectedItemPosition();
         }
@@ -857,7 +864,8 @@
                 result = R.string.proxy_error_invalid_port;
             }
             if (result == 0) {
-                mHttpProxy = new ProxyInfo(host, port, exclusionList);
+                mHttpProxy = ProxyInfo.buildDirectProxy(
+                        host, port, Arrays.asList(exclusionList.split(",")));
             } else {
                 return false;
             }
@@ -871,14 +879,14 @@
             if (uri == null) {
                 return false;
             }
-            mHttpProxy = new ProxyInfo(uri);
+            mHttpProxy = ProxyInfo.buildPacProxy(uri);
         }
         return true;
     }
 
     private Inet4Address getIPv4Address(String text) {
         try {
-            return (Inet4Address) NetworkUtils.numericToInetAddress(text);
+            return (Inet4Address) InetAddresses.parseNumericAddress(text);
         } catch (IllegalArgumentException | ClassCastException e) {
             return null;
         }
@@ -894,67 +902,81 @@
         if (inetAddr == null || inetAddr.equals(Inet4Address.ANY)) {
             return R.string.wifi_ip_settings_invalid_ip_address;
         }
-
-        int networkPrefixLength = -1;
+        // Copy all fields into the builder first and set desired value later with builder.
+        final StaticIpConfiguration.Builder staticIPBuilder = new StaticIpConfiguration.Builder()
+                .setDnsServers(staticIpConfiguration.getDnsServers())
+                .setDomains(staticIpConfiguration.getDomains())
+                .setGateway(staticIpConfiguration.getGateway())
+                .setIpAddress(staticIpConfiguration.getIpAddress());
         try {
-            networkPrefixLength = Integer.parseInt(mNetworkPrefixLengthView.getText().toString());
-            if (networkPrefixLength < 0 || networkPrefixLength > 32) {
-                return R.string.wifi_ip_settings_invalid_network_prefix_length;
-            }
-            staticIpConfiguration.ipAddress = new LinkAddress(inetAddr, networkPrefixLength);
-        } catch (NumberFormatException e) {
-            // Set the hint as default after user types in ip address
-            mNetworkPrefixLengthView.setText(mConfigUi.getContext().getString(
-                    R.string.wifi_network_prefix_length_hint));
-        } catch (IllegalArgumentException e) {
-            return R.string.wifi_ip_settings_invalid_ip_address;
-        }
-
-        String gateway = mGatewayView.getText().toString();
-        if (TextUtils.isEmpty(gateway)) {
+            int networkPrefixLength = -1;
             try {
-                //Extract a default gateway from IP address
-                InetAddress netPart = NetworkUtils.getNetworkPart(inetAddr, networkPrefixLength);
-                byte[] addr = netPart.getAddress();
-                addr[addr.length - 1] = 1;
-                mGatewayView.setText(InetAddress.getByAddress(addr).getHostAddress());
-            } catch (RuntimeException ee) {
-            } catch (java.net.UnknownHostException u) {
+                networkPrefixLength = Integer.parseInt(
+                        mNetworkPrefixLengthView.getText().toString());
+                if (networkPrefixLength < 0 || networkPrefixLength > 32) {
+                    return R.string.wifi_ip_settings_invalid_network_prefix_length;
+                }
+                staticIPBuilder.setIpAddress(new LinkAddress(inetAddr, networkPrefixLength));
+            } catch (NumberFormatException e) {
+                // Set the hint as default after user types in ip address
+                mNetworkPrefixLengthView.setText(mConfigUi.getContext().getString(
+                        R.string.wifi_network_prefix_length_hint));
+            } catch (IllegalArgumentException e) {
+                return R.string.wifi_ip_settings_invalid_ip_address;
             }
-        } else {
-            InetAddress gatewayAddr = getIPv4Address(gateway);
-            if (gatewayAddr == null) {
-                return R.string.wifi_ip_settings_invalid_gateway;
-            }
-            if (gatewayAddr.isMulticastAddress()) {
-                return R.string.wifi_ip_settings_invalid_gateway;
-            }
-            staticIpConfiguration.gateway = gatewayAddr;
-        }
 
-        String dns = mDns1View.getText().toString();
-        InetAddress dnsAddr = null;
-
-        if (TextUtils.isEmpty(dns)) {
-            //If everything else is valid, provide hint as a default option
-            mDns1View.setText(mConfigUi.getContext().getString(R.string.wifi_dns1_hint));
-        } else {
-            dnsAddr = getIPv4Address(dns);
-            if (dnsAddr == null) {
-                return R.string.wifi_ip_settings_invalid_dns;
+            String gateway = mGatewayView.getText().toString();
+            if (TextUtils.isEmpty(gateway)) {
+                try {
+                    //Extract a default gateway from IP address
+                    InetAddress netPart = NetUtils.getNetworkPart(inetAddr, networkPrefixLength);
+                    byte[] addr = netPart.getAddress();
+                    addr[addr.length - 1] = 1;
+                    mGatewayView.setText(InetAddress.getByAddress(addr).getHostAddress());
+                } catch (RuntimeException ee) {
+                } catch (java.net.UnknownHostException u) {
+                }
+            } else {
+                InetAddress gatewayAddr = getIPv4Address(gateway);
+                if (gatewayAddr == null) {
+                    return R.string.wifi_ip_settings_invalid_gateway;
+                }
+                if (gatewayAddr.isMulticastAddress()) {
+                    return R.string.wifi_ip_settings_invalid_gateway;
+                }
+                staticIPBuilder.setGateway(gatewayAddr);
             }
-            staticIpConfiguration.dnsServers.add(dnsAddr);
-        }
 
-        if (mDns2View.length() > 0) {
-            dns = mDns2View.getText().toString();
-            dnsAddr = getIPv4Address(dns);
-            if (dnsAddr == null) {
-                return R.string.wifi_ip_settings_invalid_dns;
+            String dns = mDns1View.getText().toString();
+            InetAddress dnsAddr = null;
+            final ArrayList<InetAddress> dnsServers = new ArrayList<>();
+
+            if (TextUtils.isEmpty(dns)) {
+                //If everything else is valid, provide hint as a default option
+                mDns1View.setText(mConfigUi.getContext().getString(R.string.wifi_dns1_hint));
+            } else {
+                dnsAddr = getIPv4Address(dns);
+                if (dnsAddr == null) {
+                    return R.string.wifi_ip_settings_invalid_dns;
+                }
+                dnsServers.add(dnsAddr);
             }
-            staticIpConfiguration.dnsServers.add(dnsAddr);
+
+            if (mDns2View.length() > 0) {
+                dns = mDns2View.getText().toString();
+                dnsAddr = getIPv4Address(dns);
+                if (dnsAddr == null) {
+                    return R.string.wifi_ip_settings_invalid_dns;
+                }
+                dnsServers.add(dnsAddr);
+            }
+            staticIPBuilder.setDnsServers(dnsServers);
+            return 0;
+        } finally {
+            // Caller of this method may rely on staticIpConfiguration, so build the final result
+            // at the end of the method.
+            staticIpConfiguration = staticIPBuilder.build();
         }
-        return 0;
     }
 
     private void showSecurityFields(boolean refreshEapMethods, boolean refreshCertificates) {
@@ -1030,15 +1052,17 @@
         if (refreshCertificates) {
             loadSims();
 
+            final AndroidKeystoreAliasLoader androidKeystoreAliasLoader =
+                    getAndroidKeystoreAliasLoader();
             loadCertificates(
                     mEapCaCertSpinner,
-                    Credentials.CA_CERTIFICATE,
+                    androidKeystoreAliasLoader.getCaCertAliases(),
                     null /* noCertificateString */,
                     false /* showMultipleCerts */,
                     true /* showUsePreinstalledCertOption */);
             loadCertificates(
                     mEapUserCertSpinner,
-                    Credentials.USER_PRIVATE_KEY,
+                    androidKeystoreAliasLoader.getKeyCertAliases(),
                     mDoNotProvideEapUserCertString,
                     false /* showMultipleCerts */,
                     false /* showUsePreinstalledCertOption */);
@@ -1121,10 +1145,13 @@
                 } else if (caCerts.length == 1) {
                     setSelection(mEapCaCertSpinner, caCerts[0]);
                 } else {
+                    final AndroidKeystoreAliasLoader androidKeystoreAliasLoader =
+                            getAndroidKeystoreAliasLoader();
+
                     // Reload the cert spinner with an extra "multiple certificates added" item.
                     loadCertificates(
                             mEapCaCertSpinner,
-                            Credentials.CA_CERTIFICATE,
+                            androidKeystoreAliasLoader.getCaCertAliases(),
                             null /* noCertificateString */,
                             true /* showMultipleCerts */,
                             true /* showUsePreinstalledCertOption */);
@@ -1358,18 +1385,18 @@
                 StaticIpConfiguration staticConfig = config.getIpConfiguration()
                         .getStaticIpConfiguration();
                 if (staticConfig != null) {
-                    if (staticConfig.ipAddress != null) {
+                    if (staticConfig.getIpAddress() != null) {
                         mIpAddressView.setText(
-                                staticConfig.ipAddress.getAddress().getHostAddress());
-                        mNetworkPrefixLengthView.setText(Integer.toString(staticConfig.ipAddress
-                                .getPrefixLength()));
+                                staticConfig.getIpAddress().getAddress().getHostAddress());
+                        mNetworkPrefixLengthView.setText(Integer.toString(
+                                staticConfig.getIpAddress().getPrefixLength()));
                     }
 
-                    if (staticConfig.gateway != null) {
-                        mGatewayView.setText(staticConfig.gateway.getHostAddress());
+                    if (staticConfig.getGateway() != null) {
+                        mGatewayView.setText(staticConfig.getGateway().getHostAddress());
                     }
 
-                    Iterator<InetAddress> dnsIterator = staticConfig.dnsServers.iterator();
+                    Iterator<InetAddress> dnsIterator = staticConfig.getDnsServers().iterator();
                     if (dnsIterator.hasNext()) {
                         mDns1View.setText(dnsIterator.next().getHostAddress());
                     }
@@ -1443,8 +1470,8 @@
     }
 
     @VisibleForTesting
-    KeyStore getKeyStore() {
-        return KeyStore.getInstance();
+    AndroidKeystoreAliasLoader getAndroidKeystoreAliasLoader() {
+        return new AndroidKeystoreAliasLoader(KeyProperties.NAMESPACE_WIFI);
     }
 
     @VisibleForTesting
@@ -1488,7 +1515,7 @@
     @VisibleForTesting
     void loadCertificates(
             Spinner spinner,
-            String prefix,
+            Collection<String> choices,
             String noCertificateString,
             boolean showMultipleCerts,
             boolean showUsePreinstalledCertOption) {
@@ -1503,14 +1530,8 @@
             certs.add(mUseSystemCertsString);
         }
 
-        String[] certificateNames = null;
-        try {
-            certificateNames = getKeyStore().list(prefix, android.os.Process.WIFI_UID);
-        } catch (Exception e) {
-            Log.e(TAG, "can't get the certificate list from KeyStore");
-        }
-        if (certificateNames != null && certificateNames.length != 0) {
-            certs.addAll(Arrays.stream(certificateNames)
+        if (choices != null && choices.size() != 0) {
+            certs.addAll(choices.stream()
                     .filter(certificateName -> {
                         for (String undesired : UNDESIRED_CERTIFICATES) {
                             if (certificateName.startsWith(undesired)) {
@@ -1693,9 +1714,14 @@
         if (mWifiManager.isWpa3SaeSupported()) {
             spinnerAdapter.add(mContext.getString(R.string.wifi_security_sae));
             mSecurityInPosition[idx++] = AccessPoint.SECURITY_SAE;
+            spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa_wpa2));
+            mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP;
+            spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa3));
+            mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP_WPA3_ENTERPRISE;
+        } else {
+            spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap));
+            mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP;
         }
-        spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap));
-        mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP;
         if (mWifiManager.isWpa3SuiteBSupported()) {
             spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_suiteb));
             mSecurityInPosition[idx++] = AccessPoint.SECURITY_EAP_SUITE_B;
diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
index 49f1b21..9f3b1a7 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -18,11 +18,11 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.net.InetAddresses;
 import android.net.IpConfiguration;
 import android.net.IpConfiguration.IpAssignment;
 import android.net.IpConfiguration.ProxySettings;
 import android.net.LinkAddress;
-import android.net.NetworkUtils;
 import android.net.ProxyInfo;
 import android.net.StaticIpConfiguration;
 import android.net.Uri;
@@ -32,8 +32,7 @@
 import android.net.wifi.WifiEnterpriseConfig.Phase2;
 import android.net.wifi.WifiManager;
 import android.os.IBinder;
-import android.security.Credentials;
-import android.security.KeyStore;
+import android.security.keystore.KeyProperties;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.text.Editable;
@@ -59,16 +58,17 @@
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
 import android.widget.ImageButton;
-import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
 import androidx.annotation.VisibleForTesting;
 
+import com.android.net.module.util.NetUtils;
 import com.android.net.module.util.ProxyUtils;
 import com.android.settings.ProxySelector;
 import com.android.settings.R;
 import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.utils.AndroidKeystoreAliasLoader;
 import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.Utils;
@@ -80,6 +80,7 @@
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -159,7 +160,6 @@
     private String mUseSystemCertsString;
     private String mDoNotProvideEapUserCertString;
 
-    private ScrollView mDialogContainer;
     private Spinner mSecuritySpinner;
     @VisibleForTesting Spinner mEapMethodSpinner;
     private int mLastShownEapMethod;
@@ -260,7 +260,6 @@
             mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
 
         mSsidScanButton = (ImageButton) mView.findViewById(R.id.ssid_scanner_button);
-        mDialogContainer = mView.findViewById(R.id.dialog_scrollview);
         mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
         mIpSettingsSpinner.setOnItemSelectedListener(this);
         mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings);
@@ -307,9 +306,9 @@
                     // Display IP address.
                     StaticIpConfiguration staticConfig = config.getIpConfiguration()
                             .getStaticIpConfiguration();
-                    if (staticConfig != null && staticConfig.ipAddress != null) {
+                    if (staticConfig != null && staticConfig.getIpAddress() != null) {
                         addRow(group, R.string.wifi_ip_address,
-                                staticConfig.ipAddress.getAddress().getHostAddress());
+                                staticConfig.getIpAddress().getAddress().getHostAddress());
                     }
                 } else {
                     mIpSettingsSpinner.setSelection(DHCP);
@@ -499,6 +498,7 @@
             enabled = ipAndProxyFieldsAreValid();
         }
         if ((mWifiEntrySecurity == WifiEntry.SECURITY_EAP
+                || mWifiEntrySecurity == WifiEntry.SECURITY_EAP_WPA3_ENTERPRISE
                 || mWifiEntrySecurity == WifiEntry.SECURITY_EAP_SUITE_B)
                 && mEapCaCertSpinner != null
                 && mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
@@ -516,6 +516,7 @@
             }
         }
         if ((mWifiEntrySecurity == WifiEntry.SECURITY_EAP
+                || mWifiEntrySecurity == WifiEntry.SECURITY_EAP_WPA3_ENTERPRISE
                 || mWifiEntrySecurity == WifiEntry.SECURITY_EAP_SUITE_B)
                 && mEapUserCertSpinner != null
                 && mView.findViewById(R.id.l_user_cert).getVisibility() != View.GONE
@@ -614,10 +615,13 @@
                 break;
 
             case WifiEntry.SECURITY_EAP:
+            case WifiEntry.SECURITY_EAP_WPA3_ENTERPRISE:
             case WifiEntry.SECURITY_EAP_SUITE_B:
                 if (mWifiEntrySecurity == WifiEntry.SECURITY_EAP_SUITE_B) {
                     // allowedSuiteBCiphers will be set according to certificate type
                     config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);
+                } else if (mWifiEntrySecurity == WifiEntry.SECURITY_EAP_WPA3_ENTERPRISE) {
+                    config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE);
                 } else {
                     config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
                 }
@@ -771,9 +775,12 @@
                 return null;
         }
 
-        config.setIpConfiguration(
-                new IpConfiguration(mIpAssignment, mProxySettings,
-                                    mStaticIpConfiguration, mHttpProxy));
+        final IpConfiguration ipConfig = new IpConfiguration();
+        ipConfig.setIpAssignment(mIpAssignment);
+        ipConfig.setProxySettings(mProxySettings);
+        ipConfig.setStaticIpConfiguration(mStaticIpConfiguration);
+        ipConfig.setHttpProxy(mHttpProxy);
+        config.setIpConfiguration(ipConfig);
         if (mMeteredSettingsSpinner != null) {
             config.meteredOverride = mMeteredSettingsSpinner.getSelectedItemPosition();
         }
@@ -819,7 +826,8 @@
                 result = R.string.proxy_error_invalid_port;
             }
             if (result == 0) {
-                mHttpProxy = new ProxyInfo(host, port, exclusionList);
+                mHttpProxy = ProxyInfo.buildDirectProxy(
+                        host, port, Arrays.asList(exclusionList.split(",")));
             } else {
                 return false;
             }
@@ -833,14 +841,14 @@
             if (uri == null) {
                 return false;
             }
-            mHttpProxy = new ProxyInfo(uri);
+            mHttpProxy = ProxyInfo.buildPacProxy(uri);
         }
         return true;
     }
 
     private Inet4Address getIPv4Address(String text) {
         try {
-            return (Inet4Address) NetworkUtils.numericToInetAddress(text);
+            return (Inet4Address) InetAddresses.parseNumericAddress(text);
         } catch (IllegalArgumentException | ClassCastException e) {
             return null;
         }
@@ -857,66 +865,83 @@
             return R.string.wifi_ip_settings_invalid_ip_address;
         }
 
-        int networkPrefixLength = -1;
+        // Copy all fields into the builder first and set desired value later with builder.
+        final StaticIpConfiguration.Builder staticIPBuilder = new StaticIpConfiguration.Builder()
+                .setDnsServers(staticIpConfiguration.getDnsServers())
+                .setDomains(staticIpConfiguration.getDomains())
+                .setGateway(staticIpConfiguration.getGateway())
+                .setIpAddress(staticIpConfiguration.getIpAddress());
         try {
-            networkPrefixLength = Integer.parseInt(mNetworkPrefixLengthView.getText().toString());
-            if (networkPrefixLength < 0 || networkPrefixLength > 32) {
-                return R.string.wifi_ip_settings_invalid_network_prefix_length;
-            }
-            staticIpConfiguration.ipAddress = new LinkAddress(inetAddr, networkPrefixLength);
-        } catch (NumberFormatException e) {
-            // Set the hint as default after user types in ip address
-            mNetworkPrefixLengthView.setText(mConfigUi.getContext().getString(
-                    R.string.wifi_network_prefix_length_hint));
-        } catch (IllegalArgumentException e) {
-            return R.string.wifi_ip_settings_invalid_ip_address;
-        }
-
-        String gateway = mGatewayView.getText().toString();
-        if (TextUtils.isEmpty(gateway)) {
+            int networkPrefixLength = -1;
             try {
-                //Extract a default gateway from IP address
-                InetAddress netPart = NetworkUtils.getNetworkPart(inetAddr, networkPrefixLength);
-                byte[] addr = netPart.getAddress();
-                addr[addr.length - 1] = 1;
-                mGatewayView.setText(InetAddress.getByAddress(addr).getHostAddress());
-            } catch (RuntimeException ee) {
-            } catch (java.net.UnknownHostException u) {
+                networkPrefixLength =
+                        Integer.parseInt(mNetworkPrefixLengthView.getText().toString());
+                if (networkPrefixLength < 0 || networkPrefixLength > 32) {
+                    return R.string.wifi_ip_settings_invalid_network_prefix_length;
+                }
+                staticIPBuilder.setIpAddress(new LinkAddress(inetAddr, networkPrefixLength));
+            } catch (NumberFormatException e) {
+                // Set the hint as default after user types in ip address
+                mNetworkPrefixLengthView.setText(mConfigUi.getContext().getString(
+                        R.string.wifi_network_prefix_length_hint));
+            } catch (IllegalArgumentException e) {
+                return R.string.wifi_ip_settings_invalid_ip_address;
             }
-        } else {
-            InetAddress gatewayAddr = getIPv4Address(gateway);
-            if (gatewayAddr == null) {
-                return R.string.wifi_ip_settings_invalid_gateway;
-            }
-            if (gatewayAddr.isMulticastAddress()) {
-                return R.string.wifi_ip_settings_invalid_gateway;
-            }
-            staticIpConfiguration.gateway = gatewayAddr;
-        }
 
-        String dns = mDns1View.getText().toString();
-        InetAddress dnsAddr = null;
-
-        if (TextUtils.isEmpty(dns)) {
-            //If everything else is valid, provide hint as a default option
-            mDns1View.setText(mConfigUi.getContext().getString(R.string.wifi_dns1_hint));
-        } else {
-            dnsAddr = getIPv4Address(dns);
-            if (dnsAddr == null) {
-                return R.string.wifi_ip_settings_invalid_dns;
+            String gateway = mGatewayView.getText().toString();
+            if (TextUtils.isEmpty(gateway)) {
+                try {
+                    //Extract a default gateway from IP address
+                    InetAddress netPart = NetUtils.getNetworkPart(inetAddr, networkPrefixLength);
+                    byte[] addr = netPart.getAddress();
+                    addr[addr.length - 1] = 1;
+                    mGatewayView.setText(InetAddress.getByAddress(addr).getHostAddress());
+                } catch (RuntimeException ee) {
+                } catch (java.net.UnknownHostException u) {
+                }
+            } else {
+                InetAddress gatewayAddr = getIPv4Address(gateway);
+                if (gatewayAddr == null) {
+                    return R.string.wifi_ip_settings_invalid_gateway;
+                }
+                if (gatewayAddr.isMulticastAddress()) {
+                    return R.string.wifi_ip_settings_invalid_gateway;
+                }
+                staticIPBuilder.setGateway(gatewayAddr);
             }
-            staticIpConfiguration.dnsServers.add(dnsAddr);
-        }
 
-        if (mDns2View.length() > 0) {
-            dns = mDns2View.getText().toString();
-            dnsAddr = getIPv4Address(dns);
-            if (dnsAddr == null) {
-                return R.string.wifi_ip_settings_invalid_dns;
+            String dns = mDns1View.getText().toString();
+            InetAddress dnsAddr = null;
+            final ArrayList<InetAddress> dnsServers = new ArrayList<>();
+
+            if (TextUtils.isEmpty(dns)) {
+                //If everything else is valid, provide hint as a default option
+                mDns1View.setText(mConfigUi.getContext().getString(R.string.wifi_dns1_hint));
+            } else {
+                dnsAddr = getIPv4Address(dns);
+                if (dnsAddr == null) {
+                    return R.string.wifi_ip_settings_invalid_dns;
+                }
+                dnsServers.add(dnsAddr);
+                staticIpConfiguration.getDnsServers().add(dnsAddr);
             }
-            staticIpConfiguration.dnsServers.add(dnsAddr);
+
+            if (mDns2View.length() > 0) {
+                dns = mDns2View.getText().toString();
+                dnsAddr = getIPv4Address(dns);
+                if (dnsAddr == null) {
+                    return R.string.wifi_ip_settings_invalid_dns;
+                }
+                dnsServers.add(dnsAddr);
+                staticIpConfiguration.getDnsServers().add(dnsAddr);
+            }
+            staticIPBuilder.setDnsServers(dnsServers);
+            return 0;
+        } finally {
+            // Caller of this method may rely on staticIpConfiguration, so build the final result
+            // at the end of the method.
+            staticIpConfiguration = staticIPBuilder.build();
         }
-        return 0;
     }
 
     private void showSecurityFields(boolean refreshEapMethods, boolean refreshCertificates) {
@@ -941,6 +966,7 @@
         }
 
         if (mWifiEntrySecurity != WifiEntry.SECURITY_EAP
+                && mWifiEntrySecurity != WifiEntry.SECURITY_EAP_WPA3_ENTERPRISE
                 && mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) {
             mView.findViewById(R.id.eap).setVisibility(View.GONE);
             return;
@@ -993,15 +1019,17 @@
         if (refreshCertificates) {
             loadSims();
 
+            final AndroidKeystoreAliasLoader androidKeystoreAliasLoader =
+                    getAndroidKeystoreAliasLoader();
             loadCertificates(
                     mEapCaCertSpinner,
-                    Credentials.CA_CERTIFICATE,
+                    androidKeystoreAliasLoader.getCaCertAliases(),
                     null /* noCertificateString */,
                     false /* showMultipleCerts */,
                     true /* showUsePreinstalledCertOption */);
             loadCertificates(
                     mEapUserCertSpinner,
-                    Credentials.USER_PRIVATE_KEY,
+                    androidKeystoreAliasLoader.getKeyCertAliases(),
                     mDoNotProvideEapUserCertString,
                     false /* showMultipleCerts */,
                     false /* showUsePreinstalledCertOption */);
@@ -1086,9 +1114,11 @@
                     setSelection(mEapCaCertSpinner, caCerts[0]);
                 } else {
                     // Reload the cert spinner with an extra "multiple certificates added" item.
+                    final AndroidKeystoreAliasLoader androidKeystoreAliasLoader =
+                            getAndroidKeystoreAliasLoader();
                     loadCertificates(
                             mEapCaCertSpinner,
-                            Credentials.CA_CERTIFICATE,
+                            androidKeystoreAliasLoader.getCaCertAliases(),
                             null /* noCertificateString */,
                             true /* showMultipleCerts */,
                             true /* showUsePreinstalledCertOption */);
@@ -1322,18 +1352,18 @@
                 StaticIpConfiguration staticConfig = config.getIpConfiguration()
                         .getStaticIpConfiguration();
                 if (staticConfig != null) {
-                    if (staticConfig.ipAddress != null) {
+                    if (staticConfig.getIpAddress() != null) {
                         mIpAddressView.setText(
-                                staticConfig.ipAddress.getAddress().getHostAddress());
-                        mNetworkPrefixLengthView.setText(Integer.toString(staticConfig.ipAddress
-                                .getPrefixLength()));
+                                staticConfig.getIpAddress().getAddress().getHostAddress());
+                        mNetworkPrefixLengthView.setText(Integer.toString(
+                                staticConfig.getIpAddress().getPrefixLength()));
                     }
 
-                    if (staticConfig.gateway != null) {
-                        mGatewayView.setText(staticConfig.gateway.getHostAddress());
+                    if (staticConfig.getGateway() != null) {
+                        mGatewayView.setText(staticConfig.getGateway().getHostAddress());
                     }
 
-                    Iterator<InetAddress> dnsIterator = staticConfig.dnsServers.iterator();
+                    Iterator<InetAddress> dnsIterator = staticConfig.getDnsServers().iterator();
                     if (dnsIterator.hasNext()) {
                         mDns1View.setText(dnsIterator.next().getHostAddress());
                     }
@@ -1407,8 +1437,8 @@
     }
 
     @VisibleForTesting
-    KeyStore getKeyStore() {
-        return KeyStore.getInstance();
+    AndroidKeystoreAliasLoader getAndroidKeystoreAliasLoader() {
+        return new AndroidKeystoreAliasLoader(KeyProperties.NAMESPACE_WIFI);
     }
 
     @VisibleForTesting
@@ -1452,7 +1482,7 @@
     @VisibleForTesting
     void loadCertificates(
             Spinner spinner,
-            String prefix,
+            Collection<String> choices,
             String noCertificateString,
             boolean showMultipleCerts,
             boolean showUsePreinstalledCertOption) {
@@ -1467,14 +1497,8 @@
             certs.add(mUseSystemCertsString);
         }
 
-        String[] certificateNames = null;
-        try {
-            certificateNames = getKeyStore().list(prefix, android.os.Process.WIFI_UID);
-        } catch (Exception e) {
-            Log.e(TAG, "can't get the certificate list from KeyStore");
-        }
-        if (certificateNames != null && certificateNames.length != 0) {
-            certs.addAll(Arrays.stream(certificateNames)
+        if (choices != null && choices.size() != 0) {
+            certs.addAll(choices.stream()
                     .filter(certificateName -> {
                         for (String undesired : UNDESIRED_CERTIFICATES) {
                             if (certificateName.startsWith(undesired)) {
@@ -1661,9 +1685,14 @@
         if (mWifiManager.isWpa3SaeSupported()) {
             spinnerAdapter.add(mContext.getString(R.string.wifi_security_sae));
             mSecurityInPosition[idx++] = WifiEntry.SECURITY_SAE;
+            spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa_wpa2));
+            mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP;
+            spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_wpa3));
+            mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP_WPA3_ENTERPRISE;
+        } else {
+            spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap));
+            mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP;
         }
-        spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap));
-        mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP;
         if (mWifiManager.isWpa3SuiteBSupported()) {
             spinnerAdapter.add(mContext.getString(R.string.wifi_security_eap_suiteb));
             mSecurityInPosition[idx++] = WifiEntry.SECURITY_EAP_SUITE_B;
diff --git a/src/com/android/settings/wifi/WifiConfigInfo.java b/src/com/android/settings/wifi/WifiConfigInfo.java
index f042feb..0de3063 100644
--- a/src/com/android/settings/wifi/WifiConfigInfo.java
+++ b/src/com/android/settings/wifi/WifiConfigInfo.java
@@ -26,7 +26,6 @@
 
 import java.util.List;
 
-
 /**
  * Configuration details saved by the user on the WifiSettings screen
  */
diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java
index 1c5a8ed..877933e 100644
--- a/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -21,7 +21,6 @@
 import android.net.NetworkInfo;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
-import android.net.wifi.WifiManager.ActionListener;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
diff --git a/src/com/android/settings/wifi/WifiInfo.java b/src/com/android/settings/wifi/WifiInfo.java
index a131f18..0d6d63d 100644
--- a/src/com/android/settings/wifi/WifiInfo.java
+++ b/src/com/android/settings/wifi/WifiInfo.java
@@ -22,7 +22,6 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
-
 /**
  * Wifi information menu item on the diagnostic screen
  */
diff --git a/src/com/android/settings/wifi/WifiNoInternetDialog.java b/src/com/android/settings/wifi/WifiNoInternetDialog.java
index 9d90b6a..57e42f8 100644
--- a/src/com/android/settings/wifi/WifiNoInternetDialog.java
+++ b/src/com/android/settings/wifi/WifiNoInternetDialog.java
@@ -70,22 +70,17 @@
         super.onCreate(savedInstanceState);
 
         final Intent intent = getIntent();
-        if (intent == null || !isKnownAction(intent) || !"netId".equals(intent.getScheme())) {
+        if (intent == null || !isKnownAction(intent)) {
             Log.e(TAG, "Unexpected intent " + intent + ", exiting");
             finish();
             return;
         }
 
         mAction = intent.getAction();
-
-        try {
-            mNetwork = new Network(Integer.parseInt(intent.getData().getSchemeSpecificPart()));
-        } catch (NullPointerException|NumberFormatException e) {
-            mNetwork = null;
-        }
+        mNetwork = intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK);
 
         if (mNetwork == null) {
-            Log.e(TAG, "Can't determine network from '" + intent.getData() + "' , exiting");
+            Log.e(TAG, "Can't determine network from intent extra, exiting");
             finish();
             return;
         }
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 34067e9..5545de6 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -63,7 +63,7 @@
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.datausage.DataUsagePreference;
 import com.android.settings.datausage.DataUsageUtils;
-import com.android.settings.location.ScanningSettings;
+import com.android.settings.location.LocationServices;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.MainSwitchBarController;
@@ -921,8 +921,8 @@
                 : getText(R.string.wifi_scan_notify_text_scanning_off);
         final LinkifyUtils.OnClickListener clickListener =
                 () -> new SubSettingLauncher(getContext())
-                        .setDestination(ScanningSettings.class.getName())
-                        .setTitleRes(R.string.location_scanning_screen_title)
+                        .setDestination(LocationServices.class.getName())
+                        .setTitleRes(R.string.location_services_screen_title)
                         .setSourceMetricsCategory(getMetricsCategory())
                         .launch();
         mStatusMessagePreference.setText(title, description, clickListener);
diff --git a/src/com/android/settings/wifi/WifiStatusTest.java b/src/com/android/settings/wifi/WifiStatusTest.java
index ca7f5f7..249cd71 100644
--- a/src/com/android/settings/wifi/WifiStatusTest.java
+++ b/src/com/android/settings/wifi/WifiStatusTest.java
@@ -45,7 +45,6 @@
 import java.net.UnknownHostException;
 import java.util.List;
 
-
 /**
  * Show the current status details of Wifi related fields
  */
diff --git a/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreference.java b/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreference.java
index a44fcbe..b91b39d 100644
--- a/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreference.java
+++ b/src/com/android/settings/wifi/calling/ListWithEntrySummaryPreference.java
@@ -30,7 +30,9 @@
 import android.widget.ListAdapter;
 import android.widget.RadioButton;
 import android.widget.TextView;
+
 import androidx.appcompat.app.AlertDialog.Builder;
+
 import com.android.settings.CustomListPreference;
 import com.android.settings.R;
 
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
index 735fecc..de64b91 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
@@ -29,6 +29,7 @@
 import android.telephony.CarrierConfigManager;
 import android.telephony.PhoneStateListener;
 import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
 import android.telephony.ims.ImsManager;
 import android.telephony.ims.ImsMmTelManager;
@@ -55,14 +56,15 @@
 import com.android.settings.Utils;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.network.ims.WifiCallingQueryImsState;
-import com.android.settings.widget.SwitchBar;
+import com.android.settings.widget.SettingsMainSwitchBar;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
 
 /**
  * This is the inner class of {@link WifiCallingSettings} fragment.
  * The preference screen lets you enable/disable Wi-Fi Calling and change Wi-Fi Calling mode.
  */
 public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
-        implements SwitchBar.OnSwitchChangeListener,
+        implements OnMainSwitchChangeListener,
         Preference.OnPreferenceChangeListener {
     private static final String TAG = "WifiCallingForSub";
 
@@ -85,8 +87,7 @@
     public static final int LAUCH_APP_UPDATE = 1;
 
     //UI objects
-    private SwitchBar mSwitchBar;
-    private Switch mSwitch;
+    private SettingsMainSwitchBar mSwitchBar;
     private ListWithEntrySummaryPreference mButtonWfcMode;
     private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
     private Preference mUpdateAddress;
@@ -102,7 +103,10 @@
     private ProvisioningManager mProvisioningManager;
     private TelephonyManager mTelephonyManager;
 
-    private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
+    private final PhoneTelephonyCallback mTelephonyCallback = new PhoneTelephonyCallback();
+
+    private class PhoneTelephonyCallback extends TelephonyCallback implements
+            TelephonyCallback.CallStateListener {
         /*
          * Enable/disable controls when in/out of a call and depending on
          * TTY mode and TTY support over VoLTE.
@@ -110,7 +114,7 @@
          * java.lang.String)
          */
         @Override
-        public void onCallStateChanged(int state, String incomingNumber) {
+        public void onCallStateChanged(int state) {
             final SettingsActivity activity = (SettingsActivity) getActivity();
             final boolean isNonTtyOrTtyOnVolteEnabled =
                     queryImsState(WifiCallingSettingsForSub.this.mSubId).isAllowUserControl();
@@ -149,7 +153,7 @@
                         && isCallStateIdle);
             }
         }
-    };
+    }
 
     /*
      * Launch carrier emergency address managemnent activity
@@ -190,7 +194,6 @@
 
         mSwitchBar = getView().findViewById(R.id.switch_bar);
         mSwitchBar.show();
-        mSwitch = mSwitchBar.getSwitch();
     }
 
     @Override
@@ -296,7 +299,7 @@
         mButtonWfcMode = findPreference(BUTTON_WFC_MODE);
         mButtonWfcMode.setOnPreferenceChangeListener(this);
 
-        mButtonWfcRoamingMode =  findPreference(BUTTON_WFC_ROAMING_MODE);
+        mButtonWfcRoamingMode = findPreference(BUTTON_WFC_ROAMING_MODE);
         mButtonWfcRoamingMode.setOnPreferenceChangeListener(this);
 
         mUpdateAddress = findPreference(PREFERENCE_EMERGENCY_ADDRESS);
@@ -399,11 +402,11 @@
                     res.getStringArray(R.array.wifi_calling_mode_summaries_without_wifi_only));
         }
 
-        // NOTE: Buttons will be enabled/disabled in mPhoneStateListener
+        // NOTE: Buttons will be enabled/disabled in mTelephonyCallback
         final WifiCallingQueryImsState queryIms = queryImsState(mSubId);
         final boolean wfcEnabled = queryIms.isEnabledByUser()
                 && queryIms.isAllowUserControl();
-        mSwitch.setChecked(wfcEnabled);
+        mSwitchBar.setChecked(wfcEnabled);
         final int wfcMode = mImsMmTelManager.getVoWiFiModeSetting();
         final int wfcRoamingMode = mImsMmTelManager.getVoWiFiRoamingModeSetting();
         mButtonWfcMode.setValue(Integer.toString(wfcMode));
@@ -417,16 +420,16 @@
 
         updateBody();
 
+        final Context context = getActivity();
         if (queryImsState(mSubId).isWifiCallingSupported()) {
-            getTelephonyManagerForSub(mSubId).listen(mPhoneStateListener,
-                    PhoneStateListener.LISTEN_CALL_STATE);
+            getTelephonyManagerForSub(mSubId).registerTelephonyCallback(
+                    context.getMainExecutor(), mTelephonyCallback);
 
             mSwitchBar.addOnSwitchChangeListener(this);
 
             mValidListener = true;
         }
 
-        final Context context = getActivity();
         context.registerReceiver(mIntentReceiver, mIntentFilter);
 
         final Intent intent = getActivity().getIntent();
@@ -447,8 +450,7 @@
         if (mValidListener) {
             mValidListener = false;
 
-            getTelephonyManagerForSub(mSubId).listen(mPhoneStateListener,
-                    PhoneStateListener.LISTEN_NONE);
+            getTelephonyManagerForSub(mSubId).unregisterTelephonyCallback(mTelephonyCallback);
 
             mSwitchBar.removeOnSwitchChangeListener(this);
         }
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
index 4467d66..3636341 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
@@ -43,7 +43,6 @@
 import androidx.slice.builders.ListBuilder.RowBuilder;
 import androidx.slice.builders.SliceAction;
 
-import com.android.ims.ImsConfig;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.network.ims.WifiCallingQueryImsState;
@@ -57,7 +56,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-
 /**
  * Helper class to control slices for wifi calling settings.
  */
diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
index c9cddcc..211ceed 100644
--- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
@@ -40,7 +40,6 @@
 import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
 import android.net.NetworkRequest;
-import android.net.NetworkUtils;
 import android.net.RouteInfo;
 import android.net.Uri;
 import android.net.wifi.WifiConfiguration;
@@ -64,6 +63,7 @@
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceScreen;
 
+import com.android.net.module.util.Inet4AddressUtils;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.FeatureFlags;
@@ -99,7 +99,6 @@
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.ZonedDateTime;
@@ -845,7 +844,8 @@
         // Find IPv4 default gateway.
         String gateway = null;
         for (RouteInfo routeInfo : mLinkProperties.getRoutes()) {
-            if (routeInfo.isIPv4Default() && routeInfo.hasGateway()) {
+            if (routeInfo.hasGateway() && routeInfo.isDefaultRoute()
+                    && routeInfo.getDestination().getAddress() instanceof Inet4Address) {
                 gateway = routeInfo.getGateway().getHostAddress();
                 break;
             }
@@ -873,10 +873,8 @@
 
     private static String ipv4PrefixLengthToSubnetMask(int prefixLength) {
         try {
-            InetAddress all = InetAddress.getByAddress(
-                    new byte[]{(byte) 255, (byte) 255, (byte) 255, (byte) 255});
-            return NetworkUtils.getNetworkPart(all, prefixLength).getHostAddress();
-        } catch (UnknownHostException e) {
+            return Inet4AddressUtils.getPrefixMaskAsInet4Address(prefixLength).getHostAddress();
+        } catch (IllegalArgumentException e) {
             return null;
         }
     }
diff --git a/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java
index 2a93005..52645aa 100644
--- a/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiMeteredPreferenceController2.java
@@ -27,7 +27,6 @@
 
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.wifi.WifiDialog2;
-import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.wifitrackerlib.WifiEntry;
 
 /**
diff --git a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
index d6e1b60..c484922 100644
--- a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
@@ -28,7 +28,6 @@
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.wifi.WifiDialog2;
-import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.wifitrackerlib.WifiEntry;
 
 /**
diff --git a/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java b/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java
index aa73a17..ae45251 100644
--- a/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java
+++ b/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java
@@ -19,8 +19,6 @@
 import android.content.Context;
 import android.net.Uri;
 
-import com.android.settings.slices.SliceBackgroundWorker;
-
 /**
  * {@link SliceBackgroundWorker} for Wi-Fi, used by {@link ContextualWifiSlice}.
  */
diff --git a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
index 7ba0216..46da097 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
@@ -17,7 +17,7 @@
 package com.android.settings.wifi.tether;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.WifiManager;
 
 import androidx.preference.Preference;
@@ -36,7 +36,7 @@
 
     protected final WifiManager mWifiManager;
     protected final String[] mWifiRegexs;
-    protected final ConnectivityManager mCm;
+    protected final TetheringManager mTm;
     protected final OnTetherConfigUpdateListener mListener;
 
     protected Preference mPreference;
@@ -46,8 +46,8 @@
         super(context);
         mListener = listener;
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        mCm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        mWifiRegexs = mCm.getTetherableWifiRegexs();
+        mTm = (TetheringManager) context.getSystemService(Context.TETHERING_SERVICE);
+        mWifiRegexs = mTm.getTetherableWifiRegexs();
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java
new file mode 100644
index 0000000..bc87d5c
--- /dev/null
+++ b/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import android.content.Context;
+import android.net.wifi.SoftApConfiguration;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+/**
+ * This controller helps to manage the state of maximize compatibility switch preference.
+ */
+public class WifiTetherMaximizeCompatibilityPreferenceController extends
+        WifiTetherBasePreferenceController {
+
+    private static final String TAG = "WifiTetherMaximizeCompatibilityPref";
+    public static final String PREF_KEY = "wifi_tether_maximize_compatibility";
+
+    private boolean mIsChecked;
+
+    public WifiTetherMaximizeCompatibilityPreferenceController(Context context,
+            WifiTetherBasePreferenceController.OnTetherConfigUpdateListener listener) {
+        super(context, listener);
+        mIsChecked = isMaximizeCompatibilityEnabled();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREF_KEY;
+    }
+
+    @Override
+    public void updateDisplay() {
+        if (mPreference == null) {
+            return;
+        }
+        mPreference.setEnabled(is5GhzBandSupported());
+        ((SwitchPreference) mPreference).setChecked(mIsChecked);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        mIsChecked = (Boolean) newValue;
+        if (mListener != null) {
+            mListener.onTetherConfigUpdated(this);
+        }
+        return true;
+    }
+
+    private boolean is5GhzBandSupported() {
+        if (mWifiManager == null) {
+            return false;
+        }
+        if (!mWifiManager.is5GHzBandSupported() || mWifiManager.getCountryCode() == null) {
+            return false;
+        }
+        return true;
+    }
+
+    @VisibleForTesting
+    boolean isMaximizeCompatibilityEnabled() {
+        if (mWifiManager == null) {
+            return false;
+        }
+        final SoftApConfiguration config = mWifiManager.getSoftApConfiguration();
+        if (config == null) {
+            return false;
+        }
+        if (mWifiManager.isBridgedApConcurrencySupported()) {
+            final boolean isEnabled = config.isBridgedModeOpportunisticShutdownEnabled();
+            Log.d(TAG, "isBridgedModeOpportunisticShutdownEnabled:" + isEnabled);
+            return isEnabled;
+        }
+
+        // If the BridgedAp Concurrency is not supported in early Pixel devices (e.g. Pixel 2~5),
+        // show toggle on if the band includes SoftApConfiguration.BAND_5GHZ.
+        final int band = config.getBand();
+        Log.d(TAG, "getBand:" + band);
+        return (band & SoftApConfiguration.BAND_5GHZ) > 0;
+    }
+
+    /**
+     * Setup the Maximize Compatibility setting to the SoftAp Configuration
+     *
+     * @param builder The builder to build the SoftApConfiguration.
+     */
+    public void setupMaximizeCompatibility(SoftApConfiguration.Builder builder) {
+        if (builder == null) {
+            return;
+        }
+        final boolean enabled = mIsChecked;
+        if (mWifiManager.isBridgedApConcurrencySupported()) {
+            int[] bands = {
+                    SoftApConfiguration.BAND_2GHZ,
+                    SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ};
+            builder.setBands(bands);
+            Log.d(TAG, "setBridgedModeOpportunisticShutdownEnabled:" + enabled);
+            builder.setBridgedModeOpportunisticShutdownEnabled(enabled);
+        } else {
+            int band = enabled
+                    ? SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ
+                    : SoftApConfiguration.BAND_2GHZ;
+            Log.d(TAG, "setBand:" + band);
+            builder.setBand(band);
+        }
+    }
+}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
index 5049002..70b6a45 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
@@ -18,7 +18,7 @@
 
 import android.annotation.NonNull;
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiClient;
 import android.net.wifi.WifiManager;
@@ -44,7 +44,7 @@
 
     private static final String WIFI_TETHER_SETTINGS = "wifi_tether";
 
-    private final ConnectivityManager mConnectivityManager;
+    private final TetheringManager mTetheringManager;
     private final String[] mWifiRegexs;
     private final WifiManager mWifiManager;
     private final Lifecycle mLifecycle;
@@ -62,10 +62,9 @@
     WifiTetherPreferenceController(Context context, Lifecycle lifecycle,
             boolean initSoftApManager) {
         super(context);
-        mConnectivityManager =
-                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        mTetheringManager = context.getSystemService(TetheringManager.class);
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        mWifiRegexs = mConnectivityManager.getTetherableWifiRegexs();
+        mWifiRegexs = mTetheringManager.getTetherableWifiRegexs();
         mLifecycle = lifecycle;
         if (lifecycle != null) {
             lifecycle.addObserver(this);
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
index 0529b7a..e342550 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.wifi.tether;
 
-import static android.net.ConnectivityManager.ACTION_TETHER_STATE_CHANGED;
+import static android.net.TetheringManager.ACTION_TETHER_STATE_CHANGED;
 import static android.net.wifi.WifiManager.WIFI_AP_STATE_CHANGED_ACTION;
 
 import android.app.settings.SettingsEnums;
@@ -54,8 +54,7 @@
     private static final String TAG = "WifiTetherSettings";
     private static final IntentFilter TETHER_STATE_CHANGE_FILTER;
     private static final String KEY_WIFI_TETHER_SCREEN = "wifi_tether_settings_screen";
-    private static final int EXPANDED_CHILD_COUNT_WITH_SECURITY_NON = 3;
-    private static final int EXPANDED_CHILD_COUNT_DEFAULT = 4;
+    private static final int EXPANDED_CHILD_COUNT_DEFAULT = 3;
 
     @VisibleForTesting
     static final String KEY_WIFI_TETHER_NETWORK_NAME = "wifi_tether_network_name";
@@ -64,13 +63,14 @@
     @VisibleForTesting
     static final String KEY_WIFI_TETHER_AUTO_OFF = "wifi_tether_auto_turn_off";
     @VisibleForTesting
-    static final String KEY_WIFI_TETHER_NETWORK_AP_BAND = "wifi_tether_network_ap_band";
+    static final String KEY_WIFI_TETHER_MAXIMIZE_COMPATIBILITY =
+            WifiTetherMaximizeCompatibilityPreferenceController.PREF_KEY;
 
     private WifiTetherSwitchBarController mSwitchBarController;
     private WifiTetherSSIDPreferenceController mSSIDPreferenceController;
     private WifiTetherPasswordPreferenceController mPasswordPreferenceController;
-    private WifiTetherApBandPreferenceController mApBandPreferenceController;
     private WifiTetherSecurityPreferenceController mSecurityPreferenceController;
+    private WifiTetherMaximizeCompatibilityPreferenceController mMaxCompatibilityPrefController;
 
     private WifiManager mWifiManager;
     private boolean mRestartWifiApAfterConfigChange;
@@ -116,7 +116,8 @@
         mSSIDPreferenceController = use(WifiTetherSSIDPreferenceController.class);
         mSecurityPreferenceController = use(WifiTetherSecurityPreferenceController.class);
         mPasswordPreferenceController = use(WifiTetherPasswordPreferenceController.class);
-        mApBandPreferenceController = use(WifiTetherApBandPreferenceController.class);
+        mMaxCompatibilityPrefController =
+                use(WifiTetherMaximizeCompatibilityPreferenceController.class);
     }
 
     @Override
@@ -180,10 +181,9 @@
         controllers.add(new WifiTetherSSIDPreferenceController(context, listener));
         controllers.add(new WifiTetherSecurityPreferenceController(context, listener));
         controllers.add(new WifiTetherPasswordPreferenceController(context, listener));
-        controllers.add(new WifiTetherApBandPreferenceController(context, listener));
         controllers.add(
                 new WifiTetherAutoOffPreferenceController(context, KEY_WIFI_TETHER_AUTO_OFF));
-
+        controllers.add(new WifiTetherMaximizeCompatibilityPreferenceController(context, listener));
         return controllers;
     }
 
@@ -219,7 +219,7 @@
                     mPasswordPreferenceController.getPasswordValidated(securityType),
                     securityType);
         }
-        configBuilder.setBand(mApBandPreferenceController.getBandIndex());
+        mMaxCompatibilityPrefController.setupMaximizeCompatibility(configBuilder);
         return configBuilder.build();
     }
 
@@ -229,14 +229,10 @@
     }
 
     private void updateDisplayWithNewConfig() {
-        use(WifiTetherSSIDPreferenceController.class)
-                .updateDisplay();
-        use(WifiTetherSecurityPreferenceController.class)
-                .updateDisplay();
-        use(WifiTetherPasswordPreferenceController.class)
-                .updateDisplay();
-        use(WifiTetherApBandPreferenceController.class)
-                .updateDisplay();
+        use(WifiTetherSSIDPreferenceController.class).updateDisplay();
+        use(WifiTetherSecurityPreferenceController.class).updateDisplay();
+        use(WifiTetherPasswordPreferenceController.class).updateDisplay();
+        use(WifiTetherMaximizeCompatibilityPreferenceController.class).updateDisplay();
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
@@ -250,7 +246,7 @@
                         keys.add(KEY_WIFI_TETHER_NETWORK_NAME);
                         keys.add(KEY_WIFI_TETHER_NETWORK_PASSWORD);
                         keys.add(KEY_WIFI_TETHER_AUTO_OFF);
-                        keys.add(KEY_WIFI_TETHER_NETWORK_AP_BAND);
+                        keys.add(KEY_WIFI_TETHER_MAXIMIZE_COMPATIBILITY);
                     }
 
                     // Remove duplicate
@@ -294,22 +290,17 @@
 
     private void reConfigInitialExpandedChildCount() {
         final PreferenceGroup screen = getPreferenceScreen();
-        if (mSecurityPreferenceController.getSecurityType()
-                == SoftApConfiguration.SECURITY_TYPE_OPEN) {
-            screen.setInitialExpandedChildrenCount(EXPANDED_CHILD_COUNT_WITH_SECURITY_NON);
-            return;
+        if (screen != null) {
+            screen.setInitialExpandedChildrenCount(getInitialExpandedChildCount());
         }
-        screen.setInitialExpandedChildrenCount(EXPANDED_CHILD_COUNT_DEFAULT);
     }
 
     @Override
     public int getInitialExpandedChildCount() {
-        if (mSecurityPreferenceController == null) {
-            return EXPANDED_CHILD_COUNT_DEFAULT;
+        if (mSecurityPreferenceController != null && mSecurityPreferenceController.getSecurityType()
+                == SoftApConfiguration.SECURITY_TYPE_OPEN) {
+            return (EXPANDED_CHILD_COUNT_DEFAULT - 1);
         }
-
-        return (mSecurityPreferenceController.getSecurityType()
-                == SoftApConfiguration.SECURITY_TYPE_OPEN)
-            ? EXPANDED_CHILD_COUNT_WITH_SECURITY_NON : EXPANDED_CHILD_COUNT_DEFAULT;
+        return EXPANDED_CHILD_COUNT_DEFAULT;
     }
 }
diff --git a/tests/anomaly-tester/Android.bp b/tests/anomaly-tester/Android.bp
index 29181af..c897d75 100644
--- a/tests/anomaly-tester/Android.bp
+++ b/tests/anomaly-tester/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 android_test {
     name: "AnomalyTester",
 
diff --git a/tests/componenttests/Android.bp b/tests/componenttests/Android.bp
index 77932ef..44158c7 100644
--- a/tests/componenttests/Android.bp
+++ b/tests/componenttests/Android.bp
@@ -1,6 +1,15 @@
 //############################################################
 // Settings Component test target.                           #
 //############################################################
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 android_test {
     name: "SettingsComponentTests",
     certificate: "platform",
diff --git a/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp b/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp
index dacd32a..1ec108a 100644
--- a/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp
+++ b/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp
@@ -12,6 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 android_test {
     name: "InstrumentedEntitlementApp",
     srcs: ["src/**/*.java"],
diff --git a/tests/legacy_unit/src/com/android/settings/vpn2/AppSettingsTest.java b/tests/legacy_unit/src/com/android/settings/vpn2/AppSettingsTest.java
index 014d8ea..a30d610 100644
--- a/tests/legacy_unit/src/com/android/settings/vpn2/AppSettingsTest.java
+++ b/tests/legacy_unit/src/com/android/settings/vpn2/AppSettingsTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.vpn2;
 
 import static com.android.settings.vpn2.AppManagementFragment.appHasVpnPermission;
+
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.when;
diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp
index 1ba5d9c..c03c57f 100644
--- a/tests/perftests/Android.bp
+++ b/tests/perftests/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 android_test {
     name: "SettingsPerfTests",
 
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index f6ad049..337bad7 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -2,6 +2,15 @@
 // Build SettingsRoboTestStub.apk which includes test-only resources.#
 //############################################################
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 android_app {
     name: "SettingsRoboTestStub",
     defaults: [
@@ -88,3 +97,15 @@
         "SettingsLib-search",
     ],
 }
+
+java_library {
+    name: "Settings-robo-testutils",
+    srcs: ["src/com/android/settings/testutils/**/*.java"],
+
+    libs: [
+        "Settings-core",
+        "Robolectric_all-target",
+        "mockito-robolectric-prebuilt",
+        "truth-prebuilt",
+    ],
+}
diff --git a/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java b/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java
index c9a8c44..cd33663 100644
--- a/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/AllInOneTetherSettingsTest.java
@@ -33,6 +33,7 @@
 
 import android.content.Context;
 import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.SoftApConfiguration;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -74,6 +75,8 @@
     @Mock
     private ConnectivityManager mConnectivityManager;
     @Mock
+    private TetheringManager mTetheringManager;
+    @Mock
     private UserManager mUserManager;
     @Mock
     private WifiTetherSecurityPreferenceController mSecurityPreferenceController;
@@ -89,10 +92,12 @@
         MockitoAnnotations.initMocks(this);
         doReturn(mConnectivityManager)
                 .when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
-        doReturn(WIFI_REGEXS).when(mConnectivityManager).getTetherableWifiRegexs();
-        doReturn(USB_REGEXS).when(mConnectivityManager).getTetherableUsbRegexs();
-        doReturn(BT_REGEXS).when(mConnectivityManager).getTetherableBluetoothRegexs();
-        doReturn(ETHERNET_REGEXS).when(mConnectivityManager).getTetherableIfaces();
+        doReturn(mTetheringManager)
+                .when(mContext).getSystemService(Context.TETHERING_SERVICE);
+        doReturn(WIFI_REGEXS).when(mTetheringManager).getTetherableWifiRegexs();
+        doReturn(USB_REGEXS).when(mTetheringManager).getTetherableUsbRegexs();
+        doReturn(BT_REGEXS).when(mTetheringManager).getTetherableBluetoothRegexs();
+        doReturn(ETHERNET_REGEXS).when(mTetheringManager).getTetherableIfaces();
         doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
         // Assume the feature is enabled for most test cases.
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, true);
diff --git a/tests/robotests/src/com/android/settings/TetherSettingsTest.java b/tests/robotests/src/com/android/settings/TetherSettingsTest.java
index f217e21..0948cfa 100644
--- a/tests/robotests/src/com/android/settings/TetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/TetherSettingsTest.java
@@ -34,6 +34,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.WifiManager;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -66,6 +67,8 @@
     private ConnectivityManager mConnectivityManager;
     @Mock
     private UserManager mUserManager;
+    @Mock
+    private TetheringManager mTetheringManager;
 
     @Before
     public void setUp() {
@@ -76,11 +79,13 @@
                 .when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
         doReturn(mUserManager)
                 .when(mContext).getSystemService(Context.USER_SERVICE);
+        doReturn(mTetheringManager)
+                .when(mContext).getSystemService(Context.TETHERING_SERVICE);
 
         setupIsTetherAvailable(true);
 
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]);
     }
 
     @Test
@@ -110,7 +115,7 @@
 
     @Test
     public void testTetherNonIndexableKeys_usbNotAvailable_usbKeyReturned() {
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
 
         final List<String> niks =
             TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
@@ -123,7 +128,7 @@
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, false);
         // We can ignore the condition of Utils.isMonkeyRunning()
         // In normal case, monkey and robotest should not execute at the same time
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{"fakeRegex"});
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[]{"fakeRegex"});
 
         final List<String> niks =
             TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
@@ -133,7 +138,7 @@
 
     @Test
     public void testTetherNonIndexableKeys_bluetoothNotAvailable_bluetoothKeyReturned() {
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]);
 
         final List<String> niks =
             TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
@@ -144,7 +149,7 @@
     @Test
     public void testTetherNonIndexableKeys_bluetoothAvailable_bluetoothKeyNotReturned() {
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, false);
-        when(mConnectivityManager.getTetherableBluetoothRegexs())
+        when(mTetheringManager.getTetherableBluetoothRegexs())
                 .thenReturn(new String[]{"fakeRegex"});
 
         final List<String> niks =
@@ -235,11 +240,11 @@
     }
 
     private void updateOnlyBluetoothState(TetherSettings tetherSettings) {
-        doReturn(mConnectivityManager).when(tetherSettings)
-            .getSystemService(Context.CONNECTIVITY_SERVICE);
-        when(mConnectivityManager.getTetherableIfaces()).thenReturn(new String[0]);
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[0]);
-        when(mConnectivityManager.getTetheringErroredIfaces()).thenReturn(new String[0]);
+        doReturn(mTetheringManager).when(tetherSettings)
+            .getSystemService(Context.TETHERING_SERVICE);
+        when(mTetheringManager.getTetherableIfaces()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetheringErroredIfaces()).thenReturn(new String[0]);
         doNothing().when(tetherSettings).updateUsbState(any(String[].class), any(String[].class),
                 any(String[].class));
         doNothing().when(tetherSettings).updateEthernetState(any(String[].class),
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFragmentTest.java
new file mode 100644
index 0000000..473b566
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonFragmentTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.testutils.XmlTestUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.List;
+
+/** Tests for {@link AccessibilityButtonFragment}. */
+@RunWith(RobolectricTestRunner.class)
+public class AccessibilityButtonFragmentTest {
+
+    private Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Test
+    public void getNonIndexableKeys_existInXmlLayout() {
+        final List<String> niks = AccessibilityButtonFragment.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(mContext);
+        final List<String> keys =
+                XmlTestUtils.getKeysFromPreferenceXml(mContext,
+                        R.xml.accessibility_button_settings);
+
+        assertThat(keys).containsAtLeastElementsIn(niks);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceControllerTest.java
new file mode 100644
index 0000000..a67038a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonLocationPreferenceControllerTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.Resources;
+import android.provider.Settings;
+
+import androidx.preference.ListPreference;
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link AccessibilityButtonLocationPreferenceController}. */
+@RunWith(RobolectricTestRunner.class)
+public class AccessibilityButtonLocationPreferenceControllerTest {
+
+    @Rule
+    public final MockitoRule mockito = MockitoJUnit.rule();
+
+    @Spy
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+    @Spy
+    private final Resources mResources = mContext.getResources();
+    private final ContentResolver mContentResolver = mContext.getContentResolver();
+    private final ListPreference mListPreference = new ListPreference(mContext);
+    private AccessibilityButtonLocationPreferenceController mController;
+
+
+    @Before
+    public void setUp() {
+        mController = new AccessibilityButtonLocationPreferenceController(mContext,
+                "test_key");
+        when(mContext.getResources()).thenReturn(mResources);
+    }
+
+    @Test
+    public void getAvailabilityStatus_navigationGestureEnabled_returnDisabledDependentSetting() {
+        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
+                .thenReturn(NAV_BAR_MODE_GESTURAL);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void getAvailabilityStatus_navigationGestureDisabled_returnAvailable() {
+        when(mResources.getInteger(com.android.internal.R.integer.config_navBarInteractionMode))
+                .thenReturn(NAV_BAR_MODE_2BUTTON);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void updateState_a11yBtnModeNavigationBar_navigationBarValue() {
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
+                ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR);
+
+        mController.updateState(mListPreference);
+
+        final String navigationBarValue = String.valueOf(ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR);
+        assertThat(mListPreference.getValue()).isEqualTo(navigationBarValue);
+    }
+
+    @Test
+    public void onPreferenceChange_a11yBtnModeFloatingMenu_floatingMenuValue() {
+        final String floatingMenuValue = String.valueOf(ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU);
+
+        mController.onPreferenceChange(mListPreference, floatingMenuValue);
+
+        assertThat(mListPreference.getValue()).isEqualTo(floatingMenuValue);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceControllerTest.java
new file mode 100644
index 0000000..eb88175
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityButtonPreviewPreferenceControllerTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.provider.Settings;
+import android.widget.ImageView;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link AccessibilityButtonPreviewPreferenceController}. */
+@RunWith(RobolectricTestRunner.class)
+public class AccessibilityButtonPreviewPreferenceControllerTest {
+
+    @Rule
+    public MockitoRule mocks = MockitoJUnit.rule();
+
+    @Spy
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+    @Mock
+    private ContentResolver mContentResolver;
+    private AccessibilityButtonPreviewPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        when(mContext.getContentResolver()).thenReturn(mContentResolver);
+        mController = new AccessibilityButtonPreviewPreferenceController(mContext, "test_key");
+        mController.mPreview = new ImageView(mContext);
+    }
+
+    @Test
+    public void onChange_a11yBtnModeNavigationBar_getNavigationBarDrawable() {
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
+                ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR);
+
+        mController.mContentObserver.onChange(false);
+
+        final Drawable navigationBarDrawable = mContext.getDrawable(
+                R.drawable.accessibility_button_navigation);
+        assertThat(mController.mPreview.getDrawable().getConstantState()).isEqualTo(
+                navigationBarDrawable.getConstantState());
+    }
+
+    @Test
+    public void onChange_updatePreviewPreferenceWithConfig_expectedPreviewDrawable() {
+        Settings.Secure.putInt(mContentResolver,
+                Settings.Secure.ACCESSIBILITY_BUTTON_MODE, ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU);
+        Settings.Secure.putInt(mContentResolver,
+                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE, /* small size */ 0);
+        Settings.Secure.putFloat(mContentResolver,
+                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY, 0.1f);
+
+        mController.mContentObserver.onChange(false);
+
+        final Drawable smallFloatingMenuWithTenOpacityDrawable =
+                FloatingMenuLayerDrawable.createLayerDrawable(mContext,
+                        R.drawable.accessibility_button_preview_small_floating_menu, 10);
+        assertThat(mController.mPreview.getDrawable().getConstantState()).isEqualTo(
+                smallFloatingMenuWithTenOpacityDrawable.getConstantState());
+    }
+
+    @Test
+    public void onResume_registerSpecificContentObserver() {
+        mController.onResume();
+
+        verify(mContentResolver).registerContentObserver(
+                Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_BUTTON_MODE), false,
+                mController.mContentObserver);
+        verify(mContentResolver).registerContentObserver(
+                Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE), false,
+                mController.mContentObserver);
+        verify(mContentResolver).registerContentObserver(
+                Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY),
+                false,
+                mController.mContentObserver);
+    }
+
+    @Test
+    public void onPause_unregisterContentObserver() {
+        mController.onPause();
+
+        verify(mContentResolver).unregisterContentObserver(mController.mContentObserver);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/FloatingMenuFadePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/FloatingMenuFadePreferenceControllerTest.java
new file mode 100644
index 0000000..5cf87ee
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/FloatingMenuFadePreferenceControllerTest.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link FloatingMenuFadePreferenceController}. */
+@RunWith(RobolectricTestRunner.class)
+public class FloatingMenuFadePreferenceControllerTest {
+
+    @Rule
+    public MockitoRule mocks = MockitoJUnit.rule();
+
+    private static final int OFF = 0;
+    private static final int ON = 1;
+
+    @Spy
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+    @Mock
+    private ContentResolver mContentResolver;
+    private final SwitchPreference mSwitchPreference = new SwitchPreference(mContext);
+    private FloatingMenuFadePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        when(mContext.getContentResolver()).thenReturn(mContentResolver);
+        mController = new FloatingMenuFadePreferenceController(mContext, "test_key");
+    }
+
+    @Test
+    public void getAvailabilityStatus_a11yBtnModeFloatingMenu_returnAvailable() {
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
+                ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_a11yBtnModeNavigationBar_returnDisabledDependentSetting() {
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
+                ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void updateState_keyFloatingMenuFadeDisabled_fadeIsDisabled() {
+        Settings.Secure.putInt(mContentResolver,
+                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED, OFF);
+
+        mController.updateState(mSwitchPreference);
+
+        assertThat(mSwitchPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void onPreferenceChange_floatingMenuFadeEnabled_keyFloatingMenuFadeIsOn() {
+        mController.onPreferenceChange(mSwitchPreference, Boolean.TRUE);
+
+        final int actualValue = Settings.Secure.getInt(mContentResolver,
+                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED, OFF);
+        assertThat(actualValue).isEqualTo(ON);
+    }
+
+    @Test
+    public void onChange_floatingMenuFadeChangeToDisabled_preferenceDisabled() {
+        mController.mPreference = mSwitchPreference;
+        Settings.Secure.putInt(mContentResolver,
+                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED, OFF);
+
+        mController.mContentObserver.onChange(false);
+
+        assertThat(mController.mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void onResume_registerSpecificContentObserver() {
+        mController.onResume();
+
+        verify(mContentResolver).registerContentObserver(
+                Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_BUTTON_MODE), false,
+                mController.mContentObserver);
+    }
+
+    @Test
+    public void onPause_unregisterContentObserver() {
+        mController.onPause();
+
+        verify(mContentResolver).unregisterContentObserver(mController.mContentObserver);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/FloatingMenuLayerDrawableTest.java b/tests/robotests/src/com/android/settings/accessibility/FloatingMenuLayerDrawableTest.java
new file mode 100644
index 0000000..ec449d2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/FloatingMenuLayerDrawableTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link FloatingMenuLayerDrawable}. */
+@RunWith(RobolectricTestRunner.class)
+public class FloatingMenuLayerDrawableTest {
+
+    private static final int TEST_RES_ID =
+            com.android.internal.R.drawable.ic_accessibility_magnification;
+    private static final int TEST_RES_ID_2 =
+            com.android.internal.R.drawable.ic_accessibility_color_inversion;
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Test
+    public void createLayerDrawable_configCorrect() {
+        final Drawable expected1stDrawable = mContext.getDrawable(
+                R.drawable.accessibility_button_preview_base);
+        final Drawable expected2ndDrawable = mContext.getDrawable(TEST_RES_ID);
+
+        final FloatingMenuLayerDrawable actualDrawable =
+                FloatingMenuLayerDrawable.createLayerDrawable(mContext, TEST_RES_ID,
+                        /* opacity= */ 27);
+
+        final Drawable actual1stDrawable = actualDrawable.getDrawable(0);
+        final Drawable actual2ndDrawable = actualDrawable.getDrawable(1);
+        // These are VectorDrawables, so it can use getConstantState() to compare.
+        assertThat(actual1stDrawable.getConstantState()).isEqualTo(
+                expected1stDrawable.getConstantState());
+        assertThat(actual2ndDrawable.getConstantState()).isEqualTo(
+                expected2ndDrawable.getConstantState());
+    }
+
+    @Test
+    public void updateLayerDrawable_expectedFloatingMenuLayerDrawableState() {
+        final FloatingMenuLayerDrawable originalDrawable =
+                FloatingMenuLayerDrawable.createLayerDrawable(mContext, TEST_RES_ID, /* opacity= */
+                        72);
+
+        originalDrawable.updateLayerDrawable(mContext, TEST_RES_ID_2, /* opacity= */ 27);
+
+        assertThat(originalDrawable.getConstantState()).isEqualTo(
+                new FloatingMenuLayerDrawable.FloatingMenuLayerDrawableState(mContext,
+                        TEST_RES_ID_2, /* opacity= */ 27));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/FloatingMenuOpacityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/FloatingMenuOpacityPreferenceControllerTest.java
new file mode 100644
index 0000000..1638f90
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/FloatingMenuOpacityPreferenceControllerTest.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR;
+
+import static com.android.settings.accessibility.FloatingMenuOpacityPreferenceController.DEFAULT_OPACITY;
+import static com.android.settings.accessibility.FloatingMenuOpacityPreferenceController.PRECISION;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.widget.SeekBarPreference;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link FloatingMenuOpacityPreferenceController}. */
+@RunWith(RobolectricTestRunner.class)
+public class FloatingMenuOpacityPreferenceControllerTest {
+
+    @Rule
+    public MockitoRule mocks = MockitoJUnit.rule();
+
+    @Spy
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+    @Mock
+    private ContentResolver mContentResolver;
+    private FloatingMenuOpacityPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        when(mContext.getContentResolver()).thenReturn(mContentResolver);
+        mController = new FloatingMenuOpacityPreferenceController(mContext, "test_key");
+    }
+
+    @Test
+    public void getAvailabilityStatus_a11yBtnModeFloatingMenu_returnAvailable() {
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
+                ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_a11yBtnModeNavigationBar_returnDisabledDependentSetting() {
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
+                ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void onChange_a11yBtnModeChangeToNavigationBar_preferenceDisabled() {
+        mController.mPreference = new SeekBarPreference(mContext);
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
+                ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR);
+
+        mController.mContentObserver.onChange(false);
+
+        assertThat(mController.mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void getSliderPosition_putNormalOpacityValue_expectedValue() {
+        Settings.Secure.putFloat(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY, 0.35f);
+
+        assertThat(mController.getSliderPosition()).isEqualTo(35);
+    }
+
+    @Test
+    public void getSliderPosition_putOutOfBoundOpacityValue_defaultValue() {
+        Settings.Secure.putFloat(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY, 0.01f);
+
+        final int defaultValue = Math.round(DEFAULT_OPACITY * PRECISION);
+        assertThat(mController.getSliderPosition()).isEqualTo(defaultValue);
+    }
+
+    @Test
+    public void setSliderPosition_expectedValue() {
+        mController.setSliderPosition(27);
+
+        final float value = Settings.Secure.getFloat(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_FLOATING_MENU_OPACITY, -1);
+        assertThat(value).isEqualTo(0.27f);
+    }
+
+    @Test
+    public void onResume_registerSpecificContentObserver() {
+        mController.onResume();
+
+        verify(mContentResolver).registerContentObserver(
+                Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_BUTTON_MODE), false,
+                mController.mContentObserver);
+        verify(mContentResolver).registerContentObserver(
+                Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_FLOATING_MENU_FADE_ENABLED),
+                false,
+                mController.mContentObserver);
+    }
+
+    @Test
+    public void onPause_unregisterContentObserver() {
+        mController.onPause();
+
+        verify(mContentResolver).unregisterContentObserver(mController.mContentObserver);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/FloatingMenuSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/FloatingMenuSizePreferenceControllerTest.java
new file mode 100644
index 0000000..4d7d98d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/FloatingMenuSizePreferenceControllerTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU;
+import static android.provider.Settings.Secure.ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.ListPreference;
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link FloatingMenuSizePreferenceController}. */
+@RunWith(RobolectricTestRunner.class)
+public class FloatingMenuSizePreferenceControllerTest {
+
+    @Rule
+    public MockitoRule mocks = MockitoJUnit.rule();
+
+    @Spy
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+    @Mock
+    private ContentResolver mContentResolver;
+    private final ListPreference mListPreference = new ListPreference(mContext);
+    private FloatingMenuSizePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        when(mContext.getContentResolver()).thenReturn(mContentResolver);
+        mController = new FloatingMenuSizePreferenceController(mContext, "test_key");
+    }
+
+    @Test
+    public void getAvailabilityStatus_a11yBtnModeFloatingMenu_returnAvailable() {
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
+                ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_a11yBtnModeNavigationBar_returnDisabledDependentSetting() {
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
+                ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void updateState_floatingMenuLargeSizeAndFullCircle_largeSizeValue() {
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_FLOATING_MENU_SIZE,
+                FloatingMenuSizePreferenceController.Size.LARGE);
+
+        mController.updateState(mListPreference);
+
+        final String largeSize = String.valueOf(FloatingMenuSizePreferenceController.Size.LARGE);
+        assertThat(mListPreference.getValue()).isEqualTo(largeSize);
+    }
+
+    @Test
+    public void onChange_a11yBtnModeChangeToNavigationBar_preferenceDisabled() {
+        mController.mPreference = mListPreference;
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.ACCESSIBILITY_BUTTON_MODE,
+                ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR);
+
+        mController.mContentObserver.onChange(false);
+
+        assertThat(mController.mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void onResume_registerSpecificContentObserver() {
+        mController.onResume();
+
+        verify(mContentResolver).registerContentObserver(
+                Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_BUTTON_MODE), false,
+                mController.mContentObserver);
+    }
+
+    @Test
+    public void onPause_unregisterContentObserver() {
+        mController.onPause();
+
+        verify(mContentResolver).unregisterContentObserver(mController.mContentObserver);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
index 3df6221..0ed6747 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
@@ -31,6 +31,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.view.LayoutInflater;
@@ -75,7 +76,8 @@
             "com.android.server.accessibility.MagnificationController";
 
     private TestToggleScreenMagnificationPreferenceFragment mFragment;
-    private Context mContext = ApplicationProvider.getApplicationContext();
+    private Context mContext;
+    private Resources mResources;
 
     @Mock
     private PreferenceManager mPreferenceManager;
@@ -86,10 +88,14 @@
     public void setUpTestFragment() {
         MockitoAnnotations.initMocks(this);
 
+        mContext = spy(ApplicationProvider.getApplicationContext());
         mFragment = spy(new TestToggleScreenMagnificationPreferenceFragment());
         when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
         when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
         when(mFragment.getContext()).thenReturn(mContext);
+        mResources = spy(mContext.getResources());
+        when(mContext.getResources()).thenReturn(mResources);
+        when(mFragment.getContext().getResources()).thenReturn(mResources);
         doReturn(null).when(mFragment).getPreferenceScreen();
         doReturn(mActivity).when(mFragment).getActivity();
     }
@@ -250,6 +256,16 @@
         assertThat(expectedType).isEqualTo(UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP);
     }
 
+    @Test
+    public void initSettingsPreference_notSupportsMagnificationArea_settingsPreferenceIsNull() {
+        when(mResources.getBoolean(
+                com.android.internal.R.bool.config_magnification_area))
+                .thenReturn(false);
+        mFragment.initSettingsPreference();
+
+        assertThat(mFragment.mSettingsPreference).isNull();
+    }
+
     private void putStringIntoSettings(String key, String componentName) {
         Settings.Secure.putString(mContext.getContentResolver(), key, componentName);
     }
diff --git a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
index 02b318f..534d3c6 100644
--- a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
@@ -120,7 +120,6 @@
     @Test
     @Config(qualifiers = "mcc999",
             shadows = {
-                    BatteryFixSliceTest.ShadowBatteryStatsHelperLoader.class,
                     BatteryFixSliceTest.ShadowBatteryTipLoader.class
             })
     public void onStart_useMockAvatarViewMixin_shouldBeExecuted() {
diff --git a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java
index 6ed266f..8725a0c 100644
--- a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.accounts;
 
-import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;
+import static com.android.settingslib.widget.TwoTargetPreference.ICON_SIZE_MEDIUM;
 
 import static com.google.common.truth.Truth.assertThat;
 
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
index 3f4175e..8f41884 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
@@ -25,10 +25,13 @@
 import android.content.Context;
 import android.content.pm.IPackageManager;
 import android.os.RemoteException;
+import android.os.UserHandle;
 import android.os.UserManager;
 
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 
+import com.google.common.truth.Truth;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -60,6 +63,58 @@
         // should not crash
     }
 
+    @Test
+    public void permissionState_modeDefault_IsPermissible() {
+        AppStateAppOpsBridge.PermissionState permissionState =
+                new AppStateAppOpsBridge.PermissionState("pkg1", UserHandle.of(123));
+        permissionState.appOpMode = AppOpsManager.MODE_DEFAULT;
+
+        permissionState.staticPermissionGranted = true;
+        Truth.assertThat(permissionState.isPermissible()).isTrue();
+
+        permissionState.staticPermissionGranted = false;
+        Truth.assertThat(permissionState.isPermissible()).isFalse();
+    }
+
+    @Test
+    public void permissionState_modeErrored_IsPermissible() {
+        AppStateAppOpsBridge.PermissionState permissionState =
+                new AppStateAppOpsBridge.PermissionState("pkg1", UserHandle.of(123));
+        permissionState.appOpMode = AppOpsManager.MODE_ERRORED;
+
+        permissionState.staticPermissionGranted = true;
+        Truth.assertThat(permissionState.isPermissible()).isFalse();
+
+        permissionState.staticPermissionGranted = false;
+        Truth.assertThat(permissionState.isPermissible()).isFalse();
+    }
+
+    @Test
+    public void permissionState_modeAllowed_IsPermissible() {
+        AppStateAppOpsBridge.PermissionState permissionState =
+                new AppStateAppOpsBridge.PermissionState("pkg1", UserHandle.of(123));
+        permissionState.appOpMode = AppOpsManager.MODE_ALLOWED;
+
+        permissionState.staticPermissionGranted = true;
+        Truth.assertThat(permissionState.isPermissible()).isTrue();
+
+        permissionState.staticPermissionGranted = false;
+        Truth.assertThat(permissionState.isPermissible()).isTrue();
+    }
+
+    @Test
+    public void permissionState_modeIgnored_IsPermissible() {
+        AppStateAppOpsBridge.PermissionState permissionState =
+                new AppStateAppOpsBridge.PermissionState("pkg1", UserHandle.of(123));
+        permissionState.appOpMode = AppOpsManager.MODE_IGNORED;
+
+        permissionState.staticPermissionGranted = true;
+        Truth.assertThat(permissionState.isPermissible()).isFalse();
+
+        permissionState.staticPermissionGranted = false;
+        Truth.assertThat(permissionState.isPermissible()).isFalse();
+    }
+
     private class TestAppStateAppOpsBridge extends AppStateAppOpsBridge {
         private TestAppStateAppOpsBridge() {
             super(mContext, null, null, AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetailsTest.java
new file mode 100644
index 0000000..c3bcead
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AlarmsAndRemindersDetailsTest.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+
+import com.android.settings.applications.AppStateAlarmsAndRemindersBridge;
+import com.android.settings.applications.AppStateAppOpsBridge;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(RobolectricTestRunner.class)
+public class AlarmsAndRemindersDetailsTest {
+
+    @Mock
+    private RestrictedSwitchPreference mSwitchPref;
+    @Mock
+    private PackageInfo mPackageInfo;
+    @Mock
+    private AppStateAlarmsAndRemindersBridge mAppStateBridge;
+    @Mock
+    private AppStateAppOpsBridge.PermissionState mPermissionState;
+
+    private AlarmsAndRemindersDetails mFragment = new AlarmsAndRemindersDetails();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        ReflectionHelpers.setField(mFragment, "mSwitchPref", mSwitchPref);
+        ReflectionHelpers.setField(mFragment, "mAppBridge", mAppStateBridge);
+    }
+
+    @Test
+    public void refreshUi_noPackageInfo_shouldReturnFalseAndNoCrash() {
+        mFragment.refreshUi();
+
+        assertThat(mFragment.refreshUi()).isFalse();
+        // should not crash
+    }
+
+    @Test
+    public void refreshUi_noApplicationInfo_shouldReturnFalseAndNoCrash() {
+        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
+
+        mFragment.refreshUi();
+
+        assertThat(mFragment.refreshUi()).isFalse();
+        // should not crash
+    }
+
+    @Test
+    public void refreshUi_hasApplicationInfo_shouldReturnTrue() {
+        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
+        mPackageInfo.applicationInfo = new ApplicationInfo();
+        when(mAppStateBridge.createPermissionState(nullable(String.class), anyInt()))
+                .thenReturn(mPermissionState);
+
+        mFragment.refreshUi();
+
+        assertThat(mFragment.refreshUi()).isTrue();
+    }
+
+    @Test
+    public void refreshUi_switchPreferenceEnabled() {
+        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
+        mPackageInfo.applicationInfo = new ApplicationInfo();
+        when(mAppStateBridge.createPermissionState(nullable(String.class), anyInt()))
+                .thenReturn(mPermissionState);
+        mPermissionState.permissionDeclared = false;
+
+        mFragment.refreshUi();
+        verify(mSwitchPref).setEnabled(false);
+
+        mPermissionState.permissionDeclared = true;
+
+        mFragment.refreshUi();
+        verify(mSwitchPref).setEnabled(true);
+    }
+
+    @Test
+    public void refreshUi_switchPreferenceChecked() {
+        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
+        mPackageInfo.applicationInfo = new ApplicationInfo();
+        when(mAppStateBridge.createPermissionState(nullable(String.class), anyInt()))
+                .thenReturn(mPermissionState);
+
+        when(mPermissionState.isPermissible()).thenReturn(true);
+        mFragment.refreshUi();
+        verify(mSwitchPref).setChecked(true);
+
+        when(mPermissionState.isPermissible()).thenReturn(false);
+        mFragment.refreshUi();
+        verify(mSwitchPref).setChecked(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java
index c735452..71ab334 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java
@@ -30,7 +30,6 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.os.BatteryStats;
 import android.os.BatteryUsageStats;
 import android.os.Bundle;
 import android.os.UidBatteryConsumer;
@@ -39,15 +38,12 @@
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.SettingsActivity;
 import com.android.settings.fuelgauge.BatteryUtils;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -73,13 +69,7 @@
     @Mock
     private UidBatteryConsumer mUidBatteryConsumer;
     @Mock
-    private BatterySipper mBatterySipper;
-    @Mock
-    private BatterySipper mOtherBatterySipper;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private BatteryStatsHelper mBatteryStatsHelper;
-    @Mock
-    private BatteryStats.Uid mUid;
+    private UidBatteryConsumer mOtherUidBatteryConsumer;
     @Mock
     private PreferenceScreen mScreen;
     @Mock
@@ -102,10 +92,8 @@
 
         mBatteryPreference = spy(new Preference(RuntimeEnvironment.application));
 
-        mBatterySipper.drainType = BatterySipper.DrainType.IDLE;
-        mBatterySipper.uidObj = mUid;
-        doReturn(TARGET_UID).when(mBatterySipper).getUid();
-        doReturn(OTHER_UID).when(mOtherBatterySipper).getUid();
+        when(mUidBatteryConsumer.getUid()).thenReturn(TARGET_UID);
+        when(mOtherUidBatteryConsumer.getUid()).thenReturn(OTHER_UID);
 
         mController = spy(new AppBatteryPreferenceController(
             RuntimeEnvironment.application, mFragment, "package1", null /* lifecycle */));
@@ -125,14 +113,14 @@
     }
 
     @Test
-    public void findTargetSipper_findCorrectSipper() {
-        final List<BatterySipper> usageList = new ArrayList<>();
-        usageList.add(mBatterySipper);
-        usageList.add(mOtherBatterySipper);
-        when(mBatteryStatsHelper.getUsageList()).thenReturn(usageList);
+    public void findTargetBatteryConsumer_findCorrectBatteryConsumer() {
+        final List<UidBatteryConsumer> uidBatteryConsumers = new ArrayList<>();
+        uidBatteryConsumers.add(mUidBatteryConsumer);
+        uidBatteryConsumers.add(mOtherUidBatteryConsumer);
+        when(mBatteryUsageStats.getUidBatteryConsumers()).thenReturn(uidBatteryConsumers);
 
-        assertThat(mController.findTargetSipper(mBatteryStatsHelper, TARGET_UID))
-            .isEqualTo(mBatterySipper);
+        assertThat(mController.findTargetUidBatteryConsumer(mBatteryUsageStats, TARGET_UID))
+            .isEqualTo(mUidBatteryConsumer);
     }
 
     @Test
@@ -147,13 +135,10 @@
 
     @Test
     public void updateBattery_hasBatteryStats_summaryPercent() {
-        mController.mBatteryHelper = mBatteryStatsHelper;
-        mController.mSipper = mBatterySipper;
         mController.mBatteryUsageStats = mBatteryUsageStats;
         mController.mUidBatteryConsumer = mUidBatteryConsumer;
         doReturn(BATTERY_LEVEL).when(mBatteryUtils).calculateBatteryPercent(anyDouble(),
-                anyDouble(), anyDouble(), anyInt());
-        doReturn(new ArrayList<>()).when(mBatteryStatsHelper).getUsageList();
+                anyDouble(), anyInt());
         mController.displayPreference(mScreen);
 
         mController.updateBattery();
@@ -163,8 +148,6 @@
 
     @Test
     public void isBatteryStatsAvailable_hasBatteryStatsHelperAndSipper_returnTrue() {
-        mController.mBatteryHelper = mBatteryStatsHelper;
-        mController.mSipper = mBatterySipper;
         mController.mBatteryUsageStats = mBatteryUsageStats;
         mController.mUidBatteryConsumer = mUidBatteryConsumer;
 
@@ -183,8 +166,6 @@
         when(mFragment.getActivity()).thenReturn(mActivity);
         final String key = mController.getPreferenceKey();
         when(mBatteryPreference.getKey()).thenReturn(key);
-        mController.mSipper = mBatterySipper;
-        mController.mBatteryHelper = mBatteryStatsHelper;
         mController.mBatteryUsageStats = mBatteryUsageStats;
         mController.mUidBatteryConsumer = mUidBatteryConsumer;
 
@@ -199,8 +180,8 @@
         mController.onResume();
 
         verify(mLoaderManager)
-                .restartLoader(AppInfoDashboardFragment.LOADER_BATTERY, Bundle.EMPTY,
-                        mController.mBatteryStatsHelperLoaderCallbacks);
+                .restartLoader(AppInfoDashboardFragment.LOADER_BATTERY_USAGE_STATS, Bundle.EMPTY,
+                        mController.mBatteryUsageStatsLoaderCallbacks);
     }
 
     @Test
@@ -209,6 +190,6 @@
 
         mController.onPause();
 
-        verify(mLoaderManager).destroyLoader(AppInfoDashboardFragment.LOADER_BATTERY);
+        verify(mLoaderManager).destroyLoader(AppInfoDashboardFragment.LOADER_BATTERY_USAGE_STATS);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java
index 1f513a3..d5e5080 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.applications.appinfo;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -62,4 +64,13 @@
 
         verify(mPreference).setSummary("version test1234");
     }
+
+    @Test
+    public void updateState_packageInfoNull_shouldNotCrash() {
+        when(mFragment.getPackageInfo()).thenReturn(null);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.getSummary()).isNull();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExtraAppInfoPreferenceControllerTest.java
similarity index 63%
copy from tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java
copy to tests/robotests/src/com/android/settings/applications/appinfo/ExtraAppInfoPreferenceControllerTest.java
index 649726a..f413908 100644
--- a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExtraAppInfoPreferenceControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2021 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.settings.location;
+package com.android.settings.applications.appinfo;
+
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.R;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -29,24 +28,19 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-import java.util.List;
-
 @RunWith(RobolectricTestRunner.class)
-public class ScanningSettingsTest {
-
+public class ExtraAppInfoPreferenceControllerTest {
     private Context mContext;
+    private ExtraAppInfoPreferenceController mController;
 
     @Before
     public void setUp() {
         mContext = RuntimeEnvironment.application;
+        mController = new ExtraAppInfoPreferenceController(mContext, "test_key");
     }
 
     @Test
-    public void searchProvider_shouldIndexDefaultXml() {
-        final List<SearchIndexableResource> sir = ScanningSettings.SEARCH_INDEX_DATA_PROVIDER
-                .getXmlResourcesToIndex(mContext, true /* enabled */);
-
-        assertThat(sir).hasSize(1);
-        assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.location_scanning);
+    public void getAvailabilityStatus_unavailableByDefault() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/MediaManagementAppsDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/MediaManagementAppsDetailsTest.java
new file mode 100644
index 0000000..6297064
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/MediaManagementAppsDetailsTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.appinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.applications.AppStateAppOpsBridge;
+import com.android.settings.applications.AppStateMediaManagementAppsBridge;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(RobolectricTestRunner.class)
+public class MediaManagementAppsDetailsTest {
+
+    @Mock
+    private SwitchPreference mSwitchPref;
+    @Mock
+    private PackageInfo mPackageInfo;
+    @Mock
+    private AppStateMediaManagementAppsBridge mAppStateBridge;
+    @Mock
+    private AppStateAppOpsBridge.PermissionState mPermissionState;
+
+    private MediaManagementAppsDetails mFragment = new MediaManagementAppsDetails();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        ReflectionHelpers.setField(mFragment, "mSwitchPref", mSwitchPref);
+        ReflectionHelpers.setField(mFragment, "mAppBridge", mAppStateBridge);
+    }
+
+    @Test
+    public void refreshUi_noPackageInfo_returnFalse() {
+        assertThat(mFragment.refreshUi()).isFalse();
+    }
+
+    @Test
+    public void refreshUi_noApplicationInfo_returnFalse() {
+        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
+
+        assertThat(mFragment.refreshUi()).isFalse();
+    }
+
+    @Test
+    public void refreshUi_hasApplicationInfo_returnTrue() {
+        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
+        mPackageInfo.applicationInfo = new ApplicationInfo();
+        when(mAppStateBridge.createPermissionState(nullable(String.class), anyInt()))
+                .thenReturn(mPermissionState);
+
+        assertThat(mFragment.refreshUi()).isTrue();
+    }
+
+    @Test
+    public void refreshUi_permissionDeclaredFalse_switchPreferenceUnEnabled() {
+        assert_refreshUi_switchPreferenceSetEnabled(false /* isPermissionDeclared */);
+    }
+
+    @Test
+    public void refreshUi_permissionDeclaredTrue_switchPreferenceEnabled() {
+        assert_refreshUi_switchPreferenceSetEnabled(true /* isPermissionDeclared */);
+    }
+
+    @Test
+    public void refreshUi_isPermissibleFalse_switchPreferenceUnChecked() {
+        assert_refreshUi_switchPreferenceSetChecked(false /* isPermissible */);
+    }
+
+    @Test
+    public void refreshUi_isPermissibleTrue_switchPreferenceChecked() {
+        assert_refreshUi_switchPreferenceSetChecked(true /* isPermissible */);
+    }
+
+    private void assert_refreshUi_switchPreferenceSetEnabled(boolean isPermissionDeclared) {
+        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
+        mPackageInfo.applicationInfo = new ApplicationInfo();
+        when(mAppStateBridge.createPermissionState(nullable(String.class), anyInt()))
+                .thenReturn(mPermissionState);
+        mPermissionState.permissionDeclared = isPermissionDeclared;
+
+        mFragment.refreshUi();
+        verify(mSwitchPref).setEnabled(isPermissionDeclared);
+    }
+
+    private void assert_refreshUi_switchPreferenceSetChecked(boolean isPermissible) {
+        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
+        mPackageInfo.applicationInfo = new ApplicationInfo();
+        when(mAppStateBridge.createPermissionState(nullable(String.class), anyInt()))
+                .thenReturn(mPermissionState);
+        when(mPermissionState.isPermissible()).thenReturn(isPermissible);
+
+        mFragment.refreshUi();
+        verify(mSwitchPref).setChecked(isPermissible);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/assist/OWNERS b/tests/robotests/src/com/android/settings/applications/assist/OWNERS
new file mode 100644
index 0000000..bf069f4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/assist/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/applications/assist/OWNERS
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
index 31c00ec..e78a394 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.applications.defaultapps;
 
-import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;
+import static com.android.settingslib.widget.TwoTargetPreference.ICON_SIZE_MEDIUM;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -28,8 +28,8 @@
 import androidx.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settingslib.TwoTargetPreference;
 import com.android.settingslib.applications.DefaultAppInfo;
+import com.android.settingslib.widget.TwoTargetPreference;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
index d3a1fc1..bf1d256 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
@@ -25,6 +25,7 @@
 import android.app.KeyguardManager;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.hardware.biometrics.ComponentInfoInternal;
 import android.hardware.biometrics.SensorProperties;
 import android.hardware.fingerprint.FingerprintSensorProperties;
 import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
@@ -53,6 +54,7 @@
 import org.robolectric.shadows.ShadowKeyguardManager;
 
 import java.util.ArrayList;
+import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
@@ -70,10 +72,19 @@
         Shadows.shadowOf(application.getPackageManager())
                 .setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true);
 
+        final List<ComponentInfoInternal> componentInfo = new ArrayList<>();
+        componentInfo.add(new ComponentInfoInternal("faceSensor" /* componentId */,
+                "vendor/model/revision" /* hardwareVersion */, "1.01" /* firmwareVersion */,
+                "00000001" /* serialNumber */, "" /* softwareVersion */));
+        componentInfo.add(new ComponentInfoInternal("matchingAlgorithm" /* componentId */,
+                "" /* hardwareVersion */, "" /* firmwareVersion */, "" /* serialNumber */,
+                "vendor/version/revision" /* softwareVersion */));
+
         final FingerprintSensorPropertiesInternal prop = new FingerprintSensorPropertiesInternal(
                 0 /* sensorId */,
                 SensorProperties.STRENGTH_STRONG,
                 5 /* maxEnrollmentsPerUser */,
+                componentInfo,
                 FingerprintSensorProperties.TYPE_REAR,
                 true /* resetLockoutRequiresHardwareAuthToken */);
         final ArrayList<FingerprintSensorPropertiesInternal> props = new ArrayList<>();
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
index 25780f7..f8517ba 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -24,8 +24,8 @@
 import android.app.KeyguardManager;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.hardware.biometrics.ComponentInfoInternal;
 import android.hardware.biometrics.SensorProperties;
-import android.hardware.fingerprint.FingerprintManager;
 import android.hardware.fingerprint.FingerprintSensorProperties;
 import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
 import android.view.View;
@@ -59,6 +59,7 @@
 import org.robolectric.shadows.ShadowKeyguardManager;
 
 import java.util.ArrayList;
+import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
@@ -76,10 +77,19 @@
         Shadows.shadowOf(application.getPackageManager())
             .setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true);
 
+        final List<ComponentInfoInternal> componentInfo = new ArrayList<>();
+        componentInfo.add(new ComponentInfoInternal("faceSensor" /* componentId */,
+                "vendor/model/revision" /* hardwareVersion */, "1.01" /* firmwareVersion */,
+                "00000001" /* serialNumber */, "" /* softwareVersion */));
+        componentInfo.add(new ComponentInfoInternal("matchingAlgorithm" /* componentId */,
+                "" /* hardwareVersion */, "" /* firmwareVersion */, "" /* serialNumber */,
+                "vendor/version/revision" /* softwareVersion */));
+
         final FingerprintSensorPropertiesInternal prop = new FingerprintSensorPropertiesInternal(
                 0 /* sensorId */,
                 SensorProperties.STRENGTH_STRONG,
                 5 /* maxEnrollmentsPerUser */,
+                componentInfo,
                 FingerprintSensorProperties.TYPE_REAR,
                 true /* resetLockoutRequiresHardwareAuthToken */);
         final ArrayList<FingerprintSensorPropertiesInternal> props = new ArrayList<>();
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
index 4d2ad36..c8891e5 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
@@ -109,8 +109,61 @@
     }
 
     @Test
+    public void refresh_connectedWatch_behaveAsExpected() {
+        when(mBluetoothDevice.getMetadata(
+                BluetoothDevice.METADATA_DEVICE_TYPE)).thenReturn(
+                BluetoothDevice.DEVICE_TYPE_WATCH.getBytes());
+        when(mBluetoothDevice.getMetadata(
+                BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET)).thenReturn(
+                String.valueOf(false).getBytes());
+        when(mBluetoothDevice.getMetadata(
+                BluetoothDevice.METADATA_MAIN_BATTERY)).thenReturn(
+                String.valueOf(BATTERY_LEVEL_MAIN).getBytes());
+        when(mCachedDevice.isConnected()).thenReturn(true);
+
+        mController.refresh();
+
+        assertThat(mLayoutPreference.findViewById(R.id.layout_left).getVisibility()).isEqualTo(
+                View.GONE);
+        assertThat(mLayoutPreference.findViewById(R.id.layout_right).getVisibility()).isEqualTo(
+                View.GONE);
+        assertThat(mLayoutPreference.findViewById(R.id.layout_middle).getVisibility()).isEqualTo(
+                View.VISIBLE);
+        assertBatteryLevel(mLayoutPreference.findViewById(R.id.layout_middle), BATTERY_LEVEL_MAIN);
+    }
+
+    @Test
+    public void refresh_connectedUntetheredHeadset_behaveAsExpected() {
+        when(mBluetoothDevice.getMetadata(
+                BluetoothDevice.METADATA_DEVICE_TYPE)).thenReturn(
+                BluetoothDevice.DEVICE_TYPE_UNTETHERED_HEADSET.getBytes());
+        when(mBluetoothDevice.getMetadata(
+                BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET)).thenReturn(
+                String.valueOf(false).getBytes());
+        when(mBluetoothDevice.getMetadata(
+                BluetoothDevice.METADATA_UNTETHERED_LEFT_BATTERY)).thenReturn(
+                String.valueOf(BATTERY_LEVEL_LEFT).getBytes());
+        when(mBluetoothDevice.getMetadata(
+                BluetoothDevice.METADATA_UNTETHERED_RIGHT_BATTERY)).thenReturn(
+                String.valueOf(BATTERY_LEVEL_RIGHT).getBytes());
+        when(mBluetoothDevice.getMetadata(
+                BluetoothDevice.METADATA_UNTETHERED_CASE_BATTERY)).thenReturn(
+                String.valueOf(BATTERY_LEVEL_MAIN).getBytes());
+        when(mCachedDevice.isConnected()).thenReturn(true);
+
+        mController.refresh();
+
+        assertBatteryLevel(mLayoutPreference.findViewById(R.id.layout_left), BATTERY_LEVEL_LEFT);
+        assertBatteryLevel(mLayoutPreference.findViewById(R.id.layout_right), BATTERY_LEVEL_RIGHT);
+        assertBatteryLevel(mLayoutPreference.findViewById(R.id.layout_middle), BATTERY_LEVEL_MAIN);
+    }
+
+    @Test
     public void refresh_connected_updateCorrectInfo() {
         when(mBluetoothDevice.getMetadata(
+                BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET)).thenReturn(
+                String.valueOf(true).getBytes());
+        when(mBluetoothDevice.getMetadata(
                 BluetoothDevice.METADATA_UNTETHERED_LEFT_BATTERY)).thenReturn(
                 String.valueOf(BATTERY_LEVEL_LEFT).getBytes());
         when(mBluetoothDevice.getMetadata(
@@ -151,6 +204,9 @@
     @Test
     public void refresh_withLowBatteryAndUncharged_showAlertIcon() {
         when(mBluetoothDevice.getMetadata(
+                BluetoothDevice.METADATA_IS_UNTETHERED_HEADSET)).thenReturn(
+                String.valueOf(true).getBytes());
+        when(mBluetoothDevice.getMetadata(
                 BluetoothDevice.METADATA_UNTETHERED_LEFT_BATTERY)).thenReturn(
                 String.valueOf(LOW_BATTERY_LEVEL).getBytes());
         when(mBluetoothDevice.getMetadata(
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
index fcc7f51..e0a61fe 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
@@ -58,6 +58,7 @@
 
     private static final String MAC_ADDRESS = "04:52:C7:0B:D8:3C";
     private static final String SUB_MAC_ADDRESS = "05:52:C7:0B:D8:3C";
+    private static final String TEST_NAME = "test_name";
 
     @Mock
     private DashboardFragment mDashboardFragment;
@@ -256,4 +257,15 @@
         verify(mDevicePreferenceCallback).onDeviceRemoved(mPreference);
         assertThat(mBluetoothDeviceUpdater.mPreferenceMap.containsKey(mBluetoothDevice)).isFalse();
     }
+
+    @Test
+    public void havePreference_refreshPreference() {
+        mBluetoothDeviceUpdater.mPreferenceMap.put(mBluetoothDevice, mPreference);
+        mPreference.setTitle("fake_name");
+
+        when(mCachedBluetoothDevice.getName()).thenReturn(TEST_NAME);
+        mBluetoothDeviceUpdater.refreshPreference();
+
+        assertThat(mPreference.getTitle()).isEqualTo(TEST_NAME);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPermissionActivityTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPermissionActivityTest.java
new file mode 100644
index 0000000..4dd568b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPermissionActivityTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.content.Intent;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(RobolectricTestRunner.class)
+public class BluetoothPermissionActivityTest {
+
+    private BluetoothPermissionActivity mActivity;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        mActivity = new BluetoothPermissionActivity();
+    }
+
+    @Test
+    public void callingPackageIsEqualToReturnPackage_sendBroadcastToReturnPackage() {
+        mActivity.mReturnPackage = "com.android.settings";
+        mActivity.mReturnClass = "com.android.settings.bluetooth.BluetoothPermissionActivity";
+        mActivity.mCallingAppPackageName = "com.android.settings";
+        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+        ReflectionHelpers.setField(mActivity, "mBase", mContext);
+
+        mActivity.sendReplyIntentToReceiver(true, true);
+
+        verify(mContext).sendBroadcast(intentCaptor.capture(),
+                eq("android.permission.BLUETOOTH_ADMIN"));
+        assertThat(intentCaptor.getValue().getComponent().getPackageName())
+                .isEqualTo("com.android.settings");
+    }
+
+    @Test
+    public void callingPackageIsNotEqualToReturnPackage_broadcastNotSend() {
+        mActivity.mReturnPackage = "com.fake.settings";
+        mActivity.mReturnClass = "com.android.settings.bluetooth.BluetoothPermissionActivity";
+        mActivity.mCallingAppPackageName = "com.android.settings";
+        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+        ReflectionHelpers.setField(mActivity, "mBase", mContext);
+
+        mActivity.sendReplyIntentToReceiver(true, true);
+
+        verify(mContext, never()).sendBroadcast(intentCaptor.capture(),
+                eq("android.permission.BLUETOOTH_ADMIN"));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java
index feaf683..f5635a9 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java
@@ -16,28 +16,46 @@
 
 package com.android.settings.bluetooth;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.eq;
+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.bluetooth.BluetoothDevice;
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
 public class DevicePickerFragmentTest {
 
     @Mock
     private BluetoothProgressCategory mAvailableDevicesCategory;
+
     private DevicePickerFragment mFragment;
+    private Context mContext;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
         mFragment = new DevicePickerFragment();
-
+        mContext = spy(RuntimeEnvironment.application);
+        mFragment.mContext = mContext;
         mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory;
     }
 
@@ -49,4 +67,40 @@
 
         verify(mAvailableDevicesCategory).setProgress(true);
     }
+
+    @Test
+    public void callingPackageIsEqualToLaunchPackage_sendBroadcastToLaunchPackage() {
+        final CachedBluetoothDevice cachedDevice = mock(CachedBluetoothDevice.class);
+        final BluetoothDevice bluetoothDevice = mock(BluetoothDevice.class);
+        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+        when(cachedDevice.getDevice()).thenReturn(bluetoothDevice);
+        mFragment.mSelectedDevice = bluetoothDevice;
+        mFragment.mLaunchPackage = "com.android.settings";
+        mFragment.mLaunchClass = "com.android.settings.bluetooth.BluetoothPermissionActivity";
+        mFragment.mCallingAppPackageName = "com.android.settings";
+
+        mFragment.onDeviceBondStateChanged(cachedDevice, BluetoothDevice.BOND_BONDED);
+
+        verify(mContext).sendBroadcast(intentCaptor.capture(),
+                eq("android.permission.BLUETOOTH_ADMIN"));
+        assertThat(intentCaptor.getValue().getComponent().getPackageName())
+                .isEqualTo(mFragment.mLaunchPackage);
+    }
+
+    @Test
+    public void callingPackageIsNotEqualToLaunchPackage_broadcastNotSend() {
+        final CachedBluetoothDevice cachedDevice = mock(CachedBluetoothDevice.class);
+        final BluetoothDevice bluetoothDevice = mock(BluetoothDevice.class);
+        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+        when(cachedDevice.getDevice()).thenReturn(bluetoothDevice);
+        mFragment.mSelectedDevice = bluetoothDevice;
+        mFragment.mLaunchPackage = "com.fake.settings";
+        mFragment.mLaunchClass = "com.android.settings.bluetooth.BluetoothPermissionActivity";
+        mFragment.mCallingAppPackageName = "com.android.settings";
+
+        mFragment.onDeviceBondStateChanged(cachedDevice, BluetoothDevice.BOND_BONDED);
+
+        verify(mContext, never()).sendBroadcast(intentCaptor.capture(),
+                eq("android.permission.BLUETOOTH_ADMIN"));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
index ad630ff..da1c493 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
@@ -157,9 +157,11 @@
     public void testRegister() {
         // register the callback in onStart()
         mAvailableMediaDeviceGroupController.onStart();
+
         verify(mAvailableMediaBluetoothDeviceUpdater).registerCallback();
         verify(mLocalBluetoothManager.getEventManager()).registerCallback(
                 any(BluetoothCallback.class));
+        verify(mAvailableMediaBluetoothDeviceUpdater).refreshPreference();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
index 946d639..4c85713 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
@@ -139,9 +139,11 @@
     public void onStart_shouldRegisterUpdaters() {
         // register the callback in onStart()
         mConnectedDeviceGroupController.onStart();
+
         verify(mConnectedBluetoothDeviceUpdater).registerCallback();
         verify(mConnectedUsbDeviceUpdater).registerCallback();
         verify(mConnectedDockUpdater).registerCallback();
+        verify(mConnectedBluetoothDeviceUpdater).refreshPreference();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
index 420b1a4..0e03365 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
@@ -147,13 +147,16 @@
     public void callbackCanRegisterAndUnregister() {
         // register the callback in onStart()
         mPreConnectedDeviceController.onStart();
+
         verify(mBluetoothDeviceUpdater).registerCallback();
         verify(mDockUpdater).registerCallback();
         verify(mContext).registerReceiver(mPreConnectedDeviceController.mReceiver,
                 mPreConnectedDeviceController.mIntentFilter);
+        verify(mBluetoothDeviceUpdater).refreshPreference();
 
         // unregister the callback in onStop()
         mPreConnectedDeviceController.onStop();
+
         verify(mBluetoothDeviceUpdater).unregisterCallback();
         verify(mDockUpdater).unregisterCallback();
         verify(mContext).unregisterReceiver(mPreConnectedDeviceController.mReceiver);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java
index 6c6cf47..d2c44f9 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java
@@ -79,8 +79,10 @@
     public void testRegister() {
         // register the callback in onStart()
         mSavedDeviceGroupController.onStart();
+
         verify(mBluetoothDeviceUpdater).registerCallback();
         verify(mSavedDockUpdater).registerCallback();
+        verify(mBluetoothDeviceUpdater).refreshPreference();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java
index b816a18..b3f732f 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java
@@ -34,7 +34,7 @@
 import android.hardware.usb.UsbManager;
 import android.hardware.usb.UsbPort;
 import android.hardware.usb.UsbPortStatus;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 
@@ -57,7 +57,7 @@
     @Mock
     private UserManager mUserManager;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private UsbPort mUsbPort;
     @Mock
@@ -69,8 +69,8 @@
         when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_MIDI))
                 .thenReturn(true);
         when((Object) mContext.getSystemService(UsbManager.class)).thenReturn(mUsbManager);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
+        when((Object) mContext.getSystemService(
+                TetheringManager.class)).thenReturn(mTetheringManager);
         when(mUsbManager.getPorts()).thenReturn(Collections.singletonList(mUsbPort));
         when(mUsbPortStatus.isConnected()).thenReturn(true);
         when(mUsbPort.getStatus()).thenReturn(mUsbPortStatus);
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 4afe22a..3108150 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
@@ -18,11 +18,12 @@
 
 import static android.hardware.usb.UsbPortStatus.DATA_ROLE_DEVICE;
 import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SINK;
-import static android.net.ConnectivityManager.TETHERING_USB;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -30,7 +31,7 @@
 import static org.mockito.Mockito.when;
 
 import android.hardware.usb.UsbManager;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 
 import androidx.preference.PreferenceScreen;
 
@@ -50,7 +51,7 @@
     @Mock
     private UsbBackend mUsbBackend;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
 
     private UsbDefaultFragment mFragment;
 
@@ -59,7 +60,7 @@
         MockitoAnnotations.initMocks(this);
         mFragment = new TestFragment();
         mFragment.mUsbBackend = mUsbBackend;
-        mFragment.mConnectivityManager = mConnectivityManager;
+        mFragment.mTetheringManager = mTetheringManager;
     }
 
     @Test
@@ -136,8 +137,9 @@
 
         mFragment.setDefaultKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_RNDIS));
 
-        verify(mConnectivityManager).startTethering(TETHERING_USB, true,
-                mFragment.mOnStartTetheringCallback);
+        verify(mTetheringManager).startTethering(eq(TetheringManager.TETHERING_USB),
+                any(),
+                eq(mFragment.mOnStartTetheringCallback));
         assertThat(mFragment.mPreviousFunctions).isEqualTo(
                 UsbManager.FUNCTION_MTP);
     }
@@ -222,6 +224,32 @@
         assertThat(mFragment.mCurrentFunctions).isEqualTo(UsbManager.FUNCTION_MIDI);
     }
 
+    @Test
+    public void usbIsPluginAndUsbTetheringIsOn_startTetheringIsInvoked() {
+        when(mUsbBackend.getDefaultUsbFunctions()).thenReturn(UsbManager.FUNCTION_RNDIS);
+
+        mFragment.mUsbConnectionListener.onUsbConnectionChanged(false /* connected */,
+                UsbManager.FUNCTION_RNDIS, POWER_ROLE_SINK, DATA_ROLE_DEVICE);
+        mFragment.mUsbConnectionListener.onUsbConnectionChanged(true /* connected */,
+                UsbManager.FUNCTION_RNDIS, POWER_ROLE_SINK, DATA_ROLE_DEVICE);
+
+        verify(mTetheringManager).startTethering(eq(TetheringManager.TETHERING_USB),
+                any(),
+                eq(mFragment.mOnStartTetheringCallback));
+    }
+
+    @Test
+    public void usbIsNotPluginAndUsbTetheringIsOn_startTetheringIsNotInvoked() {
+        when(mUsbBackend.getDefaultUsbFunctions()).thenReturn(UsbManager.FUNCTION_RNDIS);
+
+        mFragment.mUsbConnectionListener.onUsbConnectionChanged(false /* connected */,
+                UsbManager.FUNCTION_RNDIS, POWER_ROLE_SINK, DATA_ROLE_DEVICE);
+
+        verify(mTetheringManager, never()).startTethering(eq(TetheringManager.TETHERING_USB),
+                any(),
+                eq(mFragment.mOnStartTetheringCallback));
+    }
+
     public static class TestFragment extends UsbDefaultFragment {
         public final PreferenceScreen mScreen;
 
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 3ea2756..9118645 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
@@ -18,11 +18,12 @@
 
 import static android.hardware.usb.UsbPortStatus.DATA_ROLE_DEVICE;
 import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SINK;
-import static android.net.ConnectivityManager.TETHERING_USB;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -31,7 +32,7 @@
 
 import android.content.Context;
 import android.hardware.usb.UsbManager;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 
 import androidx.fragment.app.FragmentActivity;
 import androidx.preference.PreferenceCategory;
@@ -73,7 +74,7 @@
     @Mock
     private FragmentActivity mActivity;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
 
     @Before
     public void setUp() {
@@ -89,7 +90,7 @@
         when(mFragment.getContext()).thenReturn(mContext);
         when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
         when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
-        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
+        when(mContext.getSystemService(TetheringManager.class)).thenReturn(mTetheringManager);
 
         mDetailsFunctionsController = new UsbDetailsFunctionsController(mContext, mFragment,
                 mUsbBackend);
@@ -245,8 +246,9 @@
 
         mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);
 
-        verify(mConnectivityManager).startTethering(TETHERING_USB, true,
-                mDetailsFunctionsController.mOnStartTetheringCallback);
+        verify(mTetheringManager).startTethering(eq(TetheringManager.TETHERING_USB),
+                any(),
+                eq(mDetailsFunctionsController.mOnStartTetheringCallback));
         assertThat(mDetailsFunctionsController.mPreviousFunction).isEqualTo(
                 UsbManager.FUNCTION_MTP);
     }
@@ -295,15 +297,16 @@
         mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);
 
         verify(mUsbBackend, never()).setCurrentFunctions(UsbManager.FUNCTION_PTP);
-        verify(mConnectivityManager, never()).startTethering(TETHERING_USB, true,
-                mDetailsFunctionsController.mOnStartTetheringCallback);
+        verify(mTetheringManager, never()).startTethering(eq(TetheringManager.TETHERING_USB),
+                any(),
+                eq(mDetailsFunctionsController.mOnStartTetheringCallback));
     }
 
     @Test
     public void onTetheringFailed_resetPreviousFunctions() {
         mDetailsFunctionsController.mPreviousFunction = UsbManager.FUNCTION_PTP;
 
-        mDetailsFunctionsController.mOnStartTetheringCallback.onTetheringFailed();
+        mDetailsFunctionsController.mOnStartTetheringCallback.onTetheringFailed(0);
 
         verify(mUsbBackend).setCurrentFunctions(UsbManager.FUNCTION_PTP);
     }
diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
index 3fdb7b4..861b4e3 100644
--- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
@@ -36,8 +36,8 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
-import android.net.ConnectivityManager;
 import android.net.NetworkPolicyManager;
 import android.os.Bundle;
 
@@ -72,9 +72,9 @@
     @Mock
     private NetworkPolicyEditor mNetworkPolicyEditor;
     @Mock
-    private ConnectivityManager mConnectivityManager;
-    @Mock
     private NetworkPolicyManager mNetworkPolicyManager;
+    @Mock
+    private PackageManager mMockPackageManager;
 
     private Context mContext;
     @Mock
@@ -157,9 +157,8 @@
             .onCreatePreferences(any(Bundle.class), nullable(String.class));
         when(mContext.getSystemService(Context.NETWORK_POLICY_SERVICE))
             .thenReturn(mNetworkPolicyManager);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-            .thenReturn(mConnectivityManager);
-        when(mConnectivityManager.isNetworkSupported(anyInt())).thenReturn(true);
+        when(mContext.getPackageManager()).thenReturn(mMockPackageManager);
+        when(mMockPackageManager.hasSystemFeature(any())).thenReturn(true);
         final SwitchPreference preference = mock(SwitchPreference.class);
         when(billingCycleSettings.findPreference(anyString())).thenReturn(preference);
 
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
index 4a5bc70..6a7f237 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
@@ -16,13 +16,14 @@
 
 package com.android.settings.datausage;
 
-import static android.net.ConnectivityManager.TYPE_WIFI;
+import static android.content.pm.PackageManager.FEATURE_WIFI;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 
 import static com.google.common.truth.Truth.assertThat;
 
 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;
@@ -31,7 +32,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.net.ConnectivityManager;
+import android.content.pm.PackageManager;
 import android.net.NetworkTemplate;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -104,7 +105,7 @@
     @Mock
     private TelephonyManager mTelephonyManager;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private PackageManager mPm;
 
     private DataUsageInfoController mDataInfoController;
 
@@ -138,10 +139,9 @@
         doReturn(mTelephonyManager).when(mActivity).getSystemService(TelephonyManager.class);
         doReturn(mTelephonyManager).when(mTelephonyManager)
                 .createForSubscriptionId(mDefaultSubscriptionId);
-        when(mActivity.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
+        doReturn(mPm).when(mActivity).getPackageManager();
+        doReturn(false).when(mPm).hasSystemFeature(eq(FEATURE_WIFI));
         doReturn(TelephonyManager.SIM_STATE_READY).when(mTelephonyManager).getSimState();
-        when(mConnectivityManager.isNetworkSupported(TYPE_WIFI)).thenReturn(false);
 
         mController = spy(new DataUsageSummaryPreferenceController(
                 mDataUsageController,
@@ -363,7 +363,7 @@
         final int subscriptionId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
         mController.init(subscriptionId);
         mController.mDataUsageController = mDataUsageController;
-        when(mConnectivityManager.isNetworkSupported(TYPE_WIFI)).thenReturn(true);
+        doReturn(true).when(mPm).hasSystemFeature(eq(FEATURE_WIFI));
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
 
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
index 21f9d1a..a465d74 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
@@ -18,14 +18,15 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 import android.app.usage.NetworkStatsManager;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.telephony.TelephonyManager;
 import android.util.DataUnit;
@@ -38,13 +39,12 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.shadows.ShadowPackageManager;
 
 @RunWith(RobolectricTestRunner.class)
 public final class DataUsageUtilsTest {
 
     @Mock
-    private ConnectivityManager mManager;
-    @Mock
     private TelephonyManager mTelephonyManager;
     @Mock
     private NetworkStatsManager mNetworkStatsManager;
@@ -56,21 +56,20 @@
         MockitoAnnotations.initMocks(this);
         final ShadowApplication shadowContext = ShadowApplication.getInstance();
         mContext = RuntimeEnvironment.application;
-        shadowContext.setSystemService(Context.CONNECTIVITY_SERVICE, mManager);
         shadowContext.setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
         shadowContext.setSystemService(Context.NETWORK_STATS_SERVICE, mNetworkStatsManager);
     }
 
     @Test
     public void mobileDataStatus_whenNetworkIsSupported() {
-        when(mManager.isNetworkSupported(anyInt())).thenReturn(true);
+        when(mTelephonyManager.isDataCapable()).thenReturn(true);
         final boolean hasMobileData = DataUsageUtils.hasMobileData(mContext);
         assertThat(hasMobileData).isTrue();
     }
 
     @Test
     public void mobileDataStatus_whenNetworkIsNotSupported() {
-        when(mManager.isNetworkSupported(anyInt())).thenReturn(false);
+        when(mTelephonyManager.isDataCapable()).thenReturn(false);
         final boolean hasMobileData = DataUsageUtils.hasMobileData(mContext);
         assertThat(hasMobileData).isFalse();
     }
@@ -85,7 +84,8 @@
 
     @Test
     public void hasEthernet_shouldQueryEthernetSummaryForUser() throws Exception {
-        when(mManager.isNetworkSupported(anyInt())).thenReturn(true);
+        ShadowPackageManager pm = shadowOf(RuntimeEnvironment.application.getPackageManager());
+        pm.setSystemFeature(PackageManager.FEATURE_ETHERNET, true);
         final String subscriber = "TestSub";
         when(mTelephonyManager.getSubscriberId()).thenReturn(subscriber);
 
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
index 8a68f38..eb29b7c 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
@@ -18,17 +18,16 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.robolectric.shadow.api.Shadow.extract;
+import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
 import android.provider.Settings;
+import android.telephony.TelephonyManager;
 
 import androidx.preference.Preference;
 
-import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,27 +35,28 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowConnectivityManager.class)
 public class AutoTimeZonePreferenceControllerTest {
 
     @Mock
     private UpdateTimeAndDateCallback mCallback;
-
+    @Mock
     private Context mContext;
     private AutoTimeZonePreferenceController mController;
     private Preference mPreference;
-    private ShadowConnectivityManager connectivityManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
+        mContext = spy(RuntimeEnvironment.application);
+
         mPreference = new Preference(mContext);
-        connectivityManager = extract(mContext.getSystemService(ConnectivityManager.class));
-        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, true);
+
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.isDataCapable()).thenReturn(true);
     }
 
     @Test
@@ -77,8 +77,7 @@
 
     @Test
     public void isWifiOnly_notAvailable() {
-        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
-
+        when(mTelephonyManager.isDataCapable()).thenReturn(false);
         mController = new AutoTimeZonePreferenceController(
                 mContext, null /* callback */, false /* fromSUW */);
 
@@ -95,8 +94,7 @@
 
     @Test
     public void isWifiOnly_notEnable() {
-        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
-
+        when(mTelephonyManager.isDataCapable()).thenReturn(false);
         mController = new AutoTimeZonePreferenceController(
                 mContext, null /* callback */, false /* fromSUW */);
 
diff --git a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
index 0758869..68b2990 100644
--- a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 The Android Open Source Project
+ * Copyright (C) 2020 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,17 @@
 
 package com.android.settings.datetime;
 
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE;
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_SUPPORTED;
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_POSSESSED;
+import static android.app.time.Capabilities.CAPABILITY_NOT_APPLICABLE;
+import static android.app.time.Capabilities.CAPABILITY_NOT_SUPPORTED;
+import static android.app.time.Capabilities.CAPABILITY_POSSESSED;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.app.time.Capabilities;
 import android.app.time.TimeManager;
 import android.app.time.TimeZoneCapabilities;
 import android.app.time.TimeZoneCapabilitiesAndConfig;
@@ -62,9 +64,33 @@
     }
 
     @Test
+    public void setChecked_withTrue_shouldUpdateSetting() {
+        // Simulate the UI being clicked.
+        mController.setChecked(true);
+
+        // Verify the TimeManager was updated with the UI value.
+        TimeZoneConfiguration expectedConfiguration = new TimeZoneConfiguration.Builder()
+                .setGeoDetectionEnabled(true)
+                .build();
+        verify(mTimeManager).updateTimeZoneConfiguration(expectedConfiguration);
+    }
+
+    @Test
+    public void setChecked_withFalse_shouldUpdateSetting() {
+        // Simulate the UI being clicked.
+        mController.setChecked(false);
+
+        // Verify the TimeManager was updated with the UI value.
+        TimeZoneConfiguration expectedConfiguration = new TimeZoneConfiguration.Builder()
+                .setGeoDetectionEnabled(false)
+                .build();
+        verify(mTimeManager).updateTimeZoneConfiguration(expectedConfiguration);
+    }
+
+    @Test
     public void testLocationTimeZoneDetection_supported_shouldBeShown() {
         TimeZoneCapabilities capabilities =
-                createTimeZoneCapabilities(/* geoDetectionSupported= */ true);
+                createTimeZoneCapabilities(CAPABILITY_POSSESSED);
         TimeZoneConfiguration configuration = createTimeZoneConfig(/* geoDetectionEnabled= */ true);
         TimeZoneCapabilitiesAndConfig capabilitiesAndConfig =
                 new TimeZoneCapabilitiesAndConfig(capabilities, configuration);
@@ -76,7 +102,7 @@
     @Test
     public void testLocationTimeZoneDetection_unsupported_shouldNotBeShown() {
         TimeZoneCapabilities capabilities =
-                createTimeZoneCapabilities(/* geoDetectionSupported= */ false);
+                createTimeZoneCapabilities(CAPABILITY_NOT_SUPPORTED);
         TimeZoneConfiguration configuration = createTimeZoneConfig(/* geoDetectionEnabled= */ true);
         TimeZoneCapabilitiesAndConfig capabilitiesAndConfig =
                 new TimeZoneCapabilitiesAndConfig(capabilities, configuration);
@@ -91,20 +117,34 @@
     @Test
     public void testLocationTimeZoneDetection_summary_geoDetectionEnabled() {
         TimeZoneCapabilities capabilities =
-                createTimeZoneCapabilities(/* geoDetectionSupported= */ true);
+                createTimeZoneCapabilities(CAPABILITY_POSSESSED);
         TimeZoneConfiguration configuration = createTimeZoneConfig(/* geoDetectionEnabled= */ true);
         TimeZoneCapabilitiesAndConfig capabilitiesAndConfig =
                 new TimeZoneCapabilitiesAndConfig(capabilities, configuration);
 
         when(mTimeManager.getTimeZoneCapabilitiesAndConfig()).thenReturn(capabilitiesAndConfig);
-        assertThat(mController.getSummary()).isEqualTo(
-                mContext.getString(R.string.location_time_zone_detection_on));
+        assertThat(mController.getSummary().toString()).isEmpty();
     }
 
-    private static TimeZoneCapabilities createTimeZoneCapabilities(boolean geoDetectionSupported) {
+    @Test
+    public void testLocationTimeZoneDetection_toggleIsOn_whenGeoDetectionEnabledAnsMlsIsOff() {
+        TimeZoneCapabilities capabilities =
+                createTimeZoneCapabilities(CAPABILITY_NOT_APPLICABLE);
+        TimeZoneConfiguration configuration = createTimeZoneConfig(/* geoDetectionEnabled= */ true);
+        TimeZoneCapabilitiesAndConfig capabilitiesAndConfig =
+                new TimeZoneCapabilitiesAndConfig(capabilities, configuration);
+
+        when(mTimeManager.getTimeZoneCapabilitiesAndConfig()).thenReturn(capabilitiesAndConfig);
+        when(mLocationManager.isLocationEnabled()).thenReturn(false);
+
+        assertThat(mController.isChecked()).isTrue();
+        assertThat(mController.getSummary()).isEqualTo(
+                mContext.getString(R.string.location_app_permission_summary_location_off));
+    }
+
+    private static TimeZoneCapabilities createTimeZoneCapabilities(
+            @Capabilities.CapabilityState int geoDetectionCapability) {
         UserHandle arbitraryUserHandle = UserHandle.of(123);
-        int geoDetectionCapability =
-                geoDetectionSupported ? CAPABILITY_POSSESSED : CAPABILITY_NOT_SUPPORTED;
         return new TimeZoneCapabilities.Builder(arbitraryUserHandle)
                 .setConfigureAutoDetectionEnabledCapability(CAPABILITY_POSSESSED)
                 .setConfigureGeoDetectionEnabledCapability(geoDetectionCapability)
diff --git a/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettingsTest.java b/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettingsTest.java
deleted file mode 100644
index 9f16492..0000000
--- a/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettingsTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datetime.locationtimezone;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.provider.SearchIndexableResource;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-public class TimeZoneDetectionSettingsTest {
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-    }
-
-    @Test
-    public void searchProvider_shouldIndexDefaultXml() {
-        final List<SearchIndexableResource> sir =
-                TimeZoneDetectionSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        mContext, /* enabled= */ true);
-
-        assertThat(sir).hasSize(1);
-        assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.location_time_zone_detection);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceControllerTest.java
deleted file mode 100644
index 27a9859..0000000
--- a/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceControllerTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.datetime.locationtimezone;
-
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE;
-import static android.app.time.TimeZoneCapabilities.CAPABILITY_POSSESSED;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.time.TimeManager;
-import android.app.time.TimeZoneCapabilities;
-import android.app.time.TimeZoneCapabilitiesAndConfig;
-import android.app.time.TimeZoneConfiguration;
-import android.content.Context;
-import android.os.UserHandle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class TimeZoneDetectionTogglePreferenceControllerTest {
-
-    private static final String PREF_KEY = "test_key";
-
-    @Mock
-    private Context mContext;
-
-    @Mock
-    private TimeManager mTimeManager;
-    private TimeZoneDetectionTogglePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(TimeManager.class)).thenReturn(mTimeManager);
-
-        mController = new TimeZoneDetectionTogglePreferenceController(mContext, PREF_KEY);
-    }
-
-    @Test
-    public void isAvailable_shouldReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isChecked_whenEnabled_shouldReturnTrue() {
-        when(mTimeManager.getTimeZoneCapabilitiesAndConfig())
-                .thenReturn(createTimeZoneCapabilitiesAndConfig(true));
-
-        assertThat(mController.isChecked()).isTrue();
-    }
-
-    @Test
-    public void isChecked_whenDisabled_shouldReturnFalse() {
-        when(mTimeManager.getTimeZoneCapabilitiesAndConfig())
-                .thenReturn(createTimeZoneCapabilitiesAndConfig(false));
-
-        assertThat(mController.isChecked()).isFalse();
-    }
-
-    @Test
-    public void setChecked_withTrue_shouldUpdateSetting() {
-        // Simulate the UI being clicked.
-        mController.setChecked(true);
-
-        // Verify the TimeManager was updated with the UI value.
-        TimeZoneConfiguration expectedConfiguration = new TimeZoneConfiguration.Builder()
-                .setGeoDetectionEnabled(true)
-                .build();
-        verify(mTimeManager).updateTimeZoneConfiguration(expectedConfiguration);
-    }
-
-    @Test
-    public void setChecked_withFalse_shouldUpdateSetting() {
-        // Simulate the UI being clicked.
-        mController.setChecked(false);
-
-        // Verify the TimeManager was updated with the UI value.
-        TimeZoneConfiguration expectedConfiguration = new TimeZoneConfiguration.Builder()
-                .setGeoDetectionEnabled(false)
-                .build();
-        verify(mTimeManager).updateTimeZoneConfiguration(expectedConfiguration);
-    }
-
-    private static TimeZoneCapabilitiesAndConfig createTimeZoneCapabilitiesAndConfig(
-            boolean geoDetectionEnabled) {
-        UserHandle arbitraryUserHandle = UserHandle.of(123);
-        TimeZoneCapabilities capabilities = new TimeZoneCapabilities.Builder(arbitraryUserHandle)
-                .setConfigureAutoDetectionEnabledCapability(CAPABILITY_POSSESSED)
-                .setConfigureGeoDetectionEnabledCapability(CAPABILITY_POSSESSED)
-                .setSuggestManualTimeZoneCapability(CAPABILITY_NOT_APPLICABLE)
-                .build();
-        TimeZoneConfiguration configuration = new TimeZoneConfiguration.Builder()
-                .setAutoDetectionEnabled(true)
-                .setGeoDetectionEnabled(geoDetectionEnabled)
-                .build();
-        return new TimeZoneCapabilitiesAndConfig(capabilities, configuration);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreferenceTest.java
index 8a34930..323486e 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/BaseBluetoothDialogPreferenceTest.java
@@ -105,6 +105,7 @@
     public void onBindDialogView_checkRadioButtonsText() {
         when(mView.findViewById(ID1)).thenReturn(mRadioButton1);
         when(mView.findViewById(ID2)).thenReturn(mRadioButton2);
+        when(mView.findViewById(TEXT_VIEW_ID)).thenReturn(mTextView);
 
         assertThat(mRadioButton1.getText()).isNotEqualTo(BUTTON1);
         assertThat(mRadioButton2.getText()).isNotEqualTo(BUTTON2);
@@ -118,6 +119,7 @@
     public void onBindDialogView_checkRadioButtonsState() {
         when(mView.findViewById(ID1)).thenReturn(mRadioButton1);
         when(mView.findViewById(ID2)).thenReturn(mRadioButton2);
+        when(mView.findViewById(TEXT_VIEW_ID)).thenReturn(mTextView);
         List<Integer> indexes = new ArrayList<>();
         indexes.add(0);
         when(mCallback.getSelectableIndex()).thenReturn(indexes);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
index 1b9c487..464d9a2 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
@@ -35,10 +35,10 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
 public class RegulatoryInfoPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
index aad3f30..d96473b 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
@@ -34,10 +34,10 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
 public class StorageSettingsTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceControllerTest.java
index 8230144..87fdb22 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceControllerTest.java
@@ -21,45 +21,42 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.robolectric.shadow.api.Shadow.extract;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
 import android.sysprop.TelephonyProperties;
-
-import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+import android.telephony.TelephonyManager;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 import java.util.Arrays;
 
-
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowConnectivityManager.class)
 public class BasebandVersionPreferenceControllerTest {
-
+    @Mock
     private Context mContext;
     private BasebandVersionPreferenceController mController;
+    @Mock
+    private TelephonyManager mTelephonyManager;
 
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
+        mContext = spy(RuntimeEnvironment.application);
         mController = new BasebandVersionPreferenceController(mContext, "key");
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
     }
 
     @Test
     public void getAvailability_wifiOnly_unavailable() {
-        final ShadowConnectivityManager connectivityManager =
-                extract(mContext.getSystemService(ConnectivityManager.class));
-        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
-
+        when(mTelephonyManager.isDataCapable()).thenReturn(false);
         assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
     }
 
@@ -67,10 +64,7 @@
     public void getAvailability_hasMobile_available() {
         final String text = "test";
         TelephonyProperties.baseband_version(Arrays.asList(new String[]{text}));
-        ShadowConnectivityManager connectivityManager =
-                extract(mContext.getSystemService(ConnectivityManager.class));
-        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, true);
-
+        when(mTelephonyManager.isDataCapable()).thenReturn(true);
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/display/PeakRefreshRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/PeakRefreshRatePreferenceControllerTest.java
index cae7d89..aaeeea4 100644
--- a/tests/robotests/src/com/android/settings/display/PeakRefreshRatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/PeakRefreshRatePreferenceControllerTest.java
@@ -24,6 +24,7 @@
 
 import android.content.Context;
 import android.provider.Settings;
+import android.view.Display;
 
 import androidx.preference.SwitchPreference;
 
@@ -102,6 +103,21 @@
         assertThat(mController.isChecked()).isFalse();
     }
 
+    @Test
+    public void findPeakRefreshRate_moreThanOneHigherThanDefault() {
+        Display.Mode lower = new Display.Mode(0, 0, 0, DEFAULT_REFRESH_RATE - 1);
+        Display.Mode def = new Display.Mode(0, 0, 0, DEFAULT_REFRESH_RATE);
+        Display.Mode higher = new Display.Mode(0, 0, 0, DEFAULT_REFRESH_RATE + 1);
+        Display.Mode higher1 = new Display.Mode(0, 0, 0, DEFAULT_REFRESH_RATE + 2);
+
+        assertThat(mController.findPeakRefreshRate(
+                new Display.Mode[] {lower, def, higher, higher1}))
+                .isEqualTo(DEFAULT_REFRESH_RATE + 2);
+        assertThat(mController.findPeakRefreshRate(
+                new Display.Mode[] {lower, def, higher1, higher}))
+                .isEqualTo(DEFAULT_REFRESH_RATE + 2);
+    }
+
     private void enableSmoothDisplayPreference() {
         mController.mPeakRefreshRate = 88f;
 
diff --git a/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
index efc45e0..771a863 100644
--- a/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
@@ -23,6 +23,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -39,6 +40,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.RestrictedLockUtils;
 
 import org.junit.Before;
@@ -77,6 +79,7 @@
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest();
         mContext = spy(getApplicationContext());
         mSettings = spy(new ScreenTimeoutSettings());
         mContentResolver = mContext.getContentResolver();
@@ -138,6 +141,7 @@
     public void updateCandidates_enforcedAdmin_showDisabledByAdminPreference() {
         mSettings.mAdmin = new RestrictedLockUtils.EnforcedAdmin();
         mSettings.mDisableOptionsPreference = mDisableOptionsPreference;
+        doNothing().when(mSettings).setupDisabledFooterPreference();
 
         mSettings.updateCandidates();
 
diff --git a/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java
index b65785f..cc3b20d 100644
--- a/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java
@@ -108,6 +108,25 @@
     }
 
     @Test
+    public void updatePreference_settingsIsOff_noSmartAuto_shouldTurnOffToggle() {
+        disableAutoRotation();
+        Settings.Secure.putStringForUser(mContentResolver,
+                CAMERA_AUTOROTATE, null, UserHandle.USER_CURRENT);
+
+        assertThat(mController.getSummary()).isEqualTo("Off");
+
+    }
+
+    @Test
+    public void updatePreference_settingsIsOn_noSmartAuto_shouldTurnOnToggle() {
+        enableAutoRotation();
+        Settings.Secure.putStringForUser(mContentResolver,
+                CAMERA_AUTOROTATE, null, UserHandle.USER_CURRENT);
+
+        assertThat(mController.getSummary()).isEqualTo("On");
+    }
+
+    @Test
     public void testGetAvailabilityStatus() {
         assertThat(mController.getAvailabilityStatus()).isEqualTo(BasePreferenceController
                 .UNSUPPORTED_ON_DEVICE);
diff --git a/tests/robotests/src/com/android/settings/display/TopLevelWallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TopLevelWallpaperPreferenceControllerTest.java
index 7b3ae65..6ad9974 100644
--- a/tests/robotests/src/com/android/settings/display/TopLevelWallpaperPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/TopLevelWallpaperPreferenceControllerTest.java
@@ -202,4 +202,20 @@
         assertThat(Shadows.shadowOf(mContext).getNextStartedActivityForResult()
                 .intent.hasExtra("com.android.wallpaper.LAUNCH_SOURCE")).isTrue();
     }
+
+    @Test
+    public void handlePreferenceTreeClick_launchClearTask() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList());
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+
+        Preference preference = new Preference(mContext);
+        preference.setKey(TEST_KEY);
+
+        mController.handlePreferenceTreeClick(preference);
+
+        assertThat((Shadows.shadowOf(mContext).getNextStartedActivityForResult()
+                .intent.getFlags() & Intent.FLAG_ACTIVITY_CLEAR_TASK) != 0).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java
index 65fa187..8d38509 100644
--- a/tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceControllerTest.java
@@ -105,7 +105,7 @@
     }
 
     @Test
-    public void getAvailabilityStatus_noSuitableIntent_shouldReturnUnsupported() {
+    public void getAvailabilityStatus_noSuitableIntent_shouldReturnAvailable() {
         SettingsShadowResources.overrideResource(
                 R.bool.config_show_emergency_gesture_settings,
                 Boolean.TRUE);
@@ -117,7 +117,8 @@
         EmergencyGestureEntrypointPreferenceController controller =
                 new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
 
-        assertThat(controller.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+        assertThat(controller.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+        assertThat(controller.mIntent).isNull();
     }
 
     private void prepareCustomIntent() {
diff --git a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
index ff3a36f..5c3dacd 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.enterprise;
 
+import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_FINANCED;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -107,9 +109,7 @@
     @Test
     public void testSetAdminSupportTitle() {
         final ViewGroup view = new FrameLayout(mActivity);
-        final TextView textView = new TextView(mActivity);
-        textView.setId(R.id.admin_support_dialog_title);
-        view.addView(textView);
+        final TextView textView = createAdminSupportDialogTitleTextView(view, mActivity);
 
         mHelper.setAdminSupportTitle(view, UserManager.DISALLOW_ADJUST_VOLUME);
         assertEquals(Shadows.shadowOf(textView).innerText(),
@@ -145,6 +145,19 @@
     }
 
     @Test
+    public void testSetAdminSupportTitleForFinancedDevice() {
+        final ShadowDevicePolicyManager dpmShadow = ShadowDevicePolicyManager.getShadow();
+        final ViewGroup view = new FrameLayout(mActivity);
+        final TextView textView = createAdminSupportDialogTitleTextView(view, mActivity);
+        setupFinancedDevice(dpmShadow);
+
+        mHelper.setAdminSupportTitle(view, null);
+
+        assertEquals(Shadows.shadowOf(textView).innerText(),
+                mActivity.getString(R.string.disabled_by_policy_title_financed_device));
+    }
+
+    @Test
     public void testSetAdminSupportDetails() {
         final ShadowDevicePolicyManager dpmShadow = ShadowDevicePolicyManager.getShadow();
         final UserManager userManager = RuntimeEnvironment.application.getSystemService(
@@ -154,37 +167,57 @@
         final ComponentName component = new ComponentName("some.package.name",
                 "some.package.name.SomeClass");
         final EnforcedAdmin admin = new EnforcedAdmin(component, UserHandle.of(123));
-        final TextView textView = new TextView(mActivity);
-
-        textView.setId(R.id.admin_support_msg);
-        view.addView(textView);
+        final TextView textView = createAdminSupportTextView(view, mActivity);
         dpmShadow.setShortSupportMessageForUser(component, 123, "some message");
         dpmShadow.setIsAdminActiveAsUser(true);
-        userManagerShadow.addProfile(new UserInfo(123, null, 0));
-        userManagerShadow.addUserProfile(new UserHandle(123));
-        ShadowProcess.setUid(Process.SYSTEM_UID);
+        createShadowWorkProfile(userManagerShadow);
 
         mHelper.setAdminSupportDetails(mActivity, view, admin);
+
         assertNotNull(admin.component);
         assertEquals("some message", Shadows.shadowOf(textView).innerText());
     }
 
     @Test
+    public void testSetAdminSupportDetails_shortSupportMessageIsNull() {
+        final ShadowDevicePolicyManager dpmShadow = ShadowDevicePolicyManager.getShadow();
+        final UserManager userManager = RuntimeEnvironment.application.getSystemService(
+                UserManager.class);
+        final ShadowUserManager userManagerShadow = Shadow.extract(userManager);
+        final ViewGroup view = new FrameLayout(mActivity);
+        final ComponentName component = new ComponentName("some.package.name",
+                "some.package.name.SomeClass");
+        final EnforcedAdmin admin = new EnforcedAdmin(component, UserHandle.of(123));
+        final TextView textView = createAdminSupportTextView(view, mActivity);
+        dpmShadow.setShortSupportMessageForUser(component, 123, null);
+        dpmShadow.setIsAdminActiveAsUser(true);
+        createShadowWorkProfile(userManagerShadow);
+
+        mHelper.setAdminSupportDetails(mActivity, view, admin);
+
+        assertNotNull(admin.component);
+        assertEquals("", Shadows.shadowOf(textView).innerText());
+    }
+
+    @Test
     public void testSetAdminSupportDetailsNotAdmin() {
         final ShadowDevicePolicyManager dpmShadow = ShadowDevicePolicyManager.getShadow();
         final UserManager userManager = RuntimeEnvironment.application.getSystemService(
                 UserManager.class);
         final ShadowUserManager userManagerShadow = Shadow.extract(userManager);
+        final ViewGroup view = new FrameLayout(mActivity);
         final ComponentName component = new ComponentName("some.package.name",
                 "some.package.name.SomeClass");
         final EnforcedAdmin admin = new EnforcedAdmin(component, UserHandle.of(123));
-
+        final TextView textView = createAdminSupportTextView(view, mActivity);
         dpmShadow.setShortSupportMessageForUser(component, 123, "some message");
         dpmShadow.setIsAdminActiveAsUser(false);
         userManagerShadow.addProfile(new UserInfo(123, null, 0));
 
-        mHelper.setAdminSupportDetails(mActivity, null, admin);
+        mHelper.setAdminSupportDetails(mActivity, textView, admin);
+
         assertNull(admin.component);
+        assertEquals("", Shadows.shadowOf(textView).innerText());
     }
 
     @Test
@@ -210,4 +243,36 @@
         mHelper.maybeSetLearnMoreButton(builder);
         verify(builder, never()).setNeutralButton(anyInt(), any());
     }
+
+    private static TextView createAdminSupportDialogTitleTextView(final ViewGroup view,
+            final Activity activity) {
+        final TextView textView = new TextView(activity);
+        textView.setId(R.id.admin_support_dialog_title);
+        view.addView(textView);
+        return textView;
+    }
+
+    private static TextView createAdminSupportTextView(final ViewGroup view,
+            final Activity activity) {
+        final TextView textView = new TextView(activity);
+        textView.setId(R.id.admin_support_msg);
+        view.addView(textView);
+        return textView;
+    }
+
+    private static void createShadowWorkProfile(final ShadowUserManager userManagerShadow) {
+        userManagerShadow.addProfile(new UserInfo(123, null, 0));
+        userManagerShadow.addUserProfile(new UserHandle(123));
+        ShadowProcess.setUid(Process.SYSTEM_UID);
+    }
+
+    private static void setupFinancedDevice(final ShadowDevicePolicyManager dpmShadow) {
+        final ComponentName component = new ComponentName("some.package.name",
+                "some.package.name.SomeClass");
+        dpmShadow.setDeviceOwner(component);
+        dpmShadow.setDeviceOwnerComponentOnAnyUser(component);
+        dpmShadow.setDeviceOwnerType(component, DEVICE_OWNER_TYPE_FINANCED);
+        dpmShadow.setShortSupportMessageForUser(component, 123, null);
+        dpmShadow.setIsAdminActiveAsUser(true);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
index 11676a2..71eaffc 100644
--- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
@@ -24,12 +24,9 @@
 import android.net.ConnectivityManager;
 import android.net.ProxyInfo;
 
-import androidx.preference.Preference;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -39,7 +36,7 @@
 
     private static final String KEY_GLOBAL_HTTP_PROXY = "global_http_proxy";
 
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    @Mock
     private Context mContext;
     @Mock
     private ConnectivityManager mCm;
@@ -49,6 +46,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mCm);
         mController = new GlobalHttpProxyPreferenceController(mContext);
     }
 
@@ -62,12 +60,6 @@
     }
 
     @Test
-    public void testHandlePreferenceTreeClick() {
-        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
-                .isFalse();
-    }
-
-    @Test
     public void testGetPreferenceKey() {
         assertThat(mController.getPreferenceKey()).isEqualTo(KEY_GLOBAL_HTTP_PROXY);
     }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 8eeac8d..7f76c70 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -47,8 +47,6 @@
 import androidx.preference.Preference;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.testutils.FakeFeatureFactory;
@@ -114,12 +112,6 @@
     @Mock
     private BatteryEntry mBatteryEntry;
     @Mock
-    private BatterySipper mBatterySipper;
-    @Mock
-    private BatteryStatsHelper mBatteryStatsHelper;
-    @Mock
-    private BatteryStats.Uid mUid;
-    @Mock
     private PackageManager mPackageManager;
     @Mock
     private AppOpsManager mAppOpsManager;
@@ -140,6 +132,7 @@
         MockitoAnnotations.initMocks(this);
 
         mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getPackageName()).thenReturn("foo");
         FakeFeatureFactory.setupForTest();
 
         mFragment = spy(new AdvancedPowerUsageDetail());
@@ -168,19 +161,11 @@
         doReturn(mEntityHeaderController).when(mEntityHeaderController)
                 .setSummary(nullable(String.class));
 
-        doReturn(UID).when(mBatterySipper).getUid();
+        when(mBatteryEntry.getUid()).thenReturn(UID);
         when(mBatteryEntry.getLabel()).thenReturn(APP_LABEL);
-        doReturn(BACKGROUND_TIME_US).when(mUid).getProcessStateTime(
-                eq(BatteryStats.Uid.PROCESS_STATE_BACKGROUND), anyLong(), anyInt());
-        doReturn(PROCSTATE_TOP_TIME_US).when(mUid).getProcessStateTime(
-                eq(BatteryStats.Uid.PROCESS_STATE_TOP), anyLong(), anyInt());
-        doReturn(mForegroundActivityTimer).when(mUid).getForegroundActivityTimer();
-        doReturn(FOREGROUND_ACTIVITY_TIME_US).when(mForegroundActivityTimer)
-                .getTotalTimeLocked(anyLong(), anyInt());
-        ReflectionHelpers.setField(mBatteryEntry, "sipper", mBatterySipper);
+        when(mBatteryEntry.getTimeInBackgroundMs()).thenReturn(BACKGROUND_TIME_MS);
+        when(mBatteryEntry.getTimeInForegroundMs()).thenReturn(FOREGROUND_TIME_MS);
         mBatteryEntry.iconId = ICON_ID;
-        mBatterySipper.uidObj = mUid;
-        mBatterySipper.drainType = BatterySipper.DrainType.APP;
 
         mFragment.mHeaderPreference = mHeaderPreference;
         mFragment.mState = mState;
@@ -200,6 +185,7 @@
 
         Answer<Void> callable = invocation -> {
             mBundle = captor.getValue().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
+            System.out.println("mBundle = " + mBundle);
             return null;
         };
         doAnswer(callable).when(mActivity).startActivityAsUser(captor.capture(),
@@ -262,8 +248,8 @@
 
     @Test
     public void testStartBatteryDetailPage_hasBasicData() {
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils, mFragment,
-                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT);
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment,
+                mBatteryEntry, USAGE_PERCENT);
 
         assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
         assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME))
@@ -275,28 +261,11 @@
     }
 
     @Test
-    public void testStartBatteryDetailPage_typeNotApp_hasBasicData() {
-        mBatterySipper.drainType = BatterySipper.DrainType.PHONE;
-        mBatterySipper.usageTimeMs = PHONE_FOREGROUND_TIME_MS;
-
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils, mFragment,
-                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT);
-
-        assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
-        assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME))
-            .isEqualTo(PHONE_FOREGROUND_TIME_MS);
-        assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME))
-            .isEqualTo(PHONE_BACKGROUND_TIME_MS);
-        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT))
-            .isEqualTo(USAGE_PERCENT);
-    }
-
-    @Test
     public void testStartBatteryDetailPage_NormalApp() {
-        mBatterySipper.mPackages = PACKAGE_NAME;
-        mBatteryEntry.defaultPackageName = PACKAGE_NAME[0];
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils, mFragment,
-                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT);
+        when(mBatteryEntry.getDefaultPackageName()).thenReturn(PACKAGE_NAME[0]);
+
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment,
+                mBatteryEntry, USAGE_PERCENT);
 
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(
                 PACKAGE_NAME[0]);
@@ -304,9 +273,10 @@
 
     @Test
     public void testStartBatteryDetailPage_SystemApp() {
-        mBatterySipper.mPackages = null;
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils, mFragment,
-                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT);
+        when(mBatteryEntry.getDefaultPackageName()).thenReturn(null);
+
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment,
+                mBatteryEntry, USAGE_PERCENT);
 
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_LABEL)).isEqualTo(APP_LABEL);
         assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_ICON_ID)).isEqualTo(ICON_ID);
@@ -316,23 +286,22 @@
     @Test
     public void testStartBatteryDetailPage_WorkApp() {
         final int appUid = 1010019;
-        mBatterySipper.mPackages = PACKAGE_NAME;
-        doReturn(appUid).when(mBatterySipper).getUid();
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils, mFragment,
-                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT);
+        doReturn(appUid).when(mBatteryEntry).getUid();
+
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment,
+                mBatteryEntry, USAGE_PERCENT);
 
         verify(mActivity).startActivityAsUser(any(Intent.class), eq(new UserHandle(10)));
     }
 
     @Test
     public void testStartBatteryDetailPage_typeUser_startByCurrentUser() {
-        mBatterySipper.drainType = BatterySipper.DrainType.USER;
-        mBatterySipper.userId = 10;
+        when(mBatteryEntry.isUserEntry()).thenReturn(true);
 
         final int currentUser = 20;
         ShadowActivityManager.setCurrentUser(currentUser);
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils, mFragment,
-                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT);
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mFragment,
+                mBatteryEntry, USAGE_PERCENT);
 
         verify(mActivity).startActivityAsUser(any(Intent.class), eq(new UserHandle(currentUser)));
     }
@@ -365,18 +334,6 @@
     }
 
     @Test
-    public void testStartBatteryDetailPage_defaultPackageNull_chooseFromBatterySipper() {
-        mBatteryEntry.defaultPackageName = null;
-        mBatteryEntry.sipper.mPackages = PACKAGE_NAME;
-
-        AdvancedPowerUsageDetail.startBatteryDetailPage(mActivity, mBatteryUtils, mFragment,
-                mBatteryStatsHelper, 0, mBatteryEntry, USAGE_PERCENT);
-
-        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME))
-            .isEqualTo(PACKAGE_NAME[0]);
-    }
-
-    @Test
     public void testInitPreference_hasCorrectSummary() {
         Bundle bundle = new Bundle(4);
         bundle.putLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME, BACKGROUND_TIME_MS);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java
index 28655f3..1faa75f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java
@@ -20,21 +20,16 @@
 
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.os.BatteryStats;
 import android.os.UserManager;
-import android.text.TextUtils;
 import android.text.format.DateUtils;
 
 import androidx.preference.PreferenceGroup;
 
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsImpl;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -51,13 +46,9 @@
 @RunWith(RobolectricTestRunner.class)
 public class BatteryAppListPreferenceControllerTest {
 
-    private static final String[] PACKAGE_NAMES = {"com.app1", "com.app2"};
     private static final String KEY_APP_LIST = "app_list";
-    private static final int UID = 123;
 
     @Mock
-    private BatterySipper mNormalBatterySipper;
-    @Mock
     private SettingsActivity mSettingsActivity;
     @Mock
     private PreferenceGroup mAppListGroup;
@@ -69,6 +60,8 @@
     private PackageManager mPackageManager;
     @Mock
     private UserManager mUserManager;
+    @Mock
+    private BatteryEntry mBatteryEntry;
 
     private Context mContext;
     private PowerGaugePreference mPreference;
@@ -87,138 +80,68 @@
         FakeFeatureFactory.setupForTest();
 
         mPreference = new PowerGaugePreference(mContext);
-        when(mNormalBatterySipper.getPackages()).thenReturn(PACKAGE_NAMES);
-        when(mNormalBatterySipper.getUid()).thenReturn(UID);
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-        mNormalBatterySipper.uidObj = mock(BatteryStats.Uid.class);
 
         mPreferenceController = new BatteryAppListPreferenceController(mContext, KEY_APP_LIST, null,
                 mSettingsActivity, mFragment);
         mPreferenceController.mBatteryUtils = mBatteryUtils;
         mPreferenceController.mAppListGroup = mAppListGroup;
-    }
 
-    @Test
-    public void testExtractKeyFromSipper_typeAPPUidObjectNull_returnPackageNames() {
-        mNormalBatterySipper.uidObj = null;
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-
-        final String key = mPreferenceController.extractKeyFromSipper(mNormalBatterySipper);
-        assertThat(key).isEqualTo(TextUtils.concat(mNormalBatterySipper.getPackages()).toString());
-    }
-
-    @Test
-    public void testExtractKeyFromSipper_typeOther_returnDrainType() {
-        mNormalBatterySipper.uidObj = null;
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.BLUETOOTH;
-
-        final String key = mPreferenceController.extractKeyFromSipper(mNormalBatterySipper);
-        assertThat(key).isEqualTo(mNormalBatterySipper.drainType.toString());
-    }
-
-    @Test
-    public void testExtractKeyFromSipper_typeUser_returnDrainTypeWithUserId() {
-        mNormalBatterySipper.uidObj = null;
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.USER;
-        mNormalBatterySipper.userId = 2;
-
-        final String key = mPreferenceController.extractKeyFromSipper(mNormalBatterySipper);
-        assertThat(key).isEqualTo("USER2");
-    }
-
-    @Test
-    public void testExtractKeyFromSipper_typeAPPUidObjectNotNull_returnUid() {
-        mNormalBatterySipper.uidObj = new BatteryStatsImpl.Uid(new BatteryStatsImpl(), UID);
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-
-        final String key = mPreferenceController.extractKeyFromSipper(mNormalBatterySipper);
-        assertThat(key).isEqualTo(Integer.toString(mNormalBatterySipper.getUid()));
+        BatteryAppListPreferenceController.sConfig =
+                new BatteryAppListPreferenceController.Config() {
+                    @Override
+                    public boolean shouldShowBatteryAttributionList(Context context) {
+                        return true;
+                    }
+                };
     }
 
     @Test
     public void testSetUsageSummary_timeLessThanOneMinute_DoNotSetSummary() {
-        mNormalBatterySipper.usageTimeMs = 59 * DateUtils.SECOND_IN_MILLIS;
+        when(mBatteryEntry.getTimeInForegroundMs()).thenReturn(59 * DateUtils.SECOND_IN_MILLIS);
 
-        mPreferenceController.setUsageSummary(mPreference, mNormalBatterySipper);
+        mPreferenceController.setUsageSummary(mPreference, mBatteryEntry);
         assertThat(mPreference.getSummary()).isNull();
     }
 
     @Test
     public void testSetUsageSummary_timeMoreThanOneMinute_normalApp_setScreenSummary() {
-        mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
+        when(mBatteryEntry.getTimeInForegroundMs()).thenReturn(2 * DateUtils.MINUTE_IN_MILLIS);
         doReturn(mContext.getText(R.string.battery_used_for)).when(mFragment).getText(
                 R.string.battery_used_for);
         doReturn(mContext).when(mFragment).getContext();
 
-        mPreferenceController.setUsageSummary(mPreference, mNormalBatterySipper);
+        mPreferenceController.setUsageSummary(mPreference, mBatteryEntry);
 
         assertThat(mPreference.getSummary().toString()).isEqualTo("Used for 2 min");
     }
 
     @Test
     public void testSetUsageSummary_timeMoreThanOneMinute_GoogleApp_shouldNotSetScreenSummary() {
-        mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
-        mNormalBatterySipper.packageWithHighestDrain = "com.google.android.googlequicksearchbox";
+        when(mBatteryEntry.getTimeInForegroundMs()).thenReturn(2 * DateUtils.MINUTE_IN_MILLIS);
+        when(mBatteryEntry.getDefaultPackageName())
+                .thenReturn("com.google.android.googlequicksearchbox");
         doReturn(mContext.getText(R.string.battery_used_for)).when(mFragment).getText(
                 R.string.battery_used_for);
         doReturn(mContext).when(mFragment).getContext();
 
-        mPreferenceController.setUsageSummary(mPreference, mNormalBatterySipper);
+        mPreferenceController.setUsageSummary(mPreference, mBatteryEntry);
 
         assertThat(mPreference.getSummary()).isNull();
     }
 
     @Test
     public void testSetUsageSummary_timeMoreThanOneMinute_hiddenApp_setUsedSummary() {
-        mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
-        doReturn(true).when(mBatteryUtils).shouldHideSipper(mNormalBatterySipper);
+        when(mBatteryEntry.getTimeInForegroundMs()).thenReturn(2 * DateUtils.MINUTE_IN_MILLIS);
+        when(mBatteryEntry.isHidden()).thenReturn(true);
+
         doReturn(mContext).when(mFragment).getContext();
 
-        mPreferenceController.setUsageSummary(mPreference, mNormalBatterySipper);
+        mPreferenceController.setUsageSummary(mPreference, mBatteryEntry);
 
         assertThat(mPreference.getSummary().toString()).isEqualTo("2 min");
     }
 
     @Test
-    public void testSetUsageSummary_timeMoreThanOneMinute_notApp_setUsedSummary() {
-        mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.PHONE;
-        doReturn(mContext).when(mFragment).getContext();
-
-        mPreferenceController.setUsageSummary(mPreference, mNormalBatterySipper);
-
-        assertThat(mPreference.getSummary().toString()).isEqualTo("2 min");
-    }
-
-    @Test
-    public void testShouldHideSipper_typeOvercounted_returnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.OVERCOUNTED;
-
-        assertThat(mPreferenceController.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_typeUnaccounted_returnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.UNACCOUNTED;
-
-        assertThat(mPreferenceController.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_typeNormal_returnFalse() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-
-        assertThat(mPreferenceController.shouldHideSipper(mNormalBatterySipper)).isFalse();
-    }
-
-    @Test
-    public void testShouldHideSipper_hiddenSystemModule_returnTrue() {
-        when(mBatteryUtils.isHiddenSystemModule(mNormalBatterySipper)).thenReturn(true);
-
-        assertThat(mPreferenceController.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
     public void testNeverUseFakeData() {
         assertThat(BatteryAppListPreferenceController.USE_FAKE_DATA).isFalse();
     }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
index a072988..5f08698 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
@@ -78,7 +78,6 @@
 
     @Test
     @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryStatsHelperLoader.class,
             BatteryFixSliceTest.ShadowBatteryTipLoader.class
     })
     public void testOnReceive_batteryLevelChanged_dataUpdated() {
@@ -93,7 +92,6 @@
 
     @Test
     @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryStatsHelperLoader.class,
             BatteryFixSliceTest.ShadowBatteryTipLoader.class
     })
     public void testOnReceive_batteryHealthChanged_dataUpdated() {
@@ -108,7 +106,6 @@
 
     @Test
     @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryStatsHelperLoader.class,
             BatteryFixSliceTest.ShadowBatteryTipLoader.class
     })
     public void onReceive_batteryNotPresent_shouldShowHelpMessage() {
@@ -121,7 +118,6 @@
 
     @Test
     @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryStatsHelperLoader.class,
             BatteryFixSliceTest.ShadowBatteryTipLoader.class
     })
     public void testOnReceive_powerSaveModeChanged_listenerInvoked() {
@@ -133,7 +129,6 @@
 
     @Test
     @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryStatsHelperLoader.class,
             BatteryFixSliceTest.ShadowBatteryTipLoader.class
     })
     public void testOnReceive_batteryDataNotChanged_listenerNotInvoked() {
@@ -154,7 +149,6 @@
 
     @Test
     @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryStatsHelperLoader.class,
             BatteryFixSliceTest.ShadowBatteryTipLoader.class
     })
     public void testRegister_updateBatteryStatus() {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
index e40b270..6858579 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
@@ -17,6 +17,9 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -24,18 +27,21 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.BatteryConsumer;
 import android.os.Handler;
 import android.os.Process;
+import android.os.SystemBatteryConsumer;
+import android.os.UidBatteryConsumer;
+import android.os.UserBatteryConsumer;
 import android.os.UserManager;
 
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatterySipper.DrainType;
 import com.android.settings.R;
 
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
@@ -50,121 +56,153 @@
     private static final int APP_UID = 123;
     private static final int SYSTEM_UID = Process.SYSTEM_UID;
     private static final String APP_DEFAULT_PACKAGE_NAME = "com.android.test";
-    private static final String APP_LABEL = "Test App Name";
+    private static final String LABEL_PREFIX = "Label for ";
     private static final String HIGH_DRAIN_PACKAGE = "com.android.test.screen";
     private static final String ANDROID_PACKAGE = "android";
-    private static final String[] SYSTEM_PACKAGES = {HIGH_DRAIN_PACKAGE, ANDROID_PACKAGE};
 
     @Rule public MockitoRule mocks = MockitoJUnit.rule();
 
-    @Mock private Context mockContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mMockContext;
     @Mock private Handler mockHandler;
     @Mock private PackageManager mockPackageManager;
     @Mock private UserManager mockUserManager;
+    @Mock private UidBatteryConsumer mUidBatteryConsumer;
+    @Mock private SystemBatteryConsumer mSystemBatteryConsumer;
 
     @Before
     public void stubContextToReturnMockPackageManager() {
-        when(mockContext.getPackageManager()).thenReturn(mockPackageManager);
+        when(mMockContext.getPackageManager()).thenReturn(mockPackageManager);
     }
 
     @Before
     public void stubPackageManagerToReturnAppPackageAndName() throws NameNotFoundException {
-        when(mockPackageManager.getPackagesForUid(APP_UID))
-            .thenReturn(new String[] {APP_DEFAULT_PACKAGE_NAME});
-
-        ApplicationInfo appInfo = mock(ApplicationInfo.class);
-        when(mockPackageManager.getApplicationInfo(APP_DEFAULT_PACKAGE_NAME, 0 /* no flags */))
-            .thenReturn(appInfo);
-        when(mockPackageManager.getApplicationLabel(appInfo)).thenReturn(APP_LABEL);
+        when(mockPackageManager.getApplicationInfo(anyString(), eq(0) /* no flags */))
+                .thenAnswer(invocation -> {
+                    ApplicationInfo info = new ApplicationInfo();
+                    info.packageName = invocation.getArgument(0);
+                    return info;
+                });
+        when(mockPackageManager.getApplicationLabel(any(ApplicationInfo.class)))
+                .thenAnswer(invocation -> LABEL_PREFIX
+                        + ((ApplicationInfo) invocation.getArgument(0)).packageName);
     }
 
-    private BatteryEntry createBatteryEntryForApp() {
-        return new BatteryEntry(mockContext, mockHandler, mockUserManager, createSipperForApp(),
-                null);
+    private BatteryEntry createBatteryEntryForApp(String[] packages, String packageName,
+            String highDrainPackage) {
+        UidBatteryConsumer consumer = mock(UidBatteryConsumer.class);
+        when(consumer.getUid()).thenReturn(APP_UID);
+        when(consumer.getPackageWithHighestDrain()).thenReturn(highDrainPackage);
+        return new BatteryEntry(mMockContext, mockHandler, mockUserManager,
+                consumer, false, packages, packageName);
     }
 
-    private BatterySipper createSipperForApp() {
-        BatterySipper sipper =
-            new BatterySipper(DrainType.APP, new FakeUid(APP_UID), 0 /* power use */);
-        sipper.packageWithHighestDrain = HIGH_DRAIN_PACKAGE;
-        return sipper;
+    private BatteryEntry createSystemBatteryEntry(int drainType) {
+        SystemBatteryConsumer consumer = mock(SystemBatteryConsumer.class);
+        when(consumer.getDrainType()).thenReturn(drainType);
+        return new BatteryEntry(mMockContext, mockHandler, mockUserManager,
+                consumer, false, null, null);
     }
 
-    private BatteryEntry createBatteryEntryForSystem() {
-        return new BatteryEntry(mockContext, mockHandler, mockUserManager, createSipperForSystem(),
-                null);
-    }
-
-    private BatterySipper createSipperForSystem() {
-        BatterySipper sipper =
-                new BatterySipper(DrainType.APP, new FakeUid(SYSTEM_UID), 0 /* power use */);
-        sipper.packageWithHighestDrain = HIGH_DRAIN_PACKAGE;
-        sipper.mPackages = SYSTEM_PACKAGES;
-        return sipper;
+    private BatteryEntry createUserBatteryConsumer(int userId) {
+        UserBatteryConsumer consumer = mock(UserBatteryConsumer.class);
+        when(consumer.getUserId()).thenReturn(userId);
+        return new BatteryEntry(mMockContext, mockHandler, mockUserManager,
+                consumer, false, null, null);
     }
 
     @Test
     public void batteryEntryForApp_shouldSetDefaultPackageNameAndLabel() throws Exception {
-        BatteryEntry entry = createBatteryEntryForApp();
+        BatteryEntry entry = createBatteryEntryForApp(null, APP_DEFAULT_PACKAGE_NAME,
+                HIGH_DRAIN_PACKAGE);
 
-        assertThat(entry.defaultPackageName).isEqualTo(APP_DEFAULT_PACKAGE_NAME);
-        assertThat(entry.getLabel()).isEqualTo(APP_LABEL);
+        assertThat(entry.getDefaultPackageName()).isEqualTo(APP_DEFAULT_PACKAGE_NAME);
+        assertThat(entry.getLabel()).isEqualTo(LABEL_PREFIX + APP_DEFAULT_PACKAGE_NAME);
     }
 
     @Test
     public void batteryEntryForApp_shouldSetLabelAsPackageName_whenPackageCannotBeFound()
-        throws Exception {
-      when(mockPackageManager.getApplicationInfo(APP_DEFAULT_PACKAGE_NAME, 0 /* no flags */))
-          .thenThrow(new NameNotFoundException());
+            throws Exception {
+        when(mockPackageManager.getApplicationInfo(APP_DEFAULT_PACKAGE_NAME, 0 /* no flags */))
+                .thenThrow(new NameNotFoundException());
 
-      BatteryEntry entry = createBatteryEntryForApp();
+        BatteryEntry entry = createBatteryEntryForApp(null, APP_DEFAULT_PACKAGE_NAME, null);
 
-      assertThat(entry.getLabel()).isEqualTo(APP_DEFAULT_PACKAGE_NAME);
+        assertThat(entry.getLabel()).isEqualTo(APP_DEFAULT_PACKAGE_NAME);
     }
 
     @Test
     public void batteryEntryForApp_shouldSetHighestDrainPackage_whenPackagesCannotBeFoundForUid() {
         when(mockPackageManager.getPackagesForUid(APP_UID)).thenReturn(null);
 
-        BatteryEntry entry = createBatteryEntryForApp();
+        BatteryEntry entry = createBatteryEntryForApp(null, null, HIGH_DRAIN_PACKAGE);
 
-        assertThat(entry.getLabel()).isEqualTo(HIGH_DRAIN_PACKAGE);
+        assertThat(entry.getLabel()).isEqualTo(LABEL_PREFIX + HIGH_DRAIN_PACKAGE);
     }
 
     @Test
     public void batteryEntryForApp_shouldSetHighestDrainPackage_whenMultiplePackagesFoundForUid() {
-        when(mockPackageManager.getPackagesForUid(APP_UID))
-            .thenReturn(new String[] {APP_DEFAULT_PACKAGE_NAME, "package2", "package3"});
+        BatteryEntry entry = createBatteryEntryForApp(
+                new String[] {APP_DEFAULT_PACKAGE_NAME, "package2", "package3"}, null,
+                HIGH_DRAIN_PACKAGE);
 
-        BatteryEntry entry = createBatteryEntryForApp();
-
-        assertThat(entry.getLabel()).isEqualTo(HIGH_DRAIN_PACKAGE);
+        assertThat(entry.getLabel()).isEqualTo(LABEL_PREFIX + HIGH_DRAIN_PACKAGE);
     }
 
     @Test
     public void batteryEntryForAOD_containCorrectInfo() {
-        final BatterySipper batterySipper = mock(BatterySipper.class);
-        batterySipper.drainType = DrainType.AMBIENT_DISPLAY;
+        final SystemBatteryConsumer systemBatteryConsumer = mock(SystemBatteryConsumer.class);
+        when(systemBatteryConsumer.getDrainType())
+                .thenReturn(SystemBatteryConsumer.DRAIN_TYPE_AMBIENT_DISPLAY);
         final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler,
-                mockUserManager, batterySipper, null);
+                mockUserManager, systemBatteryConsumer, false, null, null);
 
         assertThat(entry.iconId).isEqualTo(R.drawable.ic_settings_aod);
         assertThat(entry.name).isEqualTo("Ambient display");
     }
 
     @Test
-    public void extractPackageFromSipper_systemSipper_returnSystemPackage() {
-        BatteryEntry entry = createBatteryEntryForSystem();
+    public void getTimeInForegroundMs_app() {
+        final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler,
+                mockUserManager, mUidBatteryConsumer, false, null, null);
 
-        assertThat(entry.extractPackagesFromSipper(entry.sipper))
-            .isEqualTo(new String[] {ANDROID_PACKAGE});
+        when(mUidBatteryConsumer.getTimeInStateMs(UidBatteryConsumer.STATE_FOREGROUND))
+                .thenReturn(100L);
+
+        assertThat(entry.getTimeInForegroundMs()).isEqualTo(100L);
     }
 
     @Test
-    public void extractPackageFromSipper_normalSipper_returnDefaultPackage() {
-        BatteryEntry entry = createBatteryEntryForApp();
+    public void getTimeInForegroundMs_systemConsumer() {
+        final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler,
+                mockUserManager, mSystemBatteryConsumer, false, null, null);
 
-        assertThat(entry.extractPackagesFromSipper(entry.sipper)).isEqualTo(entry.sipper.mPackages);
+        when(mSystemBatteryConsumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE))
+                .thenReturn(100L);
+
+        assertThat(entry.getTimeInForegroundMs()).isEqualTo(100L);
+    }
+
+    @Test
+    public void getTimeInBackgroundMs_app() {
+        final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler,
+                mockUserManager, mUidBatteryConsumer, false, null, null);
+
+        when(mUidBatteryConsumer.getTimeInStateMs(UidBatteryConsumer.STATE_BACKGROUND))
+                .thenReturn(100L);
+
+        assertThat(entry.getTimeInBackgroundMs()).isEqualTo(100L);
+    }
+
+    @Test
+    public void getTimeInBackgroundMs_systemConsumer() {
+        final BatteryEntry entry = new BatteryEntry(RuntimeEnvironment.application, mockHandler,
+                mockUserManager, mSystemBatteryConsumer, false, null, null);
+
+        when(mSystemBatteryConsumer.getUsageDurationMillis(BatteryConsumer.TIME_COMPONENT_USAGE))
+                .thenReturn(100L);
+
+        assertThat(entry.getTimeInBackgroundMs()).isEqualTo(0);
     }
 
     @Test
@@ -176,7 +214,29 @@
         assertThat(BatteryEntry.sUidCache).isNotEmpty();
 
         Locale.setDefault(new Locale("zh_TW"));
-        createBatteryEntryForApp();
+        createBatteryEntryForApp(null, null, HIGH_DRAIN_PACKAGE);
         assertThat(BatteryEntry.sUidCache).isEmpty(); // check if cache is clear
     }
+
+    @Test
+    public void getKey_UidBatteryConsumer() {
+        final BatteryEntry entry = createBatteryEntryForApp(null, null, null);
+        final String key = entry.getKey();
+        assertThat(key).isEqualTo("123");
+    }
+
+    @Test
+    public void getKey_SystemBatteryConsumer_returnDrainType() {
+        final BatteryEntry entry =
+                createSystemBatteryEntry(SystemBatteryConsumer.DRAIN_TYPE_BLUETOOTH);
+        final String key = entry.getKey();
+        assertThat(key).isEqualTo("S|2");
+    }
+
+    @Test
+    public void getKey_UserBatteryConsumer_returnUserId() {
+        final BatteryEntry entry = createUserBatteryConsumer(2);
+        final String key = entry.getKey();
+        assertThat(key).isEqualTo("U|2");
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
index 6593767..5bcaf0a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
@@ -19,23 +19,23 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.content.Intent;
-import android.os.BatteryStats;
+import android.os.BatteryStatsManager;
+import android.os.BatteryUsageStats;
+import android.os.BatteryUsageStatsQuery;
 
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.testutils.BatteryTestUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -46,10 +46,10 @@
 
     private static final long TEST_TIME_REMAINING = 1000L;
 
-    @Mock (answer = Answers.RETURNS_DEEP_STUBS)
-    private BatteryStatsHelper mHelper;
-    @Mock (answer = Answers.RETURNS_DEEP_STUBS)
-    private BatteryStats mStats;
+    @Mock
+    private BatteryStatsManager mBatteryStatsManager;
+    @Mock
+    private BatteryUsageStats mBatteryUsageStats;
 
     private Context mContext;
 
@@ -60,8 +60,11 @@
         FakeFeatureFactory.setupForTest().getPowerUsageFeatureProvider(mContext);
 
         doReturn(mContext).when(mContext).getApplicationContext();
-        when(mStats.computeBatteryTimeRemaining(anyLong())).thenReturn(TEST_TIME_REMAINING);
-        doReturn(mStats).when(mHelper).getStats();
+        when(mContext.getSystemService(eq(Context.BATTERY_STATS_SERVICE)))
+                .thenReturn(mBatteryStatsManager);
+        when(mBatteryUsageStats.getBatteryTimeRemainingMs()).thenReturn(TEST_TIME_REMAINING);
+        when(mBatteryStatsManager.getBatteryUsageStats(any(BatteryUsageStatsQuery.class)))
+                .thenReturn(mBatteryUsageStats);
 
         final Intent dischargingBatteryBroadcast = BatteryTestUtils.getDischargingIntent();
         doReturn(dischargingBatteryBroadcast).when(mContext).registerReceiver(any(), any());
@@ -69,8 +72,8 @@
 
     @Test
     public void test_loadInBackground_dischargingOldEstimate_dischargingLabelNotNull() {
-        BatteryInfoLoader loader = new BatteryInfoLoader(mContext, mHelper);
-        loader.batteryUtils = new BatteryUtils(mContext);
+        BatteryInfoLoader loader = new BatteryInfoLoader(mContext);
+        loader.mBatteryUtils = new BatteryUtils(mContext);
 
         BatteryInfo info = loader.loadInBackground();
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index 4c19477..18c5326 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -34,9 +34,11 @@
 import android.content.Intent;
 import android.os.BatteryManager;
 import android.os.BatteryStats;
+import android.os.BatteryUsageStats;
 import android.os.SystemClock;
 import android.util.SparseIntArray;
 
+import com.android.internal.os.BatteryStatsHistoryIterator;
 import com.android.settings.testutils.BatteryTestUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.widget.UsageView;
@@ -46,7 +48,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
@@ -83,9 +84,8 @@
     private Intent mChargingBatteryBroadcast;
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private BatteryStats mBatteryStats;
+    @Mock
+    private BatteryUsageStats mBatteryUsageStats;
 
     @Before
     public void setUp() {
@@ -100,9 +100,10 @@
 
     @Test
     public void testGetBatteryInfo_hasStatusLabel() {
-        doReturn(REMAINING_TIME_NULL).when(mBatteryStats).computeBatteryTimeRemaining(anyLong());
+        doReturn(REMAINING_TIME_NULL).when(mBatteryUsageStats).getBatteryTimeRemainingMs();
         BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext,
-                mDisChargingBatteryBroadcast, mBatteryStats, SystemClock.elapsedRealtime() * 1000,
+                mDisChargingBatteryBroadcast, mBatteryUsageStats,
+                SystemClock.elapsedRealtime() * 1000,
                 true /* shortString */);
 
         assertThat(info.statusLabel).isEqualTo(STATUS_NOT_CHARGING);
@@ -110,28 +111,28 @@
 
     @Test
     public void testGetBatteryInfo_doNotShowChargingMethod_hasRemainingTime() {
-        doReturn(REMAINING_TIME).when(mBatteryStats).computeChargeTimeRemaining(anyLong());
+        doReturn(REMAINING_TIME).when(mBatteryUsageStats).getChargeTimeRemainingMs();
         BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast,
-                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */);
+                mBatteryUsageStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */);
 
         assertThat(info.chargeLabel.toString()).isEqualTo(STATUS_CHARGING_TIME);
     }
 
     @Test
     public void testGetBatteryInfo_doNotShowChargingMethod_noRemainingTime() {
-        doReturn(REMAINING_TIME_NULL).when(mBatteryStats).computeChargeTimeRemaining(anyLong());
+        doReturn(REMAINING_TIME_NULL).when(mBatteryUsageStats).getChargeTimeRemainingMs();
         BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast,
-                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */);
+                mBatteryUsageStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */);
 
         assertThat(info.chargeLabel.toString()).isEqualTo(STATUS_CHARGING_NO_TIME);
     }
 
     @Test
     public void testGetBatteryInfo_pluggedInUsingShortString_usesCorrectData() {
-        doReturn(TEST_CHARGE_TIME_REMAINING).when(mBatteryStats).computeChargeTimeRemaining(
-                anyLong());
+        doReturn(TEST_CHARGE_TIME_REMAINING / 1000)
+                .when(mBatteryUsageStats).getChargeTimeRemainingMs();
         BatteryInfo info = BatteryInfo.getBatteryInfoOld(mContext, mChargingBatteryBroadcast,
-                mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */);
+                mBatteryUsageStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */);
 
         assertThat(info.discharging).isEqualTo(false);
         assertThat(info.chargeLabel.toString()).isEqualTo("50% - 1 min until charged");
@@ -143,10 +144,10 @@
                 true /* isBasedOnUsage */,
                 1000 /* averageDischargeTime */);
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, estimate, SystemClock.elapsedRealtime() * 1000,
+                mBatteryUsageStats, estimate, SystemClock.elapsedRealtime() * 1000,
                 false /* shortString */);
         BatteryInfo info2 = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, estimate, SystemClock.elapsedRealtime() * 1000,
+                mBatteryUsageStats, estimate, SystemClock.elapsedRealtime() * 1000,
                 true /* shortString */);
 
         // We only add special mention for the long string
@@ -163,10 +164,10 @@
                 true /* isBasedOnUsage */,
                 1000 /* averageDischargeTime */);
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, estimate, SystemClock.elapsedRealtime() * 1000,
+                mBatteryUsageStats, estimate, SystemClock.elapsedRealtime() * 1000,
                 false /* shortString */);
         BatteryInfo info2 = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, estimate, SystemClock.elapsedRealtime() * 1000,
+                mBatteryUsageStats, estimate, SystemClock.elapsedRealtime() * 1000,
                 true /* shortString */);
 
         // These should be identical in either case
@@ -183,7 +184,7 @@
                 true /* isBasedOnUsage */,
                 1000 /* averageDischargeTime */);
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, estimate, SystemClock.elapsedRealtime() * 1000,
+                mBatteryUsageStats, estimate, SystemClock.elapsedRealtime() * 1000,
                 false /* shortString */);
 
         assertThat(info.suggestionLabel).doesNotContain(BATTERY_RUN_OUT_PREFIX);
@@ -196,7 +197,7 @@
                 true /* isBasedOnUsage */,
                 1000 /* averageDischargeTime */);
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, estimate, SystemClock.elapsedRealtime() * 1000,
+                mBatteryUsageStats, estimate, SystemClock.elapsedRealtime() * 1000,
                 false /* shortString */);
 
         // Check that strings are showing less than 15 minutes remaining regardless of exact time.
@@ -211,10 +212,10 @@
     @Test
     public void testGetBatteryInfo_basedOnUsageFalse_usesDefaultString() {
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+                mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
                 false /* shortString */);
         BatteryInfo info2 = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+                mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
                 true /* shortString */);
 
         assertThat(info.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);
@@ -223,12 +224,11 @@
 
     @Test
     public void testGetBatteryInfo_charging_usesChargeTime() {
-        doReturn(TEST_CHARGE_TIME_REMAINING)
-                .when(mBatteryStats)
-                .computeChargeTimeRemaining(anyLong());
+        doReturn(TEST_CHARGE_TIME_REMAINING / 1000)
+                .when(mBatteryUsageStats).getChargeTimeRemainingMs();
 
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
-                mBatteryStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+                mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
                 false /* shortString */);
         assertThat(info.remainingTimeUs).isEqualTo(TEST_CHARGE_TIME_REMAINING);
         assertThat(info.remainingLabel.toString())
@@ -240,7 +240,7 @@
         mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_LEVEL, 100);
 
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
-                mBatteryStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+                mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
                 false /* shortString */);
 
         assertThat(info.chargeLabel).isEqualTo("100%");
@@ -249,13 +249,13 @@
     @Test
     public void testGetBatteryInfo_chargingWithOverheated_updateChargeLabel() {
         doReturn(TEST_CHARGE_TIME_REMAINING)
-                .when(mBatteryStats)
-                .computeChargeTimeRemaining(anyLong());
+                .when(mBatteryUsageStats)
+                .getChargeTimeRemainingMs();
         mChargingBatteryBroadcast
                 .putExtra(BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_OVERHEAT);
 
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
-                mBatteryStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+                mBatteryUsageStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
                 false /* shortString */);
 
         assertThat(info.isOverheated).isTrue();
@@ -264,28 +264,29 @@
 
     // Make our battery stats return a sequence of battery events.
     private void mockBatteryStatsHistory() {
-        // Mock out new data every time start...Locked is called.
+        // Mock out new data every time iterateBatteryStatsHistory is called.
         doAnswer(invocation -> {
-            doAnswer(new Answer() {
-                private int count = 0;
-                private long[] times = {1000, 1500, 2000};
-                private byte[] levels = {99, 98, 97};
+            BatteryStatsHistoryIterator iterator = mock(BatteryStatsHistoryIterator.class);
+            doAnswer(new Answer<Boolean>() {
+                private int mCount = 0;
+                private final long[] mTimes = {1000, 1500, 2000};
+                private final byte[] mLevels = {99, 98, 97};
 
                 @Override
-                public Object answer(InvocationOnMock invocation) throws Throwable {
-                    if (count == times.length) {
+                public Boolean answer(InvocationOnMock invocation) throws Throwable {
+                    if (mCount == mTimes.length) {
                         return false;
                     }
                     BatteryStats.HistoryItem record = invocation.getArgument(0);
                     record.cmd = BatteryStats.HistoryItem.CMD_UPDATE;
-                    record.time = times[count];
-                    record.batteryLevel = levels[count];
-                    count++;
+                    record.time = mTimes[mCount];
+                    record.batteryLevel = mLevels[mCount];
+                    mCount++;
                     return true;
                 }
-            }).when(mBatteryStats).getNextHistoryLocked(any(BatteryStats.HistoryItem.class));
-            return true;
-        }).when(mBatteryStats).startIteratingHistoryLocked();
+            }).when(iterator).next(any(BatteryStats.HistoryItem.class));
+            return iterator;
+        }).when(mBatteryUsageStats).iterateBatteryStatsHistory();
     }
 
     private void assertOnlyHistory(BatteryInfo info) {
@@ -337,9 +338,9 @@
 
     private BatteryInfo getBatteryInfo(boolean charging, boolean enhanced, boolean estimate) {
         if (charging && estimate) {
-            doReturn(1000L).when(mBatteryStats).computeChargeTimeRemaining(anyLong());
+            doReturn(1000L).when(mBatteryUsageStats).getChargeTimeRemainingMs();
         } else {
-            doReturn(0L).when(mBatteryStats).computeChargeTimeRemaining(anyLong());
+            doReturn(0L).when(mBatteryUsageStats).getChargeTimeRemainingMs();
         }
         Estimate batteryEstimate = new Estimate(
                 estimate ? 1000 : 0,
@@ -347,7 +348,7 @@
                 1000 /* averageDischargeTime */);
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext,
                 charging ? mChargingBatteryBroadcast : mDisChargingBatteryBroadcast,
-                mBatteryStats, batteryEstimate, SystemClock.elapsedRealtime() * 1000, false);
+                mBatteryUsageStats, batteryEstimate, SystemClock.elapsedRealtime() * 1000, false);
         doReturn(enhanced).when(mFeatureFactory.powerUsageFeatureProvider)
                 .isEnhancedBatteryPredictionEnabled(mContext);
         return info;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
index 4d2910e..b3b8196 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
@@ -17,20 +17,15 @@
 
 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 static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.os.PowerManager;
-import android.view.LayoutInflater;
-import android.widget.LinearLayout;
+import android.provider.Settings;
 
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settings.widget.PrimarySwitchPreference;
+import androidx.preference.Preference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -39,108 +34,84 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(RobolectricTestRunner.class)
 public class BatterySaverControllerTest {
 
     @Mock
+    private Preference mBatterySaverPref;
+    @Mock
     private PowerManager mPowerManager;
 
     private BatterySaverController mBatterySaverController;
-    private PrimarySwitchPreference mBatterySaverPref;
+    private Context mContext;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        final Context mContext = spy(RuntimeEnvironment.application);
 
-        mBatterySaverPref = new PrimarySwitchPreference(mContext);
-        final LayoutInflater inflater = LayoutInflater.from(mContext);
-        final PreferenceViewHolder mHolder =
-                PreferenceViewHolder.createInstanceForTests(inflater.inflate(
-                com.android.settingslib.R.layout.preference_two_target, null));
-        final LinearLayout mWidgetView = mHolder.itemView.findViewById(android.R.id.widget_frame);
-        inflater.inflate(R.layout.restricted_preference_widget_primary_switch, mWidgetView, true);
-        mBatterySaverPref.onBindViewHolder(mHolder);
+        mContext = RuntimeEnvironment.application;
+        mBatterySaverController = spy(new BatterySaverController(mContext));
+        ReflectionHelpers.setField(mBatterySaverController, "mPowerManager", mPowerManager);
+        ReflectionHelpers.setField(mBatterySaverController, "mBatterySaverPref", mBatterySaverPref);
 
-        doReturn(mPowerManager).when(mContext).getSystemService(Context.POWER_SERVICE);
-
-        mBatterySaverController = new BatterySaverController(mContext);
-        mBatterySaverController.mBatterySaverPref = mBatterySaverPref;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
     }
 
     @Test
-    public void onBatteryChanged_true_switchEnabled() {
-        mBatterySaverController.onBatteryChanged(true);
-
-        assertThat(mBatterySaverPref.getSwitch().isEnabled()).isFalse();
+    public void onPreferenceChange_onStart() {
+        mBatterySaverController.onStart();
+        verify(mBatterySaverPref).setSummary("Off");
     }
 
     @Test
-    public void onBatteryChanged_false_switchDisabled() {
-        mBatterySaverController.onBatteryChanged(false);
-
-        assertThat(mBatterySaverPref.getSwitch().isEnabled()).isTrue();
+    public void onPreferenceChange_onPowerSaveModeChanged() {
+        mBatterySaverController.onPowerSaveModeChanged();
+        verify(mBatterySaverPref).setSummary("Off");
     }
 
     @Test
-    public void onPowerSaveModeChanged_differentState_updateToIsChecked() {
+    public void getSummary_batterySaverOn_showSummaryOn() {
         when(mPowerManager.isPowerSaveMode()).thenReturn(true);
 
-        assertThat(mBatterySaverPref.isChecked()).isFalse();
-
-        mBatterySaverController.onPowerSaveModeChanged();
-
-        assertThat(mBatterySaverPref.isChecked()).isTrue();
+        assertThat(mBatterySaverController.getSummary()).isEqualTo("On");
     }
 
     @Test
-    public void onPowerSaveModeChanged_differentState_updateToUnChecked() {
-        mBatterySaverPref.setChecked(true);
-
+    public void getSummary_batterySaverOffButScheduled_showSummaryScheduled() {
         when(mPowerManager.isPowerSaveMode()).thenReturn(false);
-        assertThat(mBatterySaverPref.isChecked()).isTrue();
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 15);
 
-        mBatterySaverController.onPowerSaveModeChanged();
-
-        assertThat(mBatterySaverPref.isChecked()).isFalse();
+        assertThat(mBatterySaverController.getSummary()).isEqualTo("Will turn on at 15%");
     }
 
     @Test
-    public void onPowerSaveModeChanged_sameState_noUpdate() {
+    public void getSummary_batterySaverOffButScheduledZeroPercent_showSummaryOff() {
         when(mPowerManager.isPowerSaveMode()).thenReturn(false);
-        assertThat(mBatterySaverPref.isChecked()).isFalse();
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
 
-        mBatterySaverController.onPowerSaveModeChanged();
-
-        assertThat(mBatterySaverPref.isChecked()).isFalse();
+        assertThat(mBatterySaverController.getSummary()).isEqualTo("Off");
     }
 
     @Test
-    public void setChecked_on_setPowerSaveMode() {
-        mBatterySaverController.setChecked(true);
+    public void getSummary_batterySaverOffButScheduledBasedOnRoutine_showSummaryBasedOnRoutine() {
+        when(mPowerManager.isPowerSaveMode()).thenReturn(false);
+        Settings.Global.putInt(
+                mContext.getContentResolver(),
+                Settings.Global.AUTOMATIC_POWER_SAVE_MODE,
+                PowerManager.POWER_SAVE_MODE_TRIGGER_DYNAMIC);
 
-        verify(mPowerManager).setPowerSaveModeEnabled(true);
+        assertThat(mBatterySaverController.getSummary()).isEqualTo("Based on your routine");
     }
 
     @Test
-    public void setChecked_off_unsetPowerSaveMode() {
-        mBatterySaverController.setChecked(false);
-
-        verify(mPowerManager).setPowerSaveModeEnabled(false);
-    }
-
-    @Test
-    public void isChecked_on_powerSaveModeOn() {
-        when(mPowerManager.isPowerSaveMode()).thenReturn(true);
-
-        assertThat(mBatterySaverController.isChecked()).isTrue();
-    }
-
-    @Test
-    public void isChecked_off_powerSaveModeOff() {
+    public void getSummary_batterySaverOff_showSummaryOff() {
         when(mPowerManager.isPowerSaveMode()).thenReturn(false);
 
-        assertThat(mBatterySaverController.isChecked()).isFalse();
+        assertThat(mBatterySaverController.getSummary()).isEqualTo("Off");
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
deleted file mode 100644
index 92a3dc0..0000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge;
-
-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 static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class BatteryStatsHelperLoaderTest {
-    @Mock
-    private BatteryUtils mBatteryUtils;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
-
-    private Context mContext;
-    private BatteryStatsHelperLoader mBatteryStatsHelperLoader;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mConnectivityManager).when(mContext).getSystemService(
-                Context.CONNECTIVITY_SERVICE);
-
-        mBatteryStatsHelperLoader = spy(new BatteryStatsHelperLoader(mContext));
-        mBatteryStatsHelperLoader.mBatteryUtils = mBatteryUtils;
-    }
-
-    @Test
-    public void testLoadInBackground_loadWithoutBundle() {
-        when(mBatteryStatsHelperLoader.getContext()).thenReturn(mContext);
-        mBatteryStatsHelperLoader.loadInBackground();
-
-        verify(mBatteryUtils).initBatteryStatsHelper(any(), eq(null), any());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUsageStatsLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUsageStatsLoaderTest.java
new file mode 100644
index 0000000..8c47ff6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUsageStatsLoaderTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.fuelgauge;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.BatteryStatsManager;
+import android.os.BatteryUsageStats;
+import android.os.BatteryUsageStatsQuery;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class BatteryUsageStatsLoaderTest {
+    private Context mContext;
+    @Mock
+    private BatteryStatsManager mBatteryStatsManager;
+    @Mock
+    private BatteryUsageStats mBatteryUsageStats;
+    @Captor
+    private ArgumentCaptor<BatteryUsageStatsQuery> mUsageStatsQueryCaptor;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mBatteryStatsManager).when(mContext).getSystemService(
+                Context.BATTERY_STATS_SERVICE);
+    }
+
+    @Test
+    public void testLoadInBackground_loadWithoutHistory() {
+        BatteryUsageStatsLoader loader = new BatteryUsageStatsLoader(
+                mContext, /* includeBatteryHistory */ false);
+
+        when(mBatteryStatsManager.getBatteryUsageStats(mUsageStatsQueryCaptor.capture()))
+                .thenReturn(mBatteryUsageStats);
+
+        loader.loadInBackground();
+
+        final int queryFlags = mUsageStatsQueryCaptor.getValue().getFlags();
+        assertThat(queryFlags
+                & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_HISTORY).isEqualTo(0);
+    }
+
+    @Test
+    public void testLoadInBackground_loadWithHistory() {
+        BatteryUsageStatsLoader loader = new BatteryUsageStatsLoader(
+                mContext, /* includeBatteryHistory */ true);
+
+        when(mBatteryStatsManager.getBatteryUsageStats(mUsageStatsQueryCaptor.capture()))
+                .thenReturn(mBatteryUsageStats);
+
+        loader.loadInBackground();
+
+        final int queryFlags = mUsageStatsQueryCaptor.getValue().getFlags();
+        assertThat(queryFlags
+                & BatteryUsageStatsQuery.FLAG_BATTERY_USAGE_STATS_INCLUDE_HISTORY).isNotEqualTo(0);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index f393da8..775ca40 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -28,11 +28,8 @@
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -48,15 +45,13 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.BatteryStats;
+import android.os.BatteryStatsManager;
+import android.os.BatteryUsageStats;
 import android.os.Build;
-import android.os.Bundle;
 import android.os.Process;
+import android.os.SystemBatteryConsumer;
 import android.os.SystemClock;
-import android.os.UserManager;
-import android.text.format.DateUtils;
 
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper;
 import com.android.settings.fuelgauge.batterytip.AnomalyInfo;
 import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager;
@@ -90,8 +85,6 @@
     private static final long TIME_STATE_TOP_SLEEPING = 2500 * UNIT;
     private static final long TIME_STATE_FOREGROUND = 3000 * UNIT;
     private static final long TIME_STATE_BACKGROUND = 6000 * UNIT;
-    private static final long TIME_FOREGROUND_ZERO = 0;
-    private static final long TIME_FOREGROUND = 100 * DateUtils.MINUTE_IN_MILLIS;
     private static final long TIME_SINCE_LAST_FULL_CHARGE_MS = 120 * 60 * 1000;
     private static final long TIME_SINCE_LAST_FULL_CHARGE_US =
             TIME_SINCE_LAST_FULL_CHARGE_MS * 1000;
@@ -100,18 +93,10 @@
     private static final long TIME_EXPECTED_FOREGROUND = 1500;
     private static final long TIME_EXPECTED_BACKGROUND = 6000;
     private static final long TIME_EXPECTED_ALL = 7500;
-    private static final double BATTERY_SCREEN_USAGE = 300;
-    private static final double BATTERY_IDLE_USAGE = 600;
     private static final double BATTERY_SYSTEM_USAGE = 600;
-    private static final double BATTERY_OVERACCOUNTED_USAGE = 500;
-    private static final double BATTERY_UNACCOUNTED_USAGE = 700;
-    private static final double BATTERY_APP_USAGE = 100;
-    private static final double BATTERY_WIFI_USAGE = 200;
-    private static final double BATTERY_BLUETOOTH_USAGE = 300;
     private static final double TOTAL_BATTERY_USAGE = 1000;
-    private static final double HIDDEN_USAGE = 200;
     private static final int DISCHARGE_AMOUNT = 80;
-    private static final double PERCENT_SYSTEM_USAGE = 60;
+    private static final double PERCENT_SYSTEM_USAGE = 48;
     private static final double PRECISION = 0.001;
     private static final int SDK_VERSION = Build.VERSION_CODES.L;
     private static final String PACKAGE_NAME = "com.android.app";
@@ -126,37 +111,19 @@
     @Mock
     private BatteryStats.Timer mTimer;
     @Mock
-    private BatterySipper mNormalBatterySipper;
+    private BatteryUsageStats mBatteryUsageStats;
     @Mock
-    private BatterySipper mWifiBatterySipper;
-    @Mock
-    private BatterySipper mBluetoothBatterySipper;
-    @Mock
-    private BatterySipper mScreenBatterySipper;
-    @Mock
-    private BatterySipper mOvercountedBatterySipper;
-    @Mock
-    private BatterySipper mUnaccountedBatterySipper;
-    @Mock
-    private BatterySipper mSystemBatterySipper;
-    @Mock
-    private BatterySipper mCellBatterySipper;
-    @Mock
-    private BatterySipper mIdleBatterySipper;
+    private SystemBatteryConsumer mSystemBatteryConsumer;
     @Mock
     private BatteryInfo mBatteryInfo;
     @Mock
-    private Bundle mBundle;
-    @Mock
-    private UserManager mUserManager;
-    @Mock
     private PackageManager mPackageManager;
     @Mock
     private AppOpsManager mAppOpsManager;
     @Mock
     private ApplicationInfo mApplicationInfo;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private BatteryStatsHelper mBatteryStatsHelper;
+    private BatteryStatsManager mBatteryStatsManager;
     @Mock
     private ApplicationInfo mHighApplicationInfo;
     @Mock
@@ -169,7 +136,6 @@
     private BatteryUtils mBatteryUtils;
     private FakeFeatureFactory mFeatureFactory;
     private PowerUsageFeatureProvider mProvider;
-    private List<BatterySipper> mUsageList;
     private Context mContext;
 
     @Before
@@ -189,8 +155,6 @@
                 anyLong(), anyInt());
         doReturn(TIME_STATE_BACKGROUND).when(mUid).getProcessStateTime(eq(PROCESS_STATE_BACKGROUND),
                 anyLong(), anyInt());
-        when(mBatteryStatsHelper.getStats().computeBatteryRealtime(anyLong(), anyInt())).thenReturn(
-                TIME_SINCE_LAST_FULL_CHARGE_US);
 
         when(mPackageManager.getApplicationInfo(eq(HIGH_SDK_PACKAGE), anyInt()))
                 .thenReturn(mHighApplicationInfo);
@@ -199,50 +163,17 @@
         mHighApplicationInfo.targetSdkVersion = Build.VERSION_CODES.O;
         mLowApplicationInfo.targetSdkVersion = Build.VERSION_CODES.L;
 
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-        mNormalBatterySipper.totalPowerMah = TOTAL_BATTERY_USAGE;
-        doReturn(UID).when(mNormalBatterySipper).getUid();
-
-        mWifiBatterySipper.drainType = BatterySipper.DrainType.WIFI;
-        mWifiBatterySipper.totalPowerMah = BATTERY_WIFI_USAGE;
-
-        mBluetoothBatterySipper.drainType = BatterySipper.DrainType.BLUETOOTH;
-        mBluetoothBatterySipper.totalPowerMah = BATTERY_BLUETOOTH_USAGE;
-
-        mScreenBatterySipper.drainType = BatterySipper.DrainType.SCREEN;
-        mScreenBatterySipper.totalPowerMah = BATTERY_SCREEN_USAGE;
-
-        mSystemBatterySipper.drainType = BatterySipper.DrainType.APP;
-        mSystemBatterySipper.totalPowerMah = BATTERY_SYSTEM_USAGE;
-        when(mSystemBatterySipper.getUid()).thenReturn(Process.SYSTEM_UID);
-
-        mOvercountedBatterySipper.drainType = BatterySipper.DrainType.OVERCOUNTED;
-        mOvercountedBatterySipper.totalPowerMah = BATTERY_OVERACCOUNTED_USAGE;
-
-        mUnaccountedBatterySipper.drainType = BatterySipper.DrainType.UNACCOUNTED;
-        mUnaccountedBatterySipper.totalPowerMah = BATTERY_UNACCOUNTED_USAGE;
-
-        mIdleBatterySipper.drainType = BatterySipper.DrainType.IDLE;
-        mIdleBatterySipper.totalPowerMah = BATTERY_IDLE_USAGE;
-
         mContext = spy(RuntimeEnvironment.application);
         doReturn(mPackageManager).when(mContext).getPackageManager();
         doReturn(mAppOpsManager).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
+        doReturn(mBatteryStatsManager).when(mContext)
+                .getSystemService(Context.BATTERY_STATS_SERVICE);
         mBatteryUtils = spy(new BatteryUtils(mContext));
         mBatteryUtils.mPowerUsageFeatureProvider = mProvider;
         doReturn(0L).when(mBatteryUtils)
             .getForegroundServiceTotalTimeUs(any(BatteryStats.Uid.class), anyLong());
         mAnomalyInfo = new AnomalyInfo(INFO_WAKELOCK);
 
-        mUsageList = new ArrayList<>();
-        mUsageList.add(mNormalBatterySipper);
-        mUsageList.add(mScreenBatterySipper);
-        mUsageList.add(mCellBatterySipper);
-        when(mBatteryStatsHelper.getUsageList()).thenReturn(mUsageList);
-        when(mBatteryStatsHelper.getTotalPower())
-            .thenReturn(TOTAL_BATTERY_USAGE + BATTERY_SCREEN_USAGE);
-        when(mBatteryStatsHelper.getStats().getDischargeAmount(anyInt()))
-            .thenReturn(DISCHARGE_AMOUNT);
         BatteryDatabaseManager.setUpForTest(mBatteryDatabaseManager);
         ShadowThreadUtils.setIsMainThread(true);
     }
@@ -286,173 +217,71 @@
     }
 
     @Test
-    public void testRemoveHiddenBatterySippers_ContainsHiddenSippers_RemoveAndReturnValue() {
-        final List<BatterySipper> sippers = new ArrayList<>();
-        sippers.add(mNormalBatterySipper);
-        sippers.add(mScreenBatterySipper);
-        sippers.add(mSystemBatterySipper);
-        sippers.add(mOvercountedBatterySipper);
-        sippers.add(mUnaccountedBatterySipper);
-        sippers.add(mWifiBatterySipper);
-        sippers.add(mBluetoothBatterySipper);
-        sippers.add(mIdleBatterySipper);
-        when(mProvider.isTypeSystem(mSystemBatterySipper)).thenReturn(true);
-        doNothing().when(mBatteryUtils).smearScreenBatterySipper(any(), any());
-
-        final double totalUsage = mBatteryUtils.removeHiddenBatterySippers(sippers);
-
-        assertThat(sippers).containsExactly(mNormalBatterySipper);
-        assertThat(totalUsage).isWithin(PRECISION).of(BATTERY_SYSTEM_USAGE);
+    public void testShouldHideSystemConsumer_TypeIdle_ReturnTrue() {
+        when(mSystemBatteryConsumer.getDrainType())
+                .thenReturn(SystemBatteryConsumer.DRAIN_TYPE_IDLE);
+        assertThat(mBatteryUtils.shouldHideSystemBatteryConsumer(mSystemBatteryConsumer)).isTrue();
     }
 
     @Test
-    public void testShouldHideSipper_TypeUnAccounted_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.UNACCOUNTED;
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
+    public void testShouldHideSystemConsumer_TypeMobileRadio_ReturnTrue() {
+        when(mSystemBatteryConsumer.getDrainType())
+                .thenReturn(SystemBatteryConsumer.DRAIN_TYPE_MOBILE_RADIO);
+        assertThat(mBatteryUtils.shouldHideSystemBatteryConsumer(mSystemBatteryConsumer)).isTrue();
     }
 
     @Test
-    public void testShouldHideSipper_TypeOverAccounted_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.OVERCOUNTED;
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
+    public void testShouldHideSystemConsumer_TypeScreen_ReturnTrue() {
+        when(mSystemBatteryConsumer.getDrainType())
+                .thenReturn(SystemBatteryConsumer.DRAIN_TYPE_SCREEN);
+        assertThat(mBatteryUtils.shouldHideSystemBatteryConsumer(mSystemBatteryConsumer)).isTrue();
     }
 
     @Test
-    public void testShouldHideSipper_TypeIdle_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.IDLE;
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
+    public void testShouldHideSystemConsumer_TypeBluetooth_ReturnTrue() {
+        when(mSystemBatteryConsumer.getDrainType())
+                .thenReturn(SystemBatteryConsumer.DRAIN_TYPE_BLUETOOTH);
+        assertThat(mBatteryUtils.shouldHideSystemBatteryConsumer(mSystemBatteryConsumer)).isTrue();
     }
 
     @Test
-    public void testShouldHideSipper_TypeCell_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.CELL;
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
+    public void testShouldHideSystemConsumer_TypeWifi_ReturnTrue() {
+        when(mSystemBatteryConsumer.getDrainType())
+                .thenReturn(SystemBatteryConsumer.DRAIN_TYPE_WIFI);
+        assertThat(mBatteryUtils.shouldHideSystemBatteryConsumer(mSystemBatteryConsumer)).isTrue();
     }
 
     @Test
-    public void testShouldHideSipper_TypeScreen_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.SCREEN;
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
+    public void testShouldHideSystemConsumer_LowPower_ReturnTrue() {
+        when(mSystemBatteryConsumer.getDrainType())
+                .thenReturn(SystemBatteryConsumer.DRAIN_TYPE_FLASHLIGHT);
+        when(mSystemBatteryConsumer.getConsumedPower()).thenReturn(0.0005);
+        assertThat(mBatteryUtils.shouldHideSystemBatteryConsumer(mSystemBatteryConsumer)).isTrue();
     }
 
     @Test
-    public void testShouldHideSipper_TypeWifi_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.WIFI;
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_TypeBluetooth_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.BLUETOOTH;
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_TypeSystem_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-        when(mNormalBatterySipper.getUid()).thenReturn(Process.ROOT_UID);
-        when(mProvider.isTypeSystem(any())).thenReturn(true);
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_UidNormal_ReturnFalse() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-        when(mNormalBatterySipper.getUid()).thenReturn(UID);
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isFalse();
-    }
-
-    @Test
-    public void testShouldHideSipper_TypeService_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-        when(mNormalBatterySipper.getUid()).thenReturn(UID);
-        when(mProvider.isTypeService(any())).thenReturn(true);
-
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
-    }
-
-    @Test
-    public void testShouldHideSipper_hiddenSystemModule_ReturnTrue() {
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-        when(mNormalBatterySipper.getUid()).thenReturn(UID);
-        when(mBatteryUtils.isHiddenSystemModule(mNormalBatterySipper)).thenReturn(true);
-
-        assertThat(mBatteryUtils.shouldHideSipper(mNormalBatterySipper)).isTrue();
+    public void testShouldHideSystemConsumer_HighPower_ReturnFalse() {
+        when(mSystemBatteryConsumer.getDrainType())
+                .thenReturn(SystemBatteryConsumer.DRAIN_TYPE_FLASHLIGHT);
+        when(mSystemBatteryConsumer.getConsumedPower()).thenReturn(0.5);
+        assertThat(mBatteryUtils.shouldHideSystemBatteryConsumer(mSystemBatteryConsumer)).isFalse();
     }
 
     @Test
     public void testCalculateBatteryPercent() {
         assertThat(mBatteryUtils.calculateBatteryPercent(BATTERY_SYSTEM_USAGE, TOTAL_BATTERY_USAGE,
-                HIDDEN_USAGE, DISCHARGE_AMOUNT))
+                DISCHARGE_AMOUNT))
                 .isWithin(PRECISION).of(PERCENT_SYSTEM_USAGE);
     }
 
     @Test
-    public void testSmearScreenBatterySipper() {
-        final BatterySipper sipperNull = createTestSmearBatterySipper(TIME_FOREGROUND_ZERO,
-                BATTERY_APP_USAGE, 0 /* uid */, true /* isUidNull */);
-        final BatterySipper sipperBg = createTestSmearBatterySipper(TIME_FOREGROUND_ZERO,
-                BATTERY_APP_USAGE, 1 /* uid */, false /* isUidNull */);
-        final BatterySipper sipperFg = createTestSmearBatterySipper(TIME_FOREGROUND,
-                BATTERY_APP_USAGE, 2 /* uid */, false /* isUidNull */);
-        final BatterySipper sipperFg2 = createTestSmearBatterySipper(TIME_FOREGROUND,
-                BATTERY_APP_USAGE, 3 /* uid */, false /* isUidNull */);
-
-        final List<BatterySipper> sippers = new ArrayList<>();
-        sippers.add(sipperNull);
-        sippers.add(sipperBg);
-        sippers.add(sipperFg);
-        sippers.add(sipperFg2);
-
-        mBatteryUtils.smearScreenBatterySipper(sippers, mScreenBatterySipper);
-
-        assertThat(sipperNull.totalPowerMah).isWithin(PRECISION).of(BATTERY_APP_USAGE);
-        assertThat(sipperBg.totalPowerMah).isWithin(PRECISION).of(BATTERY_APP_USAGE);
-        assertThat(sipperFg.totalPowerMah).isWithin(PRECISION).of(
-                BATTERY_APP_USAGE + BATTERY_SCREEN_USAGE / 2);
-        assertThat(sipperFg2.totalPowerMah).isWithin(PRECISION).of(
-                BATTERY_APP_USAGE + BATTERY_SCREEN_USAGE / 2);
-    }
-
-    @Test
-    public void testSmearScreenBatterySipper_screenSipperNull_shouldNotCrash() {
-        final BatterySipper sipperFg = createTestSmearBatterySipper(TIME_FOREGROUND,
-                BATTERY_APP_USAGE, 2 /* uid */, false /* isUidNull */);
-
-        final List<BatterySipper> sippers = new ArrayList<>();
-        sippers.add(sipperFg);
-
-        // Shouldn't crash
-        mBatteryUtils.smearScreenBatterySipper(sippers, null /* screenSipper */);
-    }
-
-    @Test
-    public void testCalculateRunningTimeBasedOnStatsType() {
-        assertThat(mBatteryUtils.calculateRunningTimeBasedOnStatsType(mBatteryStatsHelper,
-                BatteryStats.STATS_SINCE_CHARGED)).isEqualTo(TIME_SINCE_LAST_FULL_CHARGE_MS);
-    }
-
-    @Test
-    public void testSortUsageList() {
-        final List<BatterySipper> sippers = new ArrayList<>();
-        sippers.add(mNormalBatterySipper);
-        sippers.add(mScreenBatterySipper);
-        sippers.add(mSystemBatterySipper);
-
-        mBatteryUtils.sortUsageList(sippers);
-
-        assertThat(sippers).containsExactly(mNormalBatterySipper, mSystemBatterySipper,
-                mScreenBatterySipper);
-    }
-
-    @Test
     public void testCalculateLastFullChargeTime() {
         final long currentTimeMs = System.currentTimeMillis();
-        when(mBatteryStatsHelper.getStats().getStartClockTime()).thenReturn(
+        when(mBatteryUsageStats.getStatsStartRealtime()).thenReturn(
                 currentTimeMs - TIME_SINCE_LAST_FULL_CHARGE_MS);
 
-        assertThat(mBatteryUtils.calculateLastFullChargeTime(
-                mBatteryStatsHelper, currentTimeMs)).isEqualTo(TIME_SINCE_LAST_FULL_CHARGE_MS);
+        assertThat(mBatteryUtils.calculateLastFullChargeTime(mBatteryUsageStats, currentTimeMs))
+                .isEqualTo(TIME_SINCE_LAST_FULL_CHARGE_MS);
     }
 
     @Test
@@ -504,56 +333,6 @@
             .isFalse();
     }
 
-    private BatterySipper createTestSmearBatterySipper(
-        long topTime, double totalPowerMah, int uidCode, boolean isUidNull) {
-        final BatterySipper sipper = mock(BatterySipper.class);
-        sipper.drainType = BatterySipper.DrainType.APP;
-        sipper.totalPowerMah = totalPowerMah;
-        doReturn(uidCode).when(sipper).getUid();
-        if (!isUidNull) {
-            final BatteryStats.Uid uid = mock(BatteryStats.Uid.class, RETURNS_DEEP_STUBS);
-            doReturn(topTime).when(mBatteryUtils).getProcessTimeMs(
-                    eq(BatteryUtils.StatusType.SCREEN_USAGE), eq(uid), anyInt());
-            doReturn(uidCode).when(uid).getUid();
-            sipper.uidObj = uid;
-        }
-
-        return sipper;
-    }
-
-    @Test
-    public void testInitBatteryStatsHelper_init() {
-        mBatteryUtils.initBatteryStatsHelper(mBatteryStatsHelper, mBundle, mUserManager);
-
-        verify(mBatteryStatsHelper).create(mBundle);
-        verify(mBatteryStatsHelper).refreshStats(BatteryStats.STATS_SINCE_CHARGED,
-                mUserManager.getUserProfiles());
-    }
-
-    @Test
-    public void testFindBatterySipperByType_findTypeScreen() {
-        BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList,
-                BatterySipper.DrainType.SCREEN);
-
-        assertThat(sipper).isSameInstanceAs(mScreenBatterySipper);
-    }
-
-    @Test
-    public void testFindBatterySipperByType_findTypeApp() {
-        BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList,
-                BatterySipper.DrainType.APP);
-
-        assertThat(sipper).isSameInstanceAs(mNormalBatterySipper);
-    }
-
-    @Test
-    public void testCalculateScreenUsageTime_returnCorrectTime() {
-        mScreenBatterySipper.usageTimeMs = TIME_EXPECTED_FOREGROUND;
-
-        assertThat(mBatteryUtils.calculateScreenUsageTime(mBatteryStatsHelper)).isEqualTo(
-                TIME_EXPECTED_FOREGROUND);
-    }
-
     @Test
     public void testIsPreOApp_SdkLowerThanO_ReturnTrue() {
         assertThat(mBatteryUtils.isPreOApp(LOW_SDK_PACKAGE)).isTrue();
@@ -741,7 +520,7 @@
                 any(IntentFilter.class))).thenReturn(new Intent());
 
         //Should not crash
-        assertThat(mBatteryUtils.getBatteryInfo(mBatteryStatsHelper, TAG)).isNotNull();
+        assertThat(mBatteryUtils.getBatteryInfo(TAG)).isNotNull();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
index 1ef2880..c9b1a00 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
@@ -69,6 +69,14 @@
         mFeatureFactory = FakeFeatureFactory.setupForTest();
         when(mToggleAppsMenu.getItemId()).thenReturn(PowerUsageAdvanced.MENU_TOGGLE_APPS);
 
+        BatteryAppListPreferenceController.sConfig =
+                new BatteryAppListPreferenceController.Config() {
+                    @Override
+                    public boolean shouldShowBatteryAttributionList(Context context) {
+                        return true;
+                    }
+                };
+
         mFragment = spy(new PowerUsageAdvanced());
         mFragment.onAttach(mContext);
     }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
index cd1b178..451e605 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
@@ -27,7 +27,6 @@
 
 import androidx.loader.app.LoaderManager;
 
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.testutils.shadow.ShadowDashboardFragment;
 import com.android.settingslib.core.AbstractPreferenceController;
 
@@ -46,8 +45,6 @@
 public class PowerUsageBaseTest {
 
     @Mock
-    private BatteryStatsHelper mBatteryStatsHelper;
-    @Mock
     private LoaderManager mLoaderManager;
     private TestFragment mFragment;
 
@@ -56,7 +53,6 @@
         MockitoAnnotations.initMocks(this);
 
         mFragment = spy(new TestFragment());
-        mFragment.setBatteryStatsHelper(mBatteryStatsHelper);
         doReturn(mLoaderManager).when(mFragment).getLoaderManager();
     }
 
@@ -75,6 +71,11 @@
         }
 
         @Override
+        protected boolean isBatteryHistoryNeeded() {
+            return false;
+        }
+
+        @Override
         protected void refreshUi(int refreshType) {
             // Do nothing
         }
@@ -93,9 +94,5 @@
         protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
             return null;
         }
-
-        private void setBatteryStatsHelper(BatteryStatsHelper batteryStatsHelper) {
-            mStatsHelper = batteryStatsHelper;
-        }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index e345ab2..11b6ad2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -21,7 +21,6 @@
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
@@ -40,8 +39,6 @@
 import androidx.loader.app.LoaderManager;
 import androidx.preference.PreferenceScreen;
 
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
@@ -54,7 +51,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -62,35 +58,19 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-import java.util.ArrayList;
 import java.util.List;
 
 // TODO: Improve this test class so that it starts up the real activity and fragment.
 @RunWith(RobolectricTestRunner.class)
 public class PowerUsageSummaryTest {
 
-    private static final int UID = 123;
-    private static final int POWER_MAH = 100;
     private static final long TIME_SINCE_LAST_FULL_CHARGE_MS = 120 * 60 * 1000;
-    private static final long TIME_SINCE_LAST_FULL_CHARGE_US =
-            TIME_SINCE_LAST_FULL_CHARGE_MS * 1000;
-    private static final long USAGE_TIME_MS = 65 * 60 * 1000;
-    private static final double TOTAL_POWER = 200;
     private static Intent sAdditionalBatteryInfoIntent;
 
     @BeforeClass
     public static void beforeClass() {
         sAdditionalBatteryInfoIntent = new Intent("com.example.app.ADDITIONAL_BATTERY_INFO");
     }
-
-    @Mock
-    private BatterySipper mNormalBatterySipper;
-    @Mock
-    private BatterySipper mScreenBatterySipper;
-    @Mock
-    private BatterySipper mCellBatterySipper;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private BatteryStatsHelper mBatteryHelper;
     @Mock
     private SettingsActivity mSettingsActivity;
     @Mock
@@ -104,7 +84,6 @@
     @Mock
     private PreferenceScreen mPreferenceScreen;
 
-    private List<BatterySipper> mUsageList;
     private Context mRealContext;
     private TestFragment mFragment;
     private FakeFeatureFactory mFeatureFactory;
@@ -123,27 +102,6 @@
         when(mFragment.getActivity()).thenReturn(mSettingsActivity);
         when(mFeatureFactory.powerUsageFeatureProvider.getAdditionalBatteryInfoIntent())
                 .thenReturn(sAdditionalBatteryInfoIntent);
-        when(mBatteryHelper.getTotalPower()).thenReturn(TOTAL_POWER);
-        when(mBatteryHelper.getStats().computeBatteryRealtime(anyLong(), anyInt()))
-                .thenReturn(TIME_SINCE_LAST_FULL_CHARGE_US);
-
-        when(mNormalBatterySipper.getUid()).thenReturn(UID);
-        mNormalBatterySipper.totalPowerMah = POWER_MAH;
-        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
-
-        mCellBatterySipper.drainType = BatterySipper.DrainType.CELL;
-        mCellBatterySipper.totalPowerMah = POWER_MAH;
-
-        mScreenBatterySipper.drainType = BatterySipper.DrainType.SCREEN;
-        mScreenBatterySipper.usageTimeMs = USAGE_TIME_MS;
-
-        mUsageList = new ArrayList<>();
-        mUsageList.add(mNormalBatterySipper);
-        mUsageList.add(mScreenBatterySipper);
-        mUsageList.add(mCellBatterySipper);
-
-        mFragment.mStatsHelper = mBatteryHelper;
-        when(mBatteryHelper.getUsageList()).thenReturn(mUsageList);
         mFragment.mBatteryUtils = spy(new BatteryUtils(mRealContext));
         ReflectionHelpers.setField(mFragment, "mVisibilityLoggerMixin", mVisibilityLoggerMixin);
         ReflectionHelpers.setField(mFragment, "mBatteryBroadcastReceiver",
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
index 8cc17d8..82448d1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
@@ -24,9 +24,9 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.BatteryUsageStats;
 import android.os.PowerManager;
 
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.fuelgauge.BatteryInfo;
 import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settings.fuelgauge.batterytip.tips.AppLabelPredicate;
@@ -57,7 +57,7 @@
             BatteryTip.TipType.SUMMARY,
             BatteryTip.TipType.SMART_BATTERY_MANAGER};
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private BatteryStatsHelper mBatteryStatsHelper;
+    private BatteryUsageStats mBatteryUsageStats;
     @Mock
     private PowerManager mPowerManager;
     @Mock
@@ -77,8 +77,8 @@
         doReturn(mContext).when(mContext).getApplicationContext();
         doReturn(mPowerManager).when(mContext).getSystemService(Context.POWER_SERVICE);
         doReturn(mIntent).when(mContext).registerReceiver(any(), any());
-        doReturn(mBatteryInfo).when(mBatteryUtils).getBatteryInfo(any(), any());
-        mBatteryTipLoader = new BatteryTipLoader(mContext, mBatteryStatsHelper);
+        doReturn(mBatteryInfo).when(mBatteryUtils).getBatteryInfo(any());
+        mBatteryTipLoader = new BatteryTipLoader(mContext, mBatteryUsageStats);
         mBatteryTipLoader.mBatteryUtils = mBatteryUtils;
     }
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
index 5c56f46..c125876 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
@@ -18,19 +18,21 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.os.BatteryStats;
-import android.text.format.DateUtils;
+import android.content.Intent;
+import android.os.BatteryManager;
+import android.os.BatteryStatsManager;
+import android.os.BatteryUsageStats;
+import android.os.BatteryUsageStatsQuery;
+import android.os.UidBatteryConsumer;
 
-import com.android.internal.os.BatterySipper;
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settings.fuelgauge.batterytip.AppInfo;
 import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
@@ -41,7 +43,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -53,55 +54,62 @@
 
 @RunWith(RobolectricTestRunner.class)
 public class HighUsageDetectorTest {
+    private static final String TAG = "HighUsageDetectorTest";
+
     private static final int UID_HIGH = 123;
     private static final int UID_LOW = 345;
     private static final double POWER_HIGH = 20000;
     private static final double POWER_LOW = 10000;
+
     private Context mContext;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private BatteryStatsHelper mBatteryStatsHelper;
     @Mock
-    private BatterySipper mHighBatterySipper;
+    private UidBatteryConsumer mHighBatteryConsumer;
     @Mock
-    private BatterySipper mLowBatterySipper;
+    private UidBatteryConsumer mLowBatteryConsumer;
     @Mock
-    private BatterySipper mSystemBatterySipper;
+    private UidBatteryConsumer mSystemBatteryConsumer;
     @Mock
     private HighUsageDataParser mDataParser;
+    @Mock
+    private BatteryUsageStats mBatteryUsageStats;
+    @Mock
+    private BatteryStatsManager mBatteryStatsManager;
 
     private AppInfo mHighAppInfo;
     private AppInfo mLowAppInfo;
     private BatteryTipPolicy mPolicy;
     private BatteryUtils mBatteryUtils;
     private HighUsageDetector mHighUsageDetector;
-    private List<BatterySipper> mUsageList;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        mContext = RuntimeEnvironment.application;
+        mContext = spy(RuntimeEnvironment.application);
         mPolicy = spy(new BatteryTipPolicy(mContext));
-        mBatteryUtils = spy(BatteryUtils.getInstance(mContext));
-        mHighUsageDetector = spy(new HighUsageDetector(mContext, mPolicy, mBatteryStatsHelper,
-                true /* mDischarging */));
+        mBatteryUtils = spy(new BatteryUtils(mContext));
+
+        when(mContext.getSystemService(eq(Context.BATTERY_STATS_SERVICE)))
+                .thenReturn(mBatteryStatsManager);
+        when(mBatteryStatsManager.getBatteryUsageStats(any(BatteryUsageStatsQuery.class)))
+                .thenReturn(mBatteryUsageStats);
+
+        mContext.sendStickyBroadcast(new Intent(Intent.ACTION_BATTERY_CHANGED)
+                .putExtra(BatteryManager.EXTRA_PLUGGED, 0));
+
+        mHighUsageDetector = spy(new HighUsageDetector(mContext, mPolicy, mBatteryUsageStats,
+                mBatteryUtils.getBatteryInfo(TAG)));
         mHighUsageDetector.mBatteryUtils = mBatteryUtils;
         mHighUsageDetector.mDataParser = mDataParser;
         doNothing().when(mHighUsageDetector).parseBatteryData();
-        doReturn(UID_HIGH).when(mHighBatterySipper).getUid();
-        doReturn(UID_LOW).when(mLowBatterySipper).getUid();
-        mHighBatterySipper.uidObj = mock(BatteryStats.Uid.class);
-        mHighBatterySipper.drainType = BatterySipper.DrainType.APP;
-        mHighBatterySipper.totalSmearedPowerMah = POWER_HIGH;
-        mLowBatterySipper.uidObj = mock(BatteryStats.Uid.class);
-        mLowBatterySipper.drainType = BatterySipper.DrainType.APP;
-        mLowBatterySipper.totalSmearedPowerMah = POWER_LOW;
-        when(mBatteryUtils.shouldHideSipper(mSystemBatterySipper)).thenReturn(true);
-        when(mBatteryUtils.shouldHideSipper(mHighBatterySipper)).thenReturn(false);
-        when(mBatteryUtils.shouldHideSipper(mLowBatterySipper)).thenReturn(false);
-        when(mBatteryStatsHelper.getStats().getDischargeAmount(anyInt())).thenReturn(100);
-        when(mBatteryStatsHelper.getTotalPower()).thenReturn(POWER_HIGH + POWER_LOW);
-
+        doReturn(UID_HIGH).when(mHighBatteryConsumer).getUid();
+        doReturn(UID_LOW).when(mLowBatteryConsumer).getUid();
+        doReturn(POWER_HIGH).when(mHighBatteryConsumer).getConsumedPower();
+        doReturn(POWER_LOW).when(mLowBatteryConsumer).getConsumedPower();
+        doReturn(false).when(mBatteryUtils).shouldHideUidBatteryConsumer(mHighBatteryConsumer);
+        doReturn(false).when(mBatteryUtils).shouldHideUidBatteryConsumer(mLowBatteryConsumer);
+        when(mBatteryUsageStats.getDischargePercentage()).thenReturn(100);
+        when(mBatteryUsageStats.getConsumedPower()).thenReturn(POWER_HIGH + POWER_LOW);
 
         mHighAppInfo = new AppInfo.Builder()
                 .setUid(UID_HIGH)
@@ -110,11 +118,11 @@
                 .setUid(UID_LOW)
                 .build();
 
-        mUsageList = new ArrayList<>();
-        mUsageList.add(mSystemBatterySipper);
-        mUsageList.add(mLowBatterySipper);
-        mUsageList.add(mHighBatterySipper);
-        when(mBatteryStatsHelper.getUsageList()).thenReturn(mUsageList);
+        ArrayList<UidBatteryConsumer> consumers = new ArrayList<>();
+        consumers.add(mSystemBatteryConsumer);
+        consumers.add(mLowBatteryConsumer);
+        consumers.add(mHighBatteryConsumer);
+        when(mBatteryUsageStats.getUidBatteryConsumers()).thenReturn(consumers);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
index 40315d2..173f625 100644
--- a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
@@ -68,7 +68,6 @@
 
     @Test
     @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryStatsHelperLoader.class,
             BatteryFixSliceTest.ShadowBatteryTipLoader.class
     })
     public void onStart_isNotDebuggable_shouldHideSystemOverlay() {
@@ -88,7 +87,6 @@
 
     @Test
     @Config(shadows = {
-            BatteryFixSliceTest.ShadowBatteryStatsHelperLoader.class,
             BatteryFixSliceTest.ShadowBatteryTipLoader.class,
     })
     public void onStop_isNotDebuggable_shouldRemoveHideSystemOverlay() {
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java
index 68c97cf..cffc4d1 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSliceTest.java
@@ -23,15 +23,15 @@
 
 import android.content.Context;
 import android.net.Uri;
+import android.os.BatteryUsageStats;
 
 import androidx.slice.Slice;
 import androidx.slice.SliceMetadata;
 import androidx.slice.SliceProvider;
 import androidx.slice.widget.SliceLiveData;
 
-import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
-import com.android.settings.fuelgauge.BatteryStatsHelperLoader;
+import com.android.settings.fuelgauge.BatteryUsageStatsLoader;
 import com.android.settings.fuelgauge.batterytip.AppInfo;
 import com.android.settings.fuelgauge.batterytip.BatteryTipLoader;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
@@ -57,7 +57,7 @@
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
-        BatteryFixSliceTest.ShadowBatteryStatsHelperLoader.class,
+        BatteryFixSliceTest.ShadowBatteryUsageStatsLoader.class,
         BatteryFixSliceTest.ShadowBatteryTipLoader.class
 })
 public class BatteryFixSliceTest {
@@ -135,11 +135,11 @@
         assertThat(ShadowEarlyWarningTip.isIconTintColorIdCalled()).isTrue();
     }
 
-    @Implements(BatteryStatsHelperLoader.class)
-    public static class ShadowBatteryStatsHelperLoader {
+    @Implements(BatteryUsageStatsLoader.class)
+    public static class ShadowBatteryUsageStatsLoader {
 
         @Implementation
-        protected BatteryStatsHelper loadInBackground() {
+        protected BatteryUsageStats loadInBackground() {
             return null;
         }
     }
diff --git a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationInjectedServicesPreferenceControllerTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/location/LocationInjectedServicesPreferenceControllerTest.java
index 62c13af..0370781 100644
--- a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationInjectedServicesPreferenceControllerTest.java
@@ -58,7 +58,7 @@
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowUserManager.class)
-public class LocationServicePreferenceControllerTest {
+public class LocationInjectedServicesPreferenceControllerTest {
 
     private static final String KEY_LOCATION_SERVICES = "location_service";
 
@@ -76,7 +76,7 @@
     private DevicePolicyManager mDevicePolicyManager;
 
     private Context mContext;
-    private LocationServicePreferenceController mController;
+    private LocationInjectedServicesPreferenceController mController;
     private LifecycleOwner mLifecycleOwner;
     private Lifecycle mLifecycle;
 
@@ -86,7 +86,8 @@
         mContext = spy(RuntimeEnvironment.application);
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
-        mController = spy(new LocationServicePreferenceController(mContext, KEY_LOCATION_SERVICES));
+        mController = spy(
+                new LocationInjectedServicesPreferenceController(mContext, KEY_LOCATION_SERVICES));
         when(mFragment.getSettingsLifecycle()).thenReturn(mLifecycle);
         mController.init(mFragment);
         mController.mInjector = mSettingsInjector;
diff --git a/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java
deleted file mode 100644
index 1492766..0000000
--- a/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.location;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.net.wifi.WifiManager;
-import android.provider.Settings;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-public class LocationScanningPreferenceControllerTest {
-    @Mock
-    private WifiManager mWifiManager;
-    private Context mContext;
-    private LocationScanningPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
-        mController = new LocationScanningPreferenceController(mContext, "key");
-    }
-
-    @Test
-    public void testLocationScanning_byDefault_shouldBeShown() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void testLocationScanning_WifiOnBleOn() {
-        when(mWifiManager.isScanAlwaysAvailable()).thenReturn(true);
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 1);
-        assertThat(mController.getSummary()).isEqualTo(
-                mContext.getString(R.string.scanning_status_text_wifi_on_ble_on));
-    }
-
-    @Test
-    public void testLocationScanning_WifiOnBleOff() {
-        when(mWifiManager.isScanAlwaysAvailable()).thenReturn(true);
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0);
-        assertThat(mController.getSummary()).isEqualTo(
-                mContext.getString(R.string.scanning_status_text_wifi_on_ble_off));
-    }
-
-    @Test
-    public void testLocationScanning_WifiOffBleOn() {
-        when(mWifiManager.isScanAlwaysAvailable()).thenReturn(false);
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 1);
-        assertThat(mController.getSummary()).isEqualTo(
-                mContext.getString(R.string.scanning_status_text_wifi_off_ble_on));
-    }
-
-    @Test
-    public void testLocationScanning_WifiOffBleOff() {
-        when(mWifiManager.isScanAlwaysAvailable()).thenReturn(false);
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0);
-        assertThat(mController.getSummary()).isEqualTo(
-                mContext.getString(R.string.scanning_status_text_wifi_off_ble_off));
-    }
-
-    @Test
-    @Config(qualifiers = "mcc999")
-    public void testLocationScanning_ifDisabled_shouldNotBeShown() {
-        assertThat(mController.isAvailable()).isFalse();
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicesPreferenceControllerTest.java
similarity index 71%
rename from tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java
rename to tests/robotests/src/com/android/settings/location/LocationServicesPreferenceControllerTest.java
index 0ed68cb..f5868c2 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationServicesPreferenceControllerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.applications.specialaccess;
+package com.android.settings.location;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -25,32 +25,33 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
-public class HighPowerAppsControllerTest {
-
+public class LocationServicesPreferenceControllerTest {
+    @Mock
     private Context mContext;
-    private HighPowerAppsController mController;
+    private LocationServicesPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        mController = new HighPowerAppsController(mContext, "key");
+        mContext = spy(RuntimeEnvironment.application);
+        mController = new LocationServicesPreferenceController(mContext, "key");
     }
 
     @Test
-    public void testHighPowerApps_byDefault_shouldBeShown() {
+    public void testLocationScanning_byDefault_shouldBeShown() {
         assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
     @Config(qualifiers = "mcc999")
-    public void testHighPowerApps_ifDisabled_shouldNotBeShown() {
+    public void testLocationScanning_ifDisabled_shouldNotBeShown() {
         assertThat(mController.isAvailable()).isFalse();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java b/tests/robotests/src/com/android/settings/location/LocationServicesTest.java
similarity index 90%
rename from tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java
rename to tests/robotests/src/com/android/settings/location/LocationServicesTest.java
index 649726a..f115845 100644
--- a/tests/robotests/src/com/android/settings/location/ScanningSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationServicesTest.java
@@ -32,7 +32,7 @@
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
-public class ScanningSettingsTest {
+public class LocationServicesTest {
 
     private Context mContext;
 
@@ -43,10 +43,10 @@
 
     @Test
     public void searchProvider_shouldIndexDefaultXml() {
-        final List<SearchIndexableResource> sir = ScanningSettings.SEARCH_INDEX_DATA_PROVIDER
+        final List<SearchIndexableResource> sir = LocationServices.SEARCH_INDEX_DATA_PROVIDER
                 .getXmlResourcesToIndex(mContext, true /* enabled */);
 
         assertThat(sir).hasSize(1);
-        assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.location_scanning);
+        assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.location_services);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
index 71a80de..32c8627 100644
--- a/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/RecentLocationAccessPreferenceControllerTest.java
@@ -24,19 +24,17 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.provider.DeviceConfig;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.Utils;
+import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.testutils.shadow.ShadowDeviceConfig;
 import com.android.settingslib.location.RecentLocationAccesses;
-import com.android.settingslib.widget.LayoutPreference;
 
 import org.junit.After;
 import org.junit.Before;
@@ -55,11 +53,14 @@
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowDeviceConfig.class})
 public class RecentLocationAccessPreferenceControllerTest {
+    private static final String PREFERENCE_KEY = "test_preference_key";
     @Mock
-    private LayoutPreference mLayoutPreference;
+    private PreferenceCategory mLayoutPreference;
     @Mock
     private PreferenceScreen mScreen;
     @Mock
+    private DashboardFragment mDashboardFragment;
+    @Mock
     private RecentLocationAccesses mRecentLocationApps;
 
     private Context mContext;
@@ -71,15 +72,16 @@
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
         mController = spy(
-                new RecentLocationAccessPreferenceController(mContext, mRecentLocationApps));
+                new RecentLocationAccessPreferenceController(mContext, PREFERENCE_KEY,
+                        mRecentLocationApps));
+        mController.init(mDashboardFragment);
         final String key = mController.getPreferenceKey();
         mAppEntitiesHeaderView = LayoutInflater.from(mContext).inflate(
                 R.layout.app_entities_header, null /* root */);
         when(mScreen.findPreference(key)).thenReturn(mLayoutPreference);
         when(mLayoutPreference.getKey()).thenReturn(key);
         when(mLayoutPreference.getContext()).thenReturn(mContext);
-        when(mLayoutPreference.findViewById(R.id.app_entities_header)).thenReturn(
-                mAppEntitiesHeaderView);
+        when(mDashboardFragment.getContext()).thenReturn(mContext);
     }
 
     @After
@@ -88,16 +90,7 @@
     }
 
     @Test
-    public void isAvailable_permissionHubNotSet_shouldReturnFalse() {
-        // We have not yet set the property to show the Permissions Hub.
-        assertThat(mController.isAvailable()).isEqualTo(false);
-    }
-
-    @Test
-    public void isAvailable_permissionHubEnabled_shouldReturnTrue() {
-        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
-                Utils.PROPERTY_PERMISSIONS_HUB_ENABLED, "true", true);
-
+    public void isAvailable_shouldReturnTrue() {
         assertThat(mController.isAvailable()).isEqualTo(true);
     }
 
@@ -105,7 +98,7 @@
     @Test
     @Ignore
     public void updateState_whenAppListIsEmpty_shouldDisplayTitleTextAndDetailsText() {
-        doReturn(new ArrayList<>()).when(mRecentLocationApps).getAppListSorted();
+        doReturn(new ArrayList<>()).when(mRecentLocationApps).getAppListSorted(false);
         mController.displayPreference(mScreen);
         mController.updateState(mLayoutPreference);
 
@@ -118,39 +111,6 @@
         assertThat(details.hasOnClickListeners()).isTrue();
     }
 
-    @Test
-    public void updateState_whenAppListMoreThanThree_shouldDisplayTopThreeApps() {
-        final List<RecentLocationAccesses.Access> accesses = createMockAccesses(6);
-        doReturn(accesses).when(mRecentLocationApps).getAppListSorted();
-        mController.displayPreference(mScreen);
-        mController.updateState(mLayoutPreference);
-
-        // The widget can display the top 3 apps from the list when there're more than 3.
-        final View app1View = mAppEntitiesHeaderView.findViewById(R.id.app1_view);
-        final ImageView appIconView1 = app1View.findViewById(R.id.app_icon);
-        final TextView appTitle1 = app1View.findViewById(R.id.app_title);
-
-        assertThat(app1View.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(appIconView1.getDrawable()).isNotNull();
-        assertThat(appTitle1.getText()).isEqualTo("appTitle0");
-
-        final View app2View = mAppEntitiesHeaderView.findViewById(R.id.app2_view);
-        final ImageView appIconView2 = app2View.findViewById(R.id.app_icon);
-        final TextView appTitle2 = app2View.findViewById(R.id.app_title);
-
-        assertThat(app2View.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(appIconView2.getDrawable()).isNotNull();
-        assertThat(appTitle2.getText()).isEqualTo("appTitle1");
-
-        final View app3View = mAppEntitiesHeaderView.findViewById(R.id.app3_view);
-        final ImageView appIconView3 = app3View.findViewById(R.id.app_icon);
-        final TextView appTitle3 = app3View.findViewById(R.id.app_title);
-
-        assertThat(app3View.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(appIconView3.getDrawable()).isNotNull();
-        assertThat(appTitle3.getText()).isEqualTo("appTitle2");
-    }
-
     private List<RecentLocationAccesses.Access> createMockAccesses(int count) {
         final List<RecentLocationAccesses.Access> accesses = new ArrayList<>();
         for (int i = 0; i < count; i++) {
diff --git a/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java
index dfb9a8f..c95797f 100644
--- a/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java
@@ -19,8 +19,13 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.net.wifi.WifiManager;
 import android.provider.Settings;
 
 import org.junit.Before;
@@ -29,6 +34,7 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
 public class AdaptiveConnectivityTogglePreferenceControllerTest {
@@ -37,12 +43,16 @@
 
     @Mock(answer = RETURNS_DEEP_STUBS)
     private Context mContext;
+    @Mock
+    WifiManager mWifiManager;
 
     private AdaptiveConnectivityTogglePreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
         mController = new AdaptiveConnectivityTogglePreferenceController(mContext, PREF_KEY);
     }
 
@@ -61,6 +71,7 @@
         assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
                 Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1))
                 .isEqualTo(1);
+        verify(mWifiManager, atLeastOnce()).setWifiScoringEnabled(true);
     }
 
     @Test
@@ -73,5 +84,6 @@
         assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
                 Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1))
                 .isEqualTo(0);
+        verify(mWifiManager).setWifiScoringEnabled(false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java
index 3b1f008..d3a3129 100644
--- a/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/BluetoothTetherPreferenceControllerTest.java
@@ -26,7 +26,6 @@
 
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
-import android.net.ConnectivityManager;
 import android.net.TetheringManager;
 
 import androidx.preference.SwitchPreference;
@@ -44,7 +43,7 @@
 public class BluetoothTetherPreferenceControllerTest {
 
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private TetherEnabler mTetherEnabler;
 
@@ -58,9 +57,8 @@
 
         mContext = spy(ApplicationProvider.getApplicationContext());
         mSwitchPreference = spy(SwitchPreference.class);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(
-                mConnectivityManager);
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[] {""});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[] {""});
         mController = new BluetoothTetherPreferenceController(mContext, "BLUETOOTH");
         mController.setTetherEnabler(mTetherEnabler);
         ReflectionHelpers.setField(mController, "mPreference", mSwitchPreference);
@@ -98,7 +96,7 @@
 
     @Test
     public void shouldShow_noBluetoothTetherable() {
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[0]);
         assertThat(mController.isAvailable()).isFalse();
     }
 
diff --git a/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java
index d2e53b8..8a81908 100644
--- a/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/EthernetTetherPreferenceControllerTest.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.network;
 
-
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.eq;
@@ -25,7 +24,6 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
 import android.net.EthernetManager;
 import android.net.TetheringManager;
 
@@ -49,7 +47,7 @@
     public MockitoRule mocks = MockitoJUnit.rule();
 
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private EthernetManager mEthernetManager;
     @Mock
@@ -64,9 +62,8 @@
     public void setUp() {
         mContext = spy(ApplicationProvider.getApplicationContext());
         mPreference = spy(SwitchPreference.class);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mConnectivityManager.getTetherableIfaces()).thenReturn(new String[]{ETHERNET_REGEX});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableIfaces()).thenReturn(new String[]{ETHERNET_REGEX});
         when(mContext.getSystemService(Context.ETHERNET_SERVICE)).thenReturn(mEthernetManager);
         mController = new EthernetTetherPreferenceController(mContext, "ethernet");
         mController.setTetherEnabler(mTetherEnabler);
@@ -105,7 +102,7 @@
 
     @Test
     public void shouldEnable_noTetherable() {
-        when(mConnectivityManager.getTetherableIfaces()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableIfaces()).thenReturn(new String[0]);
         assertThat(mController.shouldEnable()).isFalse();
     }
 
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java
index 95d60a4..355dda8 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java
@@ -39,6 +39,10 @@
 import android.telephony.TelephonyManager;
 import android.telephony.euicc.EuiccManager;
 
+import androidx.lifecycle.Lifecycle;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -52,10 +56,6 @@
 
 import java.util.Arrays;
 
-import androidx.lifecycle.Lifecycle;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 @RunWith(RobolectricTestRunner.class)
 public class MobileNetworkListControllerTest {
     @Mock
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java
index a65ff24..fd2b520 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java
@@ -33,7 +33,6 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.util.ReflectionHelpers;
 
-
 @RunWith(RobolectricTestRunner.class)
 public class MobileNetworkListFragmentTest {
     @Mock
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java
index 097ebaf..1639bba 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java
@@ -32,7 +32,6 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.net.ConnectivityManager;
 import android.os.UserManager;
 import android.provider.Settings;
 import android.telephony.SubscriptionInfo;
@@ -110,9 +109,7 @@
 
     @Test
     public void isAvailable_wifiOnlyMode_notAvailable() {
-        final ConnectivityManager cm = mock(ConnectivityManager.class);
-        when(cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false);
-        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(cm);
+        when(mTelephonyManager.isDataCapable()).thenReturn(false);
         when(mUserManager.isAdminUser()).thenReturn(true);
 
         assertThat(mController.isAvailable()).isFalse();
@@ -120,11 +117,8 @@
 
     @Test
     public void isAvailable_secondaryUser_notAvailable() {
-        final ConnectivityManager cm = mock(ConnectivityManager.class);
-        when(cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(true);
-        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(cm);
+        when(mTelephonyManager.isDataCapable()).thenReturn(true);
         when(mUserManager.isAdminUser()).thenReturn(false);
-
         assertThat(mController.isAvailable()).isFalse();
     }
 
diff --git a/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
index 96dcb0c..d7c0ffe 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
@@ -54,6 +54,7 @@
 import androidx.preference.PreferenceScreen;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.android.settings.AirplaneModeEnabler;
 import com.android.settings.R;
 import com.android.settings.datausage.DataUsagePreference;
 import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
@@ -88,6 +89,10 @@
     @Mock
     private WifiManager mWifiManager;
     @Mock
+    private UserManager mUserManager;
+    @Mock
+    private AirplaneModeEnabler mAirplaneModeEnabler;
+    @Mock
     private DataUsagePreference mDataUsagePreference;
     private Context mContext;
     private NetworkProviderSettings mNetworkProviderSettings;
@@ -98,8 +103,7 @@
     @Mock
     private ConnectivitySubsystemsRecoveryManager mConnectivitySubsystemsRecoveryManager;
     @Mock
-    private ViewAirplaneModeNetworksLayoutPreferenceController
-            mViewAirplaneModeNetworksButtonPreference;
+    private Preference mAirplaneModeMsgPreference;
     @Mock
     private LayoutPreference mResetInternetPreference;
     @Mock
@@ -115,6 +119,8 @@
         doReturn(mPreferenceManager).when(mNetworkProviderSettings).getPreferenceManager();
         doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);
         doReturn(mWifiManager).when(mContext).getSystemService(WifiManager.class);
+        doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
+        when(mUserManager.hasBaseUserRestriction(any(), any())).thenReturn(true);
         doReturn(mContext).when(mPreferenceManager).getContext();
         mNetworkProviderSettings.mAddWifiNetworkPreference = new AddWifiNetworkPreference(mContext);
         mNetworkProviderSettings.mSavedNetworksPreference = new Preference(mContext);
@@ -122,6 +128,9 @@
                 new Preference(mContext);
         mNetworkProviderSettings.mWifiPickerTracker = mMockWifiPickerTracker;
         mNetworkProviderSettings.mWifiManager = mWifiManager;
+        mNetworkProviderSettings.mResetInternetPreference = mResetInternetPreference;
+        mNetworkProviderSettings.mAirplaneModeMsgPreference = mAirplaneModeMsgPreference;
+        mNetworkProviderSettings.mAirplaneModeEnabler = mAirplaneModeEnabler;
     }
 
     @Test
@@ -417,27 +426,35 @@
     }
 
     @Test
-    public void onSubsystemRestartOperationBegin_showResetInternetHideApmNetworks() {
-        mNetworkProviderSettings.mResetInternetPreference = mResetInternetPreference;
-        mNetworkProviderSettings.mViewAirplaneModeNetworksButtonPreference =
-                mViewAirplaneModeNetworksButtonPreference;
-
+    public void onSubsystemRestartOperationBegin_showResetInternetHideApmMsg() {
         mNetworkProviderSettings.onSubsystemRestartOperationBegin();
 
         verify(mResetInternetPreference).setVisible(true);
-        verify(mViewAirplaneModeNetworksButtonPreference).setVisible(false);
+        verify(mAirplaneModeMsgPreference).setVisible(false);
     }
 
     @Test
-    public void onSubsystemRestartOperationEnd_showApmNetworksHideResetInternet() {
-        mNetworkProviderSettings.mResetInternetPreference = mResetInternetPreference;
-        mNetworkProviderSettings.mViewAirplaneModeNetworksButtonPreference =
-                mViewAirplaneModeNetworksButtonPreference;
-        doReturn(true).when(mViewAirplaneModeNetworksButtonPreference).isAvailable();
+    public void onSubsystemRestartOperationEnd_showApmMsgHideResetInternet() {
+        doReturn(true).when(mAirplaneModeEnabler).isAirplaneModeOn();
 
         mNetworkProviderSettings.onSubsystemRestartOperationEnd();
 
         verify(mResetInternetPreference).setVisible(false);
-        verify(mViewAirplaneModeNetworksButtonPreference).setVisible(true);
+        verify(mAirplaneModeMsgPreference).setVisible(true);
+    }
+
+    @Test
+    public void onAirplaneModeChanged_apmIsOn_showApmMsg() {
+        mNetworkProviderSettings.onAirplaneModeChanged(true);
+
+        verify(mAirplaneModeMsgPreference).setVisible(true);
+    }
+
+
+    @Test
+    public void onAirplaneModeChanged_apmIsOff_hideApmMsg() {
+        mNetworkProviderSettings.onAirplaneModeChanged(false);
+
+        verify(mAirplaneModeMsgPreference).setVisible(false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
index efb77eb..390a674 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
@@ -60,8 +60,8 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
+import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java b/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java
index 87806be..bb4b0c4 100644
--- a/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java
@@ -101,9 +101,9 @@
         when(context.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
         when(context.getSystemService(Context.NETWORK_POLICY_SERVICE)).thenReturn(
                 mNetworkPolicyManager);
-        when(mConnectivityManager.getTetherableIfaces()).thenReturn(new String[0]);
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[0]);
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableIfaces()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
         panReference.set(mBluetoothPan);
         mEnabler = spy(new TetherEnabler(context, mSwitchWidgetController, panReference));
         ReflectionHelpers.setField(mEnabler, "mBluetoothAdapter", mBluetoothAdapter);
@@ -111,8 +111,8 @@
 
     @Test
     public void lifecycle_onStart_setCheckedCorrectly() {
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(USB_TETHERED);
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(USB_TETHERED);
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(USB_TETHERED);
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(USB_TETHERED);
 
         mEnabler.onStart();
         assertThat(mSwitchBar.isChecked()).isTrue();
@@ -150,7 +150,7 @@
         mEnabler.onStart();
         mEnabler.startTethering(TetheringManager.TETHERING_WIFI);
 
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[0]);
         mEnabler.mOnStartTetheringCallback.onTetheringFailed();
 
         assertThat(mSwitchBar.isChecked()).isFalse();
@@ -255,8 +255,8 @@
 
     @Test
     public void updateState_shouldEnableSwitchBarTethering() {
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(USB_TETHERED);
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(USB_TETHERED);
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(USB_TETHERED);
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(USB_TETHERED);
 
         mSwitchWidgetController.setListener(mEnabler);
         mSwitchWidgetController.startListening();
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index 3958589..4824eb2 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
@@ -33,6 +33,7 @@
 import android.content.IntentFilter;
 import android.database.ContentObserver;
 import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.provider.Settings;
 
 import androidx.preference.Preference;
@@ -56,7 +57,7 @@
     @Mock
     private Context mContext;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private BluetoothAdapter mBluetoothAdapter;
     @Mock
@@ -69,7 +70,7 @@
         MockitoAnnotations.initMocks(this);
         mController = spy(TetherPreferenceController.class);
         ReflectionHelpers.setField(mController, "mContext", mContext);
-        ReflectionHelpers.setField(mController, "mConnectivityManager", mConnectivityManager);
+        ReflectionHelpers.setField(mController, "mTetheringManager", mTetheringManager);
         ReflectionHelpers.setField(mController, "mBluetoothAdapter", mBluetoothAdapter);
         ReflectionHelpers.setField(mController, "mPreference", mPreference);
     }
@@ -106,16 +107,16 @@
     }
 
     @Test
-    public void updateSummary_noPreference_noInteractionWithConnectivityManager() {
+    public void updateSummary_noPreference_noInteractionWithTetheringManager() {
         ReflectionHelpers.setField(mController, "mPreference", null);
         mController.updateSummary();
-        verifyNoMoreInteractions(mConnectivityManager);
+        verifyNoMoreInteractions(mTetheringManager);
     }
 
     @Test
     public void updateSummary_wifiTethered_shouldShowHotspotMessage() {
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[]{"123"});
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"123"});
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[]{"123"});
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"123"});
 
         mController.updateSummary();
         verify(mPreference).setSummary(R.string.tether_settings_summary_hotspot_on_tether_off);
@@ -123,8 +124,8 @@
 
     @Test
     public void updateSummary_btThetherOn_shouldShowTetherMessage() {
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[]{"123"});
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"});
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[]{"123"});
+        when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"});
 
         mController.updateSummary();
         verify(mPreference).setSummary(R.string.tether_settings_summary_hotspot_off_tether_on);
@@ -132,8 +133,8 @@
 
     @Test
     public void updateSummary_tetherOff_shouldShowTetherOffMessage() {
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"});
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"});
+        when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"});
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"});
 
         mController.updateSummary();
         verify(mPreference).setSummary(R.string.switch_off_text);
@@ -141,9 +142,9 @@
 
     @Test
     public void updateSummary_wifiBtTetherOn_shouldShowHotspotAndTetherMessage() {
-        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[]{"123", "456"});
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"});
-        when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"23"});
+        when(mTetheringManager.getTetheredIfaces()).thenReturn(new String[]{"123", "456"});
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"});
+        when(mTetheringManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"23"});
 
         mController.updateSummary();
         verify(mPreference).setSummary(R.string.tether_settings_summary_hotspot_on_tether_on);
diff --git a/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java
index 066084e..e02da90 100644
--- a/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/UsbTetherPreferenceControllerTest.java
@@ -25,7 +25,6 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
 import android.net.TetheringManager;
 
 import androidx.preference.SwitchPreference;
@@ -43,7 +42,7 @@
 public class UsbTetherPreferenceControllerTest {
 
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private TetherEnabler mTetherEnabler;
 
@@ -56,9 +55,8 @@
         MockitoAnnotations.initMocks(this);
 
         mContext = spy(ApplicationProvider.getApplicationContext());
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(
-                mConnectivityManager);
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{""});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[]{""});
         mController = new UsbTetherPreferenceController(mContext, "USB");
         mController.setTetherEnabler(mTetherEnabler);
         mSwitchPreference = spy(SwitchPreference.class);
@@ -94,7 +92,7 @@
 
     @Test
     public void shouldShow_noTetherableUsb() {
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableUsbRegexs()).thenReturn(new String[0]);
         assertThat(mController.shouldShow()).isFalse();
     }
 
diff --git a/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java
index 1d2042c..a82a71f 100644
--- a/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/WifiTetherDisablePreferenceControllerTest.java
@@ -28,7 +28,7 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 
 import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
@@ -77,7 +77,7 @@
     }
 
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private PreferenceScreen mPreferenceScreen;
     @Mock
@@ -100,9 +100,8 @@
 
         mContext = spy(ApplicationProvider.getApplicationContext());
         mPreference = spy(SwitchPreference.class);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(
-                mConnectivityManager);
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{""});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{""});
         mController = new WifiTetherDisablePreferenceController(mContext, WIFI_TETHER_DISABLE_KEY);
         mController.setTetherEnabler(mTetherEnabler);
         ReflectionHelpers.setField(mController, "mScreen", mPreferenceScreen);
@@ -112,7 +111,7 @@
 
     @Test
     public void shouldShow_noTetherableWifi() {
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[0]);
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[0]);
         assertThat(mController.shouldShow()).isFalse();
     }
 
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java
index ea90860..44611ce 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java
@@ -74,7 +74,7 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+        when(mActivity.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
         when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
         when(mContext.getSystemService(NetworkStatsManager.class)).thenReturn(mNetworkStatsManager);
         ShadowEntityHeaderController.setUseMock(mock(EntityHeaderController.class));
diff --git a/tests/robotests/src/com/android/settings/network/telephony/SignalStrengthListenerTest.java b/tests/robotests/src/com/android/settings/network/telephony/SignalStrengthListenerTest.java
index 406f360..6abf8a0 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/SignalStrengthListenerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/SignalStrengthListenerTest.java
@@ -16,13 +16,9 @@
 
 package com.android.settings.network.telephony;
 
-import static android.telephony.PhoneStateListener.LISTEN_NONE;
-import static android.telephony.PhoneStateListener.LISTEN_SIGNAL_STRENGTHS;
-
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -31,7 +27,7 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.telephony.PhoneStateListener;
+import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
 
 import org.junit.Before;
@@ -44,6 +40,8 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
+import java.util.concurrent.Executor;
+
 @RunWith(RobolectricTestRunner.class)
 public class SignalStrengthListenerTest {
     private static final int SUB_ID_1 = 111;
@@ -88,13 +86,19 @@
     @Test
     public void updateSubscriptionIds_beforeResume_startedListening() {
         mListener.updateSubscriptionIds(Sets.newSet(SUB_ID_1, SUB_ID_2));
-        ArgumentCaptor<PhoneStateListener> captor1 = ArgumentCaptor.forClass(
-                PhoneStateListener.class);
-        ArgumentCaptor<PhoneStateListener> captor2 = ArgumentCaptor.forClass(
-                PhoneStateListener.class);
-        verify(mManager1).listen(captor1.capture(), eq(LISTEN_SIGNAL_STRENGTHS));
-        verify(mManager2).listen(captor2.capture(), eq(LISTEN_SIGNAL_STRENGTHS));
-        verify(mManager3, never()).listen(any(), anyInt());
+        ArgumentCaptor<SignalStrengthListener.SignalStrengthTelephonyCallback> captor1 =
+                ArgumentCaptor.forClass(
+                        SignalStrengthListener.SignalStrengthTelephonyCallback.class);
+        ArgumentCaptor<SignalStrengthListener.SignalStrengthTelephonyCallback> captor2 =
+                ArgumentCaptor.forClass(
+                        SignalStrengthListener.SignalStrengthTelephonyCallback.class);
+
+        verify(mManager1).registerTelephonyCallback(
+                any(Executor.class), captor1.capture());
+        verify(mManager2).registerTelephonyCallback(
+                any(Executor.class), captor2.capture());
+        verify(mManager3, never()).registerTelephonyCallback(any(), any());
+
         assertThat(captor1.getValue()).isNotNull();
         assertThat(captor2.getValue()).isNotNull();
 
@@ -105,46 +109,57 @@
     @Test
     public void updateSubscriptionIds_twoCalls_oneIdAdded() {
         mListener.updateSubscriptionIds(Sets.newSet(SUB_ID_1, SUB_ID_2));
-        verify(mManager1).listen(any(PhoneStateListener.class), eq(LISTEN_SIGNAL_STRENGTHS));
-        verify(mManager2).listen(any(PhoneStateListener.class), eq(LISTEN_SIGNAL_STRENGTHS));
+
+        verify(mManager1).registerTelephonyCallback(any(Executor.class),
+                eq(mListener.mTelephonyCallbacks.get(SUB_ID_1)));
+        verify(mManager2).registerTelephonyCallback(any(Executor.class),
+                eq(mListener.mTelephonyCallbacks.get(SUB_ID_2)));
 
         mListener.updateSubscriptionIds(Sets.newSet(SUB_ID_1, SUB_ID_2, SUB_ID_3));
-        verify(mManager1, never()).listen(any(PhoneStateListener.class), eq(LISTEN_NONE));
-        verify(mManager2, never()).listen(any(PhoneStateListener.class), eq(LISTEN_NONE));
-        verify(mManager3).listen(any(PhoneStateListener.class), eq(LISTEN_SIGNAL_STRENGTHS));
+        verify(mManager1, never()).unregisterTelephonyCallback(
+                mListener.mTelephonyCallbacks.get(SUB_ID_1));
+        verify(mManager2, never()).unregisterTelephonyCallback(
+                mListener.mTelephonyCallbacks.get(SUB_ID_2));
+        verify(mManager3).registerTelephonyCallback(
+                any(Executor.class), eq(mListener.mTelephonyCallbacks.get(SUB_ID_3)));
     }
 
     @Test
     public void updateSubscriptionIds_twoCalls_oneIdRemoved() {
-        ArgumentCaptor<PhoneStateListener> captor1 = ArgumentCaptor.forClass(
-                PhoneStateListener.class);
+        ArgumentCaptor<SignalStrengthListener.SignalStrengthTelephonyCallback> captor1 =
+                ArgumentCaptor.forClass(
+                        SignalStrengthListener.SignalStrengthTelephonyCallback.class);
 
         mListener.updateSubscriptionIds(Sets.newSet(SUB_ID_1, SUB_ID_2));
-        verify(mManager1).listen(captor1.capture(), eq(LISTEN_SIGNAL_STRENGTHS));
-        verify(mManager2).listen(any(PhoneStateListener.class), eq(LISTEN_SIGNAL_STRENGTHS));
+        verify(mManager1).registerTelephonyCallback(any(Executor.class), captor1.capture());
+        verify(mManager2).registerTelephonyCallback(
+                any(Executor.class), any(TelephonyCallback.class));
 
         mListener.updateSubscriptionIds(Sets.newSet(SUB_ID_2));
-        verify(mManager1).listen(captor1.capture(), eq(LISTEN_NONE));
-        verify(mManager2, never()).listen(any(PhoneStateListener.class), eq(LISTEN_NONE));
+        verify(mManager1).unregisterTelephonyCallback(captor1.capture());
+        verify(mManager2, never()).unregisterTelephonyCallback(any(TelephonyCallback.class));
         // Make sure the correct listener was removed.
         assertThat(captor1.getAllValues().get(0) == captor1.getAllValues().get(1)).isTrue();
     }
 
     @Test
     public void updateSubscriptionIds_twoCalls_twoIdsRemovedOneAdded() {
-        ArgumentCaptor<PhoneStateListener> captor1 = ArgumentCaptor.forClass(
-                PhoneStateListener.class);
-        ArgumentCaptor<PhoneStateListener> captor2 = ArgumentCaptor.forClass(
-                PhoneStateListener.class);
+        ArgumentCaptor<SignalStrengthListener.SignalStrengthTelephonyCallback> captor1 =
+                ArgumentCaptor.forClass(
+                        SignalStrengthListener.SignalStrengthTelephonyCallback.class);
+        ArgumentCaptor<SignalStrengthListener.SignalStrengthTelephonyCallback> captor2 =
+                ArgumentCaptor.forClass(
+                        SignalStrengthListener.SignalStrengthTelephonyCallback.class);
 
         mListener.updateSubscriptionIds(Sets.newSet(SUB_ID_1, SUB_ID_2));
-        verify(mManager1).listen(captor1.capture(), eq(LISTEN_SIGNAL_STRENGTHS));
-        verify(mManager2).listen(captor2.capture(), eq(LISTEN_SIGNAL_STRENGTHS));
+        verify(mManager1).registerTelephonyCallback(any(Executor.class), captor1.capture());
+        verify(mManager2).registerTelephonyCallback(any(Executor.class), captor2.capture());
 
         mListener.updateSubscriptionIds(Sets.newSet(SUB_ID_3));
-        verify(mManager1).listen(captor1.capture(), eq(LISTEN_NONE));
-        verify(mManager2).listen(captor2.capture(), eq(LISTEN_NONE));
-        verify(mManager3).listen(any(PhoneStateListener.class), eq(LISTEN_SIGNAL_STRENGTHS));
+        verify(mManager1).unregisterTelephonyCallback(captor1.capture());
+        verify(mManager2).unregisterTelephonyCallback(captor2.capture());
+        verify(mManager3).registerTelephonyCallback(
+                any(Executor.class), any(TelephonyCallback.class));
         // Make sure the correct listeners were removed.
         assertThat(captor1.getValue() != captor2.getValue()).isTrue();
         assertThat(captor1.getAllValues().get(0) == captor1.getAllValues().get(1)).isTrue();
@@ -157,15 +172,19 @@
         mListener.pause();
         mListener.resume();
 
-        ArgumentCaptor<PhoneStateListener> captor1 = ArgumentCaptor.forClass(
-                PhoneStateListener.class);
-        ArgumentCaptor<PhoneStateListener> captor2 = ArgumentCaptor.forClass(
-                PhoneStateListener.class);
-        verify(mManager1, times(2)).listen(captor1.capture(), eq(LISTEN_SIGNAL_STRENGTHS));
-        verify(mManager1).listen(captor1.capture(), eq(LISTEN_NONE));
+        ArgumentCaptor<SignalStrengthListener.SignalStrengthTelephonyCallback> captor1 =
+                ArgumentCaptor.forClass(
+                        SignalStrengthListener.SignalStrengthTelephonyCallback.class);
+        ArgumentCaptor<SignalStrengthListener.SignalStrengthTelephonyCallback> captor2 =
+                ArgumentCaptor.forClass(
+                        SignalStrengthListener.SignalStrengthTelephonyCallback.class);
+        verify(mManager1, times(2)).registerTelephonyCallback(
+                any(Executor.class), captor1.capture());
+        verify(mManager1).unregisterTelephonyCallback(captor1.capture());
 
-        verify(mManager2, times(2)).listen(captor2.capture(), eq(LISTEN_SIGNAL_STRENGTHS));
-        verify(mManager2).listen(captor2.capture(), eq(LISTEN_NONE));
+        verify(mManager2, times(2)).registerTelephonyCallback(
+                any(Executor.class), captor2.capture());
+        verify(mManager2).unregisterTelephonyCallback(captor2.capture());
 
         assertThat(captor1.getAllValues().get(0) == captor1.getAllValues().get(1)).isTrue();
         assertThat(captor1.getAllValues().get(0) == captor1.getAllValues().get(2)).isTrue();
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
index cb50609..17471b5 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
@@ -26,24 +26,50 @@
 
 import android.app.role.RoleManager;
 import android.app.usage.UsageEvents;
+import android.bluetooth.BluetoothAdapter;
+import android.companion.ICompanionDeviceManager;
+import android.content.ComponentName;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Parcel;
 
 import com.android.settings.notification.NotificationBackend.AppRow;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
+import com.google.common.collect.ImmutableList;
+
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
 public class NotificationBackendTest {
 
+    @Mock
+    LocalBluetoothManager mBm;
+    @Mock
+    ICompanionDeviceManager mCdm;
+    @Mock
+    CachedBluetoothDeviceManager mCbm;
+    ComponentName mCn = new ComponentName("a", "b");
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mBm.getCachedDeviceManager()).thenReturn(mCbm);
+    }
+
     @Test
     public void testMarkAppRow_unblockablePackage() {
         AppRow appRow = new AppRow();
@@ -138,4 +164,69 @@
         parcel.setDataPosition(0);
         return UsageEvents.CREATOR.createFromParcel(parcel);
     }
+
+    @Test
+    public void getDeviceList_noAssociations() throws Exception {
+        when(mCdm.getAssociations(mCn.getPackageName(), 0)).thenReturn(null);
+
+        Collection<CachedBluetoothDevice> cachedDevices = new ArrayList<>();
+        CachedBluetoothDevice cbd1 = mock(CachedBluetoothDevice.class);
+        when(cbd1.getAddress()).thenReturn("00:00:00:00:00:10");
+        when(cbd1.getName()).thenReturn("Device 1");
+        cachedDevices.add(cbd1);
+        when(mCbm.getCachedDevicesCopy()).thenReturn(cachedDevices);
+
+        BluetoothAdapter.getDefaultAdapter().enable();
+
+        assertThat(new NotificationBackend().getDeviceList(
+                mCdm, mBm, mCn.getPackageName(), 0).toString()).isEmpty();
+    }
+
+    @Test
+    public void getDeviceList_associationsButNoDevice() throws Exception {
+        List<String> macs = ImmutableList.of("00:00:00:00:00:10", "00:00:00:00:00:20");
+        when(mCdm.getAssociations(mCn.getPackageName(), 0)).thenReturn(macs);
+
+        when(mCbm.getCachedDevicesCopy()).thenReturn(new ArrayList<>());
+
+        assertThat(new NotificationBackend().getDeviceList(
+                mCdm, mBm, mCn.getPackageName(), 0).toString()).isEmpty();
+    }
+
+    @Test
+    public void getDeviceList_singleDevice() throws Exception {
+        List<String> macs = ImmutableList.of("00:00:00:00:00:10", "00:00:00:00:00:20");
+        when(mCdm.getAssociations(mCn.getPackageName(), 0)).thenReturn(macs);
+
+        Collection<CachedBluetoothDevice> cachedDevices = new ArrayList<>();
+        CachedBluetoothDevice cbd1 = mock(CachedBluetoothDevice.class);
+        when(cbd1.getAddress()).thenReturn(macs.get(0));
+        when(cbd1.getName()).thenReturn("Device 1");
+        cachedDevices.add(cbd1);
+        when(mCbm.getCachedDevicesCopy()).thenReturn(cachedDevices);
+
+        assertThat(new NotificationBackend().getDeviceList(
+                mCdm, mBm, mCn.getPackageName(), 0).toString()).isEqualTo("Device 1");
+    }
+
+    @Test
+    public void getDeviceList_multipleDevices() throws Exception {
+        List<String> macs = ImmutableList.of("00:00:00:00:00:10", "00:00:00:00:00:20");
+        when(mCdm.getAssociations(mCn.getPackageName(), 0)).thenReturn(macs);
+
+        Collection<CachedBluetoothDevice> cachedDevices = new ArrayList<>();
+        CachedBluetoothDevice cbd1 = mock(CachedBluetoothDevice.class);
+        when(cbd1.getAddress()).thenReturn(macs.get(0));
+        when(cbd1.getName()).thenReturn("Device 1");
+        cachedDevices.add(cbd1);
+
+        CachedBluetoothDevice cbd2 = mock(CachedBluetoothDevice.class);
+        when(cbd2.getAddress()).thenReturn(macs.get(1));
+        when(cbd2.getName()).thenReturn("Device 2");
+        cachedDevices.add(cbd2);
+        when(mCbm.getCachedDevicesCopy()).thenReturn(cachedDevices);
+
+        assertThat(new NotificationBackend().getDeviceList(
+                mCdm, mBm, mCn.getPackageName(), 0).toString()).isEqualTo("Device 1, Device 2");
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java b/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
index a6d3354..10e291c 100644
--- a/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
+++ b/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
@@ -15,7 +15,6 @@
  */
 package com.android.settings.sim;
 
-
 import static android.app.NotificationManager.IMPORTANCE_HIGH;
 import static android.provider.Settings.ENABLE_MMS_DATA_REQUEST_REASON_INCOMING_MMS;
 import static android.provider.Settings.ENABLE_MMS_DATA_REQUEST_REASON_OUTGOING_MMS;
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index 6fb2eae..a48b3eb 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -23,6 +23,7 @@
 
 import com.android.settings.accounts.AccountFeatureProvider;
 import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.applications.appinfo.ExtraAppInfoFeatureProvider;
 import com.android.settings.aware.AwareFeatureProvider;
 import com.android.settings.biometrics.face.FaceFeatureProvider;
 import com.android.settings.bluetooth.BluetoothFeatureProvider;
@@ -79,6 +80,7 @@
     public ContextualCardFeatureProvider mContextualCardFeatureProvider;
 
     public WifiTrackerLibProvider wifiTrackerLibProvider;
+    public ExtraAppInfoFeatureProvider extraAppInfoFeatureProvider;
 
     /**
      * Call this in {@code @Before} method of the test class to use fake factory.
@@ -124,6 +126,7 @@
         mAwareFeatureProvider = mock(AwareFeatureProvider.class);
         mFaceFeatureProvider = mock(FaceFeatureProvider.class);
         wifiTrackerLibProvider = mock(WifiTrackerLibProvider.class);
+        extraAppInfoFeatureProvider = mock(ExtraAppInfoFeatureProvider.class);
     }
 
     @Override
@@ -240,4 +243,9 @@
     public WifiTrackerLibProvider getWifiTrackerLibProvider() {
         return wifiTrackerLibProvider;
     }
+
+    @Override
+    public ExtraAppInfoFeatureProvider getExtraAppInfoFeatureProvider() {
+        return extraAppInfoFeatureProvider;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java
index b8fdf89..a2e4430 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDevicePolicyManager.java
@@ -1,11 +1,13 @@
 package com.android.settings.testutils.shadow;
 
+import static android.app.admin.DevicePolicyManager.DEVICE_OWNER_TYPE_DEFAULT;
 import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.UserIdInt;
 import android.app.admin.DevicePolicyManager;
+import android.app.admin.DevicePolicyManager.DeviceOwnerType;
 import android.app.admin.PasswordMetrics;
 import android.app.admin.PasswordPolicy;
 import android.content.ComponentName;
@@ -23,6 +25,7 @@
 public class ShadowDevicePolicyManager extends org.robolectric.shadows.ShadowDevicePolicyManager {
 
     private final Map<Integer, Long> mProfileTimeouts = new HashMap<>();
+    private final Map<String, Integer> mDeviceOwnerTypes = new HashMap<>();
     private Map<Integer, CharSequence> mSupportMessagesMap = new HashMap<>();
     private boolean mIsAdminActiveAsUser = false;
     private ComponentName mDeviceOwnerComponentName;
@@ -77,6 +80,16 @@
         mDeviceOwnerComponentName = admin;
     }
 
+    public void setDeviceOwnerType(@NonNull ComponentName admin,
+            @DeviceOwnerType int deviceOwnerType) {
+        mDeviceOwnerTypes.put(admin.getPackageName(), deviceOwnerType);
+    }
+
+    @DeviceOwnerType
+    public int getDeviceOwnerType(@NonNull ComponentName admin) {
+        return mDeviceOwnerTypes.getOrDefault(admin.getPackageName(), DEVICE_OWNER_TYPE_DEFAULT);
+    }
+
     @Implementation
     public PasswordMetrics getPasswordMinimumMetrics(int userHandle) {
         PasswordPolicy policy = new PasswordPolicy();
diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
index 23b7edc..f5e2a50 100644
--- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
@@ -20,6 +20,7 @@
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -43,6 +44,8 @@
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 
+import com.google.android.material.appbar.AppBarLayout;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -85,9 +88,12 @@
 
     @Test
     public void requestHighlight_hasKey_notHighlightedBefore_shouldRequest() {
-        mAdapter.requestHighlight(mRoot, mock(RecyclerView.class));
+        when(mAdapter.getPreferenceAdapterPosition(anyString())).thenReturn(1);
+        mAdapter.requestHighlight(mRoot, mock(RecyclerView.class), mock(AppBarLayout.class));
 
         verify(mRoot).postDelayed(any(),
+                eq(HighlightablePreferenceGroupAdapter.DELAY_COLLAPSE_DURATION_MILLIS));
+        verify(mRoot).postDelayed(any(),
                 eq(HighlightablePreferenceGroupAdapter.DELAY_HIGHLIGHT_DURATION_MILLIS));
     }
 
@@ -95,21 +101,21 @@
     public void requestHighlight_noKey_highlightedBefore_noRecyclerView_shouldNotRequest() {
         ReflectionHelpers.setField(mAdapter, "mHighlightKey", null);
         ReflectionHelpers.setField(mAdapter, "mHighlightRequested", false);
-        mAdapter.requestHighlight(mRoot, mock(RecyclerView.class));
+        mAdapter.requestHighlight(mRoot, mock(RecyclerView.class),  mock(AppBarLayout.class));
 
         ReflectionHelpers.setField(mAdapter, "mHighlightKey", TEST_KEY);
         ReflectionHelpers.setField(mAdapter, "mHighlightRequested", true);
-        mAdapter.requestHighlight(mRoot, mock(RecyclerView.class));
+        mAdapter.requestHighlight(mRoot, mock(RecyclerView.class), mock(AppBarLayout.class));
 
         ReflectionHelpers.setField(mAdapter, "mHighlightKey", TEST_KEY);
         ReflectionHelpers.setField(mAdapter, "mHighlightRequested", false);
-        mAdapter.requestHighlight(mRoot, null /* recyclerView */);
+        mAdapter.requestHighlight(mRoot, null /* recyclerView */,  mock(AppBarLayout.class));
 
         verifyZeroInteractions(mRoot);
     }
 
     @Test
-    public void adjustInitialExpandedChildCount_invalidInput_shouldNotadjust() {
+    public void adjustInitialExpandedChildCount_invalidInput_shouldNotAdjust() {
         HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(null /* host */);
         HighlightablePreferenceGroupAdapter.adjustInitialExpandedChildCount(mFragment);
         final Bundle args = new Bundle();
diff --git a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
index 6f3230c..81f8e63 100644
--- a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
@@ -24,14 +24,12 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
-import android.content.Context;
 import android.content.res.Resources;
 import android.telephony.SubscriptionManager;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceControllerTest.java
index f9271a6..13842b5 100644
--- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceControllerTest.java
@@ -26,7 +26,6 @@
 import android.content.Context;
 import android.provider.Settings;
 
-import androidx.preference.Preference;
 import androidx.preference.SwitchPreference;
 
 import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
index 22e18bb..d227ac1 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
@@ -18,9 +18,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
@@ -33,9 +30,6 @@
 import android.net.wifi.WifiEnterpriseConfig.Eap;
 import android.net.wifi.WifiEnterpriseConfig.Phase2;
 import android.net.wifi.WifiManager;
-import android.os.ServiceSpecificException;
-import android.security.Credentials;
-import android.security.KeyStore;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -51,9 +45,12 @@
 import com.android.settings.R;
 import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+import com.android.settings.utils.AndroidKeystoreAliasLoader;
 import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
 import com.android.wifitrackerlib.WifiEntry;
 
+import com.google.common.collect.ImmutableList;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -79,7 +76,7 @@
     @Mock
     private WifiEntry mWifiEntry;
     @Mock
-    private KeyStore mKeyStore;
+    private AndroidKeystoreAliasLoader mAndroidKeystoreAliasLoader;
     private View mView;
     private Spinner mHiddenSettingsSpinner;
     private Spinner mEapCaCertSpinner;
@@ -286,27 +283,11 @@
     }
 
     @Test
-    public void loadCertificates_keyStoreListFail_shouldNotCrash() {
-        // Set up
-        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
-        when(mKeyStore.list(anyString()))
-            .thenThrow(new ServiceSpecificException(-1, "permission error"));
-
-        mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
-              WifiConfigUiBase2.MODE_CONNECT);
-
-        // Verify that the EAP method menu is visible.
-        assertThat(mView.findViewById(R.id.eap).getVisibility()).isEqualTo(View.VISIBLE);
-        // No Crash
-    }
-
-    @Test
     public void loadCertificates_undesiredCertificates_shouldNotLoadUndesiredCertificates() {
         final Spinner spinner = new Spinner(mContext);
-        when(mKeyStore.list(anyString())).thenReturn(WifiConfigController2.UNDESIRED_CERTIFICATES);
 
         mController.loadCertificates(spinner,
-                "prefix",
+                Arrays.asList(WifiConfigController.UNDESIRED_CERTIFICATES),
                 "doNotProvideEapUserCertString",
                 false /* showMultipleCerts */,
                 false /* showUsePreinstalledCertOption */);
@@ -432,8 +413,8 @@
         }
 
         @Override
-        KeyStore getKeyStore() {
-            return mKeyStore;
+        AndroidKeystoreAliasLoader getAndroidKeystoreAliasLoader() {
+            return mAndroidKeystoreAliasLoader;
         }
     }
 
@@ -882,6 +863,7 @@
             String savedUserCertificate) {
         final WifiConfiguration mockWifiConfig = mock(WifiConfiguration.class);
         final WifiEnterpriseConfig mockWifiEnterpriseConfig = mock(WifiEnterpriseConfig.class);
+
         mockWifiConfig.enterpriseConfig = mockWifiEnterpriseConfig;
         when(mWifiEntry.isSaved()).thenReturn(true);
         when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
@@ -892,15 +874,15 @@
             String[] savedCaCertificates = new String[]{savedCaCertificate};
             when(mockWifiEnterpriseConfig.getCaCertificateAliases())
                     .thenReturn(savedCaCertificates);
-            when(mKeyStore.list(eq(Credentials.CA_CERTIFICATE), anyInt()))
-                    .thenReturn(savedCaCertificates);
+            when(mAndroidKeystoreAliasLoader.getCaCertAliases())
+                    .thenReturn(ImmutableList.of(savedCaCertificate));
         }
         if (savedUserCertificate != null) {
             String[] savedUserCertificates = new String[]{savedUserCertificate};
             when(mockWifiEnterpriseConfig.getClientCertificateAlias())
                     .thenReturn(savedUserCertificate);
-            when(mKeyStore.list(eq(Credentials.USER_PRIVATE_KEY), anyInt()))
-                    .thenReturn(savedUserCertificates);
+            when(mAndroidKeystoreAliasLoader.getKeyCertAliases())
+                    .thenReturn(ImmutableList.of(savedUserCertificate));
         }
 
         mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index 455e9f1..80543ec 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -21,7 +21,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
@@ -34,8 +33,6 @@
 import android.net.wifi.WifiEnterpriseConfig.Eap;
 import android.net.wifi.WifiEnterpriseConfig.Phase2;
 import android.net.wifi.WifiManager;
-import android.os.ServiceSpecificException;
-import android.security.KeyStore;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -77,8 +74,6 @@
     private Context mContext;
     @Mock
     private AccessPoint mAccessPoint;
-    @Mock
-    private KeyStore mKeyStore;
     private View mView;
     private Spinner mHiddenSettingsSpinner;
     private ShadowSubscriptionManager mShadowSubscriptionManager;
@@ -267,27 +262,11 @@
     }
 
     @Test
-    public void loadCertificates_keyStoreListFail_shouldNotCrash() {
-        // Set up
-        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_EAP);
-        when(mKeyStore.list(anyString()))
-            .thenThrow(new ServiceSpecificException(-1, "permission error"));
-
-        mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
-              WifiConfigUiBase.MODE_CONNECT);
-
-        // Verify that the EAP method menu is visible.
-        assertThat(mView.findViewById(R.id.eap).getVisibility()).isEqualTo(View.VISIBLE);
-        // No Crash
-    }
-
-    @Test
     public void loadCertificates_undesiredCertificates_shouldNotLoadUndesiredCertificates() {
         final Spinner spinner = new Spinner(mContext);
-        when(mKeyStore.list(anyString())).thenReturn(WifiConfigController.UNDESIRED_CERTIFICATES);
 
         mController.loadCertificates(spinner,
-                "prefix",
+                Arrays.asList(WifiConfigController.UNDESIRED_CERTIFICATES),
                 "doNotProvideEapUserCertString",
                 false /* showMultipleCerts */,
                 false /* showUsePreinstalledCertOption */);
@@ -412,8 +391,6 @@
             super(parent, view, accessPoint, mode, wifiManager);
         }
 
-        @Override
-        KeyStore getKeyStore() { return mKeyStore; }
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java
index 4cfc9ba..8478a54 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/DisclaimerItemListAdapterTest.java
@@ -17,9 +17,10 @@
 package com.android.settings.wifi.calling;
 
 import static com.android.settings.wifi.calling.DisclaimerItemListAdapter
-        .DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_TITLE;
-import static com.android.settings.wifi.calling.DisclaimerItemListAdapter
         .DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_DESCRIPTION;
+import static com.android.settings.wifi.calling.DisclaimerItemListAdapter
+        .DisclaimerItemViewHolder.ID_DISCLAIMER_ITEM_TITLE;
+
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyObject;
@@ -33,11 +34,6 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.android.settings.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -45,6 +41,9 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RunWith(RobolectricTestRunner.class)
 public class DisclaimerItemListAdapterTest {
 
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java
index ce80324..985edda 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/EmergencyCallLimitationDisclaimerTest.java
@@ -17,10 +17,10 @@
 package com.android.settings.wifi.calling;
 
 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.doReturn;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
@@ -29,11 +29,9 @@
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 
-import com.android.settings.R;
-
 import org.junit.Before;
-import org.junit.runner.RunWith;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java
index 9494288..3fe9678 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/LocationPolicyDisclaimerTest.java
@@ -17,12 +17,10 @@
 package com.android.settings.wifi.calling;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyBoolean;
+
 import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
@@ -31,11 +29,9 @@
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 
-import com.android.settings.R;
-
 import org.junit.Before;
-import org.junit.runner.RunWith;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
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 2e93faa..a3c2535 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
@@ -16,18 +16,17 @@
 
 package com.android.settings.wifi.calling;
 
+import static junit.framework.Assert.assertEquals;
+
 import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static junit.framework.Assert.assertEquals;
-
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -55,8 +54,7 @@
 import com.android.settings.network.ims.MockWifiCallingQueryImsState;
 import com.android.settings.network.ims.WifiCallingQueryImsState;
 import com.android.settings.testutils.shadow.ShadowFragment;
-import com.android.settings.widget.SwitchBar;
-import com.android.settings.widget.ToggleSwitch;
+import com.android.settings.widget.SettingsMainSwitchBar;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -85,19 +83,28 @@
     private final PersistableBundle mBundle = new PersistableBundle();
 
     private MockWifiCallingQueryImsState mQueryImsState;
+    private SettingsMainSwitchBar mSwitchBar;
 
-    @Mock private static CarrierConfigManager sCarrierConfigManager;
-    @Mock private CarrierConfigManager mMockConfigManager;
-    @Mock private ImsMmTelManager mImsMmTelManager;
-    @Mock private TelephonyManager mTelephonyManager;
-    @Mock private PreferenceScreen mPreferenceScreen;
-    @Mock private SettingsActivity mActivity;
-    @Mock private SwitchBar mSwitchBar;
-    @Mock private ToggleSwitch mToggleSwitch;
-    @Mock private View mView;
-    @Mock private ListWithEntrySummaryPreference mButtonWfcMode;
-    @Mock private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
-    @Mock private Preference mUpdateAddress;
+    @Mock
+    private static CarrierConfigManager sCarrierConfigManager;
+    @Mock
+    private CarrierConfigManager mMockConfigManager;
+    @Mock
+    private ImsMmTelManager mImsMmTelManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private SettingsActivity mActivity;
+    @Mock
+    private View mView;
+    @Mock
+    private ListWithEntrySummaryPreference mButtonWfcMode;
+    @Mock
+    private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
+    @Mock
+    private Preference mUpdateAddress;
 
     @Before
     public void setUp() throws Exception {
@@ -125,7 +132,7 @@
         mEmptyView = new TextView(mContext);
         doReturn(mEmptyView).when(mView).findViewById(android.R.id.empty);
 
-        ReflectionHelpers.setField(mSwitchBar, "mSwitch", mToggleSwitch);
+        mSwitchBar = new SettingsMainSwitchBar(mContext);
         doReturn(mSwitchBar).when(mView).findViewById(R.id.switch_bar);
 
         mQueryImsState = new MockWifiCallingQueryImsState(mContext, SUB_ID);
@@ -364,6 +371,7 @@
         }
 
         @Override
-        void showAlert(Intent intent) {}
+        void showAlert(Intent intent) {
+        }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
index e639b67..d777a59 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
@@ -25,7 +25,7 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiManager;
 
@@ -57,7 +57,7 @@
 
     private Context mContext;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private WifiManager mWifiManager;
     @Mock
@@ -74,9 +74,8 @@
         mContext = spy(RuntimeEnvironment.application);
         mPreference = new ListPreference(RuntimeEnvironment.application);
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
         when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources());
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
         when(mWifiManager.getSoftApConfiguration()).thenReturn(
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java
index b0ed862..a423071 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherFooterPreferenceControllerTest.java
@@ -16,13 +16,13 @@
 
 package com.android.settings.wifi.tether;
 
-import static org.mockito.ArgumentMatchers.anyString;;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.WifiManager;
 
 import androidx.preference.PreferenceScreen;
@@ -43,7 +43,7 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private WifiManager mWifiManager;
     @Mock
@@ -58,9 +58,8 @@
         MockitoAnnotations.initMocks(this);
 
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
         mController = new WifiTetherFooterPreferenceController(mContext);
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
     }
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
index 7835f7e..8f8477f 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
@@ -26,7 +26,7 @@
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiManager;
 
@@ -53,7 +53,7 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private WifiManager mWifiManager;
     @Mock
@@ -77,9 +77,8 @@
 
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
         when(mWifiManager.getSoftApConfiguration()).thenReturn(mConfig);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
         when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources());
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
 
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
index 920582f..23bb0db 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
@@ -23,7 +23,7 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiManager;
 
@@ -56,7 +56,7 @@
 
     private Context mContext;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private WifiManager mWifiManager;
     @Mock
@@ -77,14 +77,13 @@
         mLifecycle = new Lifecycle(mLifecycleOwner);
         FakeFeatureFactory.setupForTest();
         mPreference = new PrimarySwitchPreference(RuntimeEnvironment.application);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
         mSoftApConfiguration = new SoftApConfiguration.Builder().setSsid(SSID).build();
         when(mWifiManager.getSoftApConfiguration()).thenReturn(mSoftApConfiguration);
 
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
         mController = new WifiTetherPreferenceController(mContext, mLifecycle,
                 false /* initSoftApManager */);
         mController.displayPreference(mScreen);
@@ -92,7 +91,7 @@
 
     @Test
     public void isAvailable_noTetherRegex_shouldReturnFalse() {
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{});
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{});
         mController = new WifiTetherPreferenceController(mContext, mLifecycle,
                 false /* initSoftApManager */);
 
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
index a6a9dda..147cd64 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
@@ -26,7 +26,7 @@
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiManager;
 
@@ -49,7 +49,7 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
-    private ConnectivityManager mConnectivityManager;
+    private TetheringManager mTetheringManager;
     @Mock
     private WifiManager mWifiManager;
     @Mock
@@ -68,9 +68,8 @@
         mPreference = new WifiTetherSsidPreference(RuntimeEnvironment.application);
 
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
-                .thenReturn(mConnectivityManager);
-        when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
+        when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager);
+        when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"});
         when(mContext.getResources()).thenReturn(RuntimeEnvironment.application.getResources());
         when(mScreen.findPreference(anyString())).thenReturn(mPreference);
         mController = new WifiTetherSSIDPreferenceController(mContext, mListener,
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
index b41616b..2ecc7d2 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
@@ -30,6 +30,7 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
+import android.net.TetheringManager;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -70,6 +71,8 @@
     private ConnectivityManager mConnectivityManager;
     @Mock
     private UserManager mUserManager;
+    @Mock
+    private TetheringManager mTetheringManager;
 
     @Before
     public void setUp() {
@@ -78,7 +81,8 @@
         MockitoAnnotations.initMocks(this);
         doReturn(mConnectivityManager)
                 .when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
-        doReturn(WIFI_REGEXS).when(mConnectivityManager).getTetherableWifiRegexs();
+        doReturn(mTetheringManager).when(mContext).getSystemService(Context.TETHERING_SERVICE);
+        doReturn(WIFI_REGEXS).when(mTetheringManager).getTetherableWifiRegexs();
         doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
 
         mWifiTetherSettings = new WifiTetherSettings();
@@ -97,7 +101,7 @@
         assertThat(niks).doesNotContain(WifiTetherSettings.KEY_WIFI_TETHER_NETWORK_NAME);
         assertThat(niks).doesNotContain(WifiTetherSettings.KEY_WIFI_TETHER_NETWORK_PASSWORD);
         assertThat(niks).doesNotContain(WifiTetherSettings.KEY_WIFI_TETHER_AUTO_OFF);
-        assertThat(niks).doesNotContain(WifiTetherSettings.KEY_WIFI_TETHER_NETWORK_AP_BAND);
+        assertThat(niks).doesNotContain(WifiTetherSettings.KEY_WIFI_TETHER_MAXIMIZE_COMPATIBILITY);
     }
 
     @Test
@@ -111,7 +115,7 @@
         assertThat(niks).contains(WifiTetherSettings.KEY_WIFI_TETHER_NETWORK_NAME);
         assertThat(niks).contains(WifiTetherSettings.KEY_WIFI_TETHER_NETWORK_PASSWORD);
         assertThat(niks).contains(WifiTetherSettings.KEY_WIFI_TETHER_AUTO_OFF);
-        assertThat(niks).contains(WifiTetherSettings.KEY_WIFI_TETHER_NETWORK_AP_BAND);
+        assertThat(niks).contains(WifiTetherSettings.KEY_WIFI_TETHER_MAXIMIZE_COMPATIBILITY);
     }
 
     @Test
diff --git a/tests/uitests/Android.bp b/tests/uitests/Android.bp
index 8a3e374..8636c81 100644
--- a/tests/uitests/Android.bp
+++ b/tests/uitests/Android.bp
@@ -12,6 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 android_test {
     name: "SettingsUITests",
     platform_apis: true,
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index b857a0a..b55a788 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -1,3 +1,12 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Settings_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
 android_test {
     name: "SettingsUnitTests",
 
diff --git a/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceControllerTest.java b/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceControllerTest.java
index dee8817..8dac893 100644
--- a/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceControllerTest.java
@@ -24,11 +24,14 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.hardware.display.ColorDisplayManager;
 import android.provider.Settings;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.android.internal.R;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -79,8 +82,19 @@
         Settings.Secure.putInt(mContext.getContentResolver(),
                 Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED, 1);
         mPreferenceController.onPreferenceChange(/* preference= */ null, 20);
-        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.REDUCE_BRIGHT_COLORS_LEVEL, 0))
+        assertThat(
+                mContext.getSystemService(
+                        ColorDisplayManager.class).getReduceBrightColorsStrength())
                 .isEqualTo(20);
     }
+
+    @Test
+    public void rangeOfSlider_staysWithinValidRange() {
+        when(mResources.getInteger(
+                R.integer.config_reduceBrightColorsStrengthMax)).thenReturn(90);
+        when(mResources.getInteger(
+                R.integer.config_reduceBrightColorsStrengthMin)).thenReturn(10);
+        assertThat(mPreferenceController.getMax() - mPreferenceController.getMin())
+                .isEqualTo(80);
+    }
 }
diff --git a/tests/unit/src/com/android/settings/applications/HibernatedAppsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/HibernatedAppsPreferenceControllerTest.java
new file mode 100644
index 0000000..cf4c53e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/HibernatedAppsPreferenceControllerTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import static android.provider.DeviceConfig.NAMESPACE_APP_HIBERNATION;
+
+import static com.android.settings.Utils.PROPERTY_APP_HIBERNATION_ENABLED;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.provider.DeviceConfig;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * TODO(b/181172051): test getNumberHibernated() when the API implemented
+ */
+@RunWith(AndroidJUnit4.class)
+public class HibernatedAppsPreferenceControllerTest {
+
+    private static final String KEY = "key";
+    private Context mContext;
+    private HibernatedAppsPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        DeviceConfig.setProperty(NAMESPACE_APP_HIBERNATION, PROPERTY_APP_HIBERNATION_ENABLED,
+                "true", false);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mController = new HibernatedAppsPreferenceController(mContext, KEY);
+    }
+
+    @Test
+    public void getAvailabilityStatus_featureDisabled_shouldNotReturnAvailable() {
+        DeviceConfig.setProperty(NAMESPACE_APP_HIBERNATION, PROPERTY_APP_HIBERNATION_ENABLED,
+                "false", true);
+
+        assertThat((mController).getAvailabilityStatus()).isNotEqualTo(AVAILABLE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/appinfo/HibernationSwitchPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/appinfo/HibernationSwitchPreferenceControllerTest.java
new file mode 100644
index 0000000..e27942a
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/appinfo/HibernationSwitchPreferenceControllerTest.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.applications.appinfo;
+
+import static android.app.AppOpsManager.MODE_ALLOWED;
+import static android.app.AppOpsManager.MODE_DEFAULT;
+import static android.app.AppOpsManager.MODE_IGNORED;
+import static android.app.AppOpsManager.OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED;
+import static android.provider.DeviceConfig.NAMESPACE_APP_HIBERNATION;
+
+import static com.android.settings.Utils.PROPERTY_APP_HIBERNATION_ENABLED;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.provider.DeviceConfig;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class HibernationSwitchPreferenceControllerTest {
+    private static final int PACKAGE_UID = 1;
+    private static final String INVALID_PACKAGE_NAME = "invalid_package";
+    private static final String KEY = "key";
+    private static final String VALID_PACKAGE_NAME = "package";
+    private static final String EXEMPTED_PACKAGE_NAME = "exempted_package";
+    private static final String UNEXEMPTED_PACKAGE_NAME = "unexempted_package";
+    @Mock
+    private AppOpsManager mAppOpsManager;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private SwitchPreference mPreference;
+
+    private HibernationSwitchPreferenceController mController;
+    private Context mContext;
+
+    @Before
+    public void setUp() throws PackageManager.NameNotFoundException {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager);
+        when(mPackageManager.getPackageUidAsUser(eq(VALID_PACKAGE_NAME), anyInt()))
+                .thenReturn(PACKAGE_UID);
+        when(mPackageManager.getPackageUidAsUser(eq(INVALID_PACKAGE_NAME), anyInt()))
+                .thenThrow(new PackageManager.NameNotFoundException());
+        when(mPackageManager.getTargetSdkVersion(eq(EXEMPTED_PACKAGE_NAME)))
+                .thenReturn(android.os.Build.VERSION_CODES.Q);
+        when(mPackageManager.getTargetSdkVersion(eq(UNEXEMPTED_PACKAGE_NAME)))
+                .thenReturn(android.os.Build.VERSION_CODES.S);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        DeviceConfig.setProperty(NAMESPACE_APP_HIBERNATION, PROPERTY_APP_HIBERNATION_ENABLED,
+                "true", true /* makeDefault */);
+        mController = new HibernationSwitchPreferenceController(mContext, KEY);
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void getAvailabilityStatus_featureNotEnabled_shouldNotReturnAvailable() {
+        mController.setPackage(VALID_PACKAGE_NAME);
+        DeviceConfig.setProperty(NAMESPACE_APP_HIBERNATION, PROPERTY_APP_HIBERNATION_ENABLED,
+                "false", true /* makeDefault */);
+
+        assertThat(mController.getAvailabilityStatus()).isNotEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_invalidPackage_shouldReturnNotAvailable() {
+        mController.setPackage(INVALID_PACKAGE_NAME);
+
+        assertThat(mController.getAvailabilityStatus()).isNotEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_validPackage_shouldReturnAvailable() {
+        mController.setPackage(VALID_PACKAGE_NAME);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void updateState_exemptedByDefaultPackage_shouldNotCheck() {
+        when(mAppOpsManager.unsafeCheckOpNoThrow(
+                eq(OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED), anyInt(), eq(EXEMPTED_PACKAGE_NAME)))
+                .thenReturn(MODE_DEFAULT);
+        mController.setPackage(EXEMPTED_PACKAGE_NAME);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_exemptedPackageOverrideByUser_shouldCheck() {
+        when(mAppOpsManager.unsafeCheckOpNoThrow(
+                eq(OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED), anyInt(), eq(EXEMPTED_PACKAGE_NAME)))
+                .thenReturn(MODE_ALLOWED);
+        mController.setPackage(EXEMPTED_PACKAGE_NAME);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_unexemptedPackageOverrideByUser_shouldNotCheck() {
+        when(mAppOpsManager.unsafeCheckOpNoThrow(
+                eq(OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED), anyInt(), eq(UNEXEMPTED_PACKAGE_NAME)))
+                .thenReturn(MODE_IGNORED);
+        mController.setPackage(UNEXEMPTED_PACKAGE_NAME);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setChecked(false);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/autofill/OWNERS b/tests/unit/src/com/android/settings/applications/autofill/OWNERS
new file mode 100644
index 0000000..fe93c13
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/autofill/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/applications/autofill/OWNERS
diff --git a/tests/unit/src/com/android/settings/applications/autofill/PasswordsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/autofill/PasswordsPreferenceControllerTest.java
new file mode 100644
index 0000000..216658f
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/autofill/PasswordsPreferenceControllerTest.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.autofill;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.Looper;
+import android.service.autofill.AutofillServiceInfo;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.google.android.collect.Lists;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Collections;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class PasswordsPreferenceControllerTest {
+
+    private Context mContext;
+    private PreferenceScreen mScreen;
+    private PreferenceCategory mPasswordsPreferenceCategory;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        if (Looper.myLooper() == null) {
+            Looper.prepare(); // needed to create the preference screen
+        }
+        mScreen = new PreferenceManager(mContext).createPreferenceScreen(mContext);
+        mPasswordsPreferenceCategory = new PreferenceCategory(mContext);
+        mPasswordsPreferenceCategory.setKey("passwords");
+        mScreen.addPreference(mPasswordsPreferenceCategory);
+    }
+
+    @Test
+    public void getAvailabilityStatus_noServices_returnsUnavailable() {
+        PasswordsPreferenceController controller =
+                createControllerWithServices(Collections.emptyList());
+        assertThat(controller.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_noPasswords_returnsUnavailable() {
+        AutofillServiceInfo service = new AutofillServiceInfo.TestDataBuilder().build();
+        PasswordsPreferenceController controller =
+                createControllerWithServices(Lists.newArrayList(service));
+        assertThat(controller.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_withPasswords_returnsAvailable() {
+        PasswordsPreferenceController controller =
+                createControllerWithServices(Lists.newArrayList(createServiceWithPasswords()));
+        assertThat(controller.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void displayPreference_noServices_noPreferencesAdded() {
+        PasswordsPreferenceController controller =
+                createControllerWithServices(Collections.emptyList());
+        controller.displayPreference(mScreen);
+        assertThat(mPasswordsPreferenceCategory.getPreferenceCount()).isEqualTo(0);
+    }
+
+    @Test
+    public void displayPreference_noPasswords_noPreferencesAdded() {
+        AutofillServiceInfo service = new AutofillServiceInfo.TestDataBuilder().build();
+        PasswordsPreferenceController controller =
+                createControllerWithServices(Lists.newArrayList(service));
+        controller.displayPreference(mScreen);
+        assertThat(mPasswordsPreferenceCategory.getPreferenceCount()).isEqualTo(0);
+    }
+
+    @Test
+    public void displayPreference_withPasswords_addsPreference() {
+        AutofillServiceInfo service = createServiceWithPasswords();
+        PasswordsPreferenceController controller =
+                createControllerWithServices(Lists.newArrayList(service));
+        controller.displayPreference(mScreen);
+
+        assertThat(mPasswordsPreferenceCategory.getPreferenceCount()).isEqualTo(1);
+        Preference pref = mPasswordsPreferenceCategory.getPreference(0);
+        assertThat(pref.getIcon()).isNotNull();
+        assertThat(pref.getIntent().getComponent())
+                .isEqualTo(
+                        new ComponentName(
+                                service.getServiceInfo().packageName,
+                                service.getPasswordsActivity()));
+    }
+
+    private PasswordsPreferenceController createControllerWithServices(
+            List<AutofillServiceInfo> availableServices) {
+        return new PasswordsPreferenceController(
+                mContext, mPasswordsPreferenceCategory.getKey(), availableServices);
+    }
+
+    private AutofillServiceInfo createServiceWithPasswords() {
+        return new AutofillServiceInfo.TestDataBuilder()
+                .setPasswordsActivity("com.android.test.Passwords")
+                .build();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java b/tests/unit/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
index ba7a0d2..f186238 100644
--- a/tests/unit/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
+++ b/tests/unit/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
@@ -16,17 +16,21 @@
 
 package com.android.settings.applications.manageapplications;
 
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_ALARMS_AND_REMINDERS;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_INSTALL_SOURCES;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_MEDIA_MANAGEMENT;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_ALLOWLIST;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_RECENT;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WITH_OVERLAY;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WRITE_SETTINGS;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_ALARMS_AND_REMINDERS;
 import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_GAMES;
 import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_HIGH_POWER;
 import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MAIN;
 import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MANAGE_SOURCES;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MEDIA_MANAGEMENT_APPS;
 import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MOVIES;
 import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_NOTIFICATION;
 import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_OVERLAY;
@@ -59,6 +63,12 @@
         assertThat(registry.getDefaultFilterType(LIST_TYPE_MANAGE_SOURCES))
                 .isEqualTo(FILTER_APPS_INSTALL_SOURCES);
 
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_ALARMS_AND_REMINDERS))
+                .isEqualTo(FILTER_ALARMS_AND_REMINDERS);
+
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_MEDIA_MANAGEMENT_APPS))
+                .isEqualTo(FILTER_APPS_MEDIA_MANAGEMENT);
+
         assertThat(registry.getDefaultFilterType(LIST_TYPE_MAIN)).isEqualTo(FILTER_APPS_ALL);
         assertThat(registry.getDefaultFilterType(LIST_TYPE_NOTIFICATION))
                 .isEqualTo(FILTER_APPS_RECENT);
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/AlertingTypeFilterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/AlertingTypeFilterPreferenceControllerTest.java
new file mode 100644
index 0000000..7eebba0
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/AlertingTypeFilterPreferenceControllerTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING;
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_SILENT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ServiceInfo;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.notification.NotificationBackend;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class AlertingTypeFilterPreferenceControllerTest {
+
+    private Context mContext;
+    private AlertingTypeFilterPreferenceController mController;
+    @Mock
+    NotificationBackend mNm;
+    ComponentName mCn = new ComponentName("a", "b");
+    ServiceInfo mSi = new ServiceInfo();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ApplicationProvider.getApplicationContext();
+
+        mController = new AlertingTypeFilterPreferenceController(mContext, "key");
+        mController.setCn(mCn);
+        mController.setNm(mNm);
+        mController.setServiceInfo(mSi);
+        mController.setUserId(0);
+    }
+
+    @Test
+    public void getType() {
+        assertThat(mController.getType()).isEqualTo(FLAG_FILTER_TYPE_ALERTING);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceControllerTest.java
index 3cdbd3a..90b8927 100644
--- a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceControllerTest.java
@@ -35,10 +35,10 @@
 import android.service.notification.NotificationListenerFilter;
 import android.util.ArraySet;
 
+import androidx.preference.CheckBoxPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
@@ -122,7 +122,7 @@
         when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
         when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter());
 
-        SwitchPreference p = mock(SwitchPreference.class);
+        CheckBoxPreference p = mock(CheckBoxPreference.class);
         when(p.getKey()).thenReturn("pkg|12300");
         mScreen.addPreference(p);
 
@@ -163,7 +163,7 @@
 
         mController.onRebuildComplete(entries);
 
-        SwitchPreference actual = mScreen.findPreference("pkg|12300");
+        CheckBoxPreference actual = mScreen.findPreference("pkg|12300");
 
         assertThat(actual.isChecked()).isTrue();
         assertThat(actual.getTitle()).isEqualTo("hi");
@@ -180,7 +180,7 @@
         when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
         when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
 
-        SwitchPreference pref = new SwitchPreference(mContext);
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
         pref.setKey("pkg|567");
 
         mController.onPreferenceChange(pref, false);
@@ -206,7 +206,7 @@
         when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
         when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
 
-        SwitchPreference pref = new SwitchPreference(mContext);
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
         pref.setKey("pkg|567");
 
         mController.onPreferenceChange(pref, true);
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/ConversationTypeFilterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/ConversationTypeFilterPreferenceControllerTest.java
new file mode 100644
index 0000000..e12ebeb
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/ConversationTypeFilterPreferenceControllerTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_CONVERSATIONS;
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_SILENT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ServiceInfo;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.notification.NotificationBackend;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class ConversationTypeFilterPreferenceControllerTest {
+
+    private Context mContext;
+    private ConversationTypeFilterPreferenceController mController;
+    @Mock
+    NotificationBackend mNm;
+    ComponentName mCn = new ComponentName("a", "b");
+    ServiceInfo mSi = new ServiceInfo();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ApplicationProvider.getApplicationContext();
+
+        mController = new ConversationTypeFilterPreferenceController(mContext, "key");
+        mController.setCn(mCn);
+        mController.setNm(mNm);
+        mController.setServiceInfo(mSi);
+        mController.setUserId(0);
+    }
+
+    @Test
+    public void getType() {
+        assertThat(mController.getType()).isEqualTo(FLAG_FILTER_TYPE_CONVERSATIONS);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/OWNERS b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/OWNERS
new file mode 100644
index 0000000..4338198
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/OWNERS
@@ -0,0 +1,4 @@
+# Default reviewers for this and subdirectories.
+beverlyt@google.com
+dsandler@android.com
+juliacr@google.com
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/OngoingTypeFilterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/OngoingTypeFilterPreferenceControllerTest.java
new file mode 100644
index 0000000..eead848
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/OngoingTypeFilterPreferenceControllerTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ONGOING;
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_SILENT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ServiceInfo;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.notification.NotificationBackend;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class OngoingTypeFilterPreferenceControllerTest {
+
+    private Context mContext;
+    private OngoingTypeFilterPreferenceController mController;
+    @Mock
+    NotificationBackend mNm;
+    ComponentName mCn = new ComponentName("a", "b");
+    ServiceInfo mSi = new ServiceInfo();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ApplicationProvider.getApplicationContext();
+
+        mController = new OngoingTypeFilterPreferenceController(mContext, "key");
+        mController.setCn(mCn);
+        mController.setNm(mNm);
+        mController.setServiceInfo(mSi);
+        mController.setUserId(0);
+    }
+
+    @Test
+    public void getType() {
+        assertThat(mController.getType()).isEqualTo(FLAG_FILTER_TYPE_ONGOING);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/SilentTypeFilterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/SilentTypeFilterPreferenceControllerTest.java
new file mode 100644
index 0000000..1d099e3
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/SilentTypeFilterPreferenceControllerTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications.specialaccess.notificationaccess;
+
+import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_SILENT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ServiceInfo;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.notification.NotificationBackend;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class SilentTypeFilterPreferenceControllerTest {
+
+    private Context mContext;
+    private SilentTypeFilterPreferenceController mController;
+    @Mock
+    NotificationBackend mNm;
+    ComponentName mCn = new ComponentName("a", "b");
+    ServiceInfo mSi = new ServiceInfo();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ApplicationProvider.getApplicationContext();
+
+        mController = new SilentTypeFilterPreferenceController(mContext, "key");
+        mController.setCn(mCn);
+        mController.setNm(mNm);
+        mController.setServiceInfo(mSi);
+        mController.setUserId(0);
+    }
+
+    @Test
+    public void getType() {
+        assertThat(mController.getType()).isEqualTo(FLAG_FILTER_TYPE_SILENT);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceControllerTest.java
index 3014066..d36f775 100644
--- a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/TypeFilterPreferenceControllerTest.java
@@ -28,10 +28,13 @@
 
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.ServiceInfo;
+import android.os.Bundle;
 import android.service.notification.NotificationListenerFilter;
+import android.service.notification.NotificationListenerService;
 import android.util.ArraySet;
 
-import androidx.preference.MultiSelectListPreference;
+import androidx.preference.CheckBoxPreference;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
@@ -54,23 +57,76 @@
     @Mock
     NotificationBackend mNm;
     ComponentName mCn = new ComponentName("a", "b");
+    ServiceInfo mSi = new ServiceInfo();
+
+    private static class TestTypeFilterPreferenceController extends TypeFilterPreferenceController {
+
+        public TestTypeFilterPreferenceController(Context context, String key) {
+            super(context, key);
+        }
+
+        @Override
+        protected int getType() {
+            return 32;
+        }
+    }
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = ApplicationProvider.getApplicationContext();
 
-        mController = new TypeFilterPreferenceController(mContext, "key");
+        mController = new TestTypeFilterPreferenceController(mContext, "key");
         mController.setCn(mCn);
         mController.setNm(mNm);
+        mController.setServiceInfo(mSi);
         mController.setUserId(0);
     }
 
     @Test
-    public void updateState_enabled() {
+    public void updateState_enabled_noMetaData() {
         when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
         when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter());
-        MultiSelectListPreference pref = new MultiSelectListPreference(mContext);
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
+
+        mController.updateState(pref);
+        assertThat(pref.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void updateState_enabled_metaData_notTheDisableFilter() {
+        mSi.metaData = new Bundle();
+        mSi.metaData.putCharSequence("test", "value");
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter());
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
+
+        mController.updateState(pref);
+        assertThat(pref.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void updateState_enabled_metaData_disableFilter_notThisField() {
+        mSi.metaData = new Bundle();
+        mSi.metaData.putCharSequence(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES, 
+                "1,2");
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter());
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
+
+        mController.updateState(pref);
+        assertThat(pref.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void updateState_enabled_metaData_disableFilter_thisField_stateIsChecked() {
+        mSi.metaData = new Bundle();
+        mSi.metaData.putCharSequence(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES,
+                "1,2,32");
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(
+                new NotificationListenerFilter(32, new ArraySet<>()));
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
 
         mController.updateState(pref);
         assertThat(pref.isEnabled()).isTrue();
@@ -80,57 +136,86 @@
     public void updateState_disabled() {
         when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(false);
         when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter());
-        MultiSelectListPreference pref = new MultiSelectListPreference(mContext);
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
 
         mController.updateState(pref);
         assertThat(pref.isEnabled()).isFalse();
     }
 
     @Test
-    public void updateState() {
-        NotificationListenerFilter nlf = new NotificationListenerFilter(FLAG_FILTER_TYPE_ONGOING
-                | FLAG_FILTER_TYPE_SILENT, new ArraySet<>());
+    public void updateState_disabled_metaData_disableFilter_thisField_stateIsNotChecked() {
+        mSi.metaData = new Bundle();
+        mSi.metaData.putCharSequence(NotificationListenerService.META_DATA_DISABLED_FILTER_TYPES,
+                "1,2,32");
         when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
-        when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
+        NotificationListenerFilter before = new NotificationListenerFilter(4, new ArraySet<>());
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(before);
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
 
-        MultiSelectListPreference pref = new MultiSelectListPreference(mContext);
         mController.updateState(pref);
-
-        assertThat(pref.getValues()).containsExactlyElementsIn(
-                new String[] {String.valueOf(FLAG_FILTER_TYPE_ONGOING),
-                        String.valueOf(FLAG_FILTER_TYPE_SILENT)});
-        assertThat(pref.getSummary()).isNotNull();
+        assertThat(pref.isChecked()).isFalse();
+        assertThat(pref.isEnabled()).isFalse();
     }
 
     @Test
-    public void getSummary() {
+    public void updateState_checked() {
+        NotificationListenerFilter nlf = new NotificationListenerFilter(mController.getType(),
+                new ArraySet<>());
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
+
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
+        mController.updateState(pref);
+
+        assertThat(pref.isChecked()).isTrue();
+    }
+
+    @Test
+    public void updateState_unchecked() {
+        NotificationListenerFilter nlf = new NotificationListenerFilter(mController.getType() - 1,
+                new ArraySet<>());
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
+
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
+        mController.updateState(pref);
+
+        assertThat(pref.isChecked()).isFalse();
+    }
+
+    @Test
+    public void onPreferenceChange_true() {
         NotificationListenerFilter nlf = new NotificationListenerFilter(FLAG_FILTER_TYPE_ONGOING
                 | FLAG_FILTER_TYPE_CONVERSATIONS, new ArraySet<>());
         when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
         when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
 
-        MultiSelectListPreference pref = new MultiSelectListPreference(mContext);
-        mController.updateState(pref);
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
 
-        assertThat(mController.getSummary().toString()).ignoringCase().contains("ongoing");
-        assertThat(mController.getSummary().toString()).ignoringCase().contains("conversation");
-    }
-
-    @Test
-    public void onPreferenceChange() {
-        NotificationListenerFilter nlf = new NotificationListenerFilter(FLAG_FILTER_TYPE_ONGOING
-                | FLAG_FILTER_TYPE_CONVERSATIONS, new ArraySet<>());
-        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
-        when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
-
-        MultiSelectListPreference pref = new MultiSelectListPreference(mContext);
-
-        mController.onPreferenceChange(pref, Set.of("8", "1", "4"));
+        mController.onPreferenceChange(pref, true);
 
         ArgumentCaptor<NotificationListenerFilter> captor =
                 ArgumentCaptor.forClass(NotificationListenerFilter.class);
         verify(mNm).setListenerFilter(eq(mCn), eq(0), captor.capture());
         assertThat(captor.getValue().getTypes()).isEqualTo(FLAG_FILTER_TYPE_CONVERSATIONS
-                | FLAG_FILTER_TYPE_SILENT | FLAG_FILTER_TYPE_ONGOING);
+                | FLAG_FILTER_TYPE_ONGOING | mController.getType());
+    }
+
+    @Test
+    public void onPreferenceChange_false() {
+        NotificationListenerFilter nlf = new NotificationListenerFilter(FLAG_FILTER_TYPE_ONGOING
+                | FLAG_FILTER_TYPE_CONVERSATIONS | mController.getType(), new ArraySet<>());
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);
+
+        CheckBoxPreference pref = new CheckBoxPreference(mContext);
+
+        mController.onPreferenceChange(pref, false);
+
+        ArgumentCaptor<NotificationListenerFilter> captor =
+                ArgumentCaptor.forClass(NotificationListenerFilter.class);
+        verify(mNm).setListenerFilter(eq(mCn), eq(0), captor.capture());
+        assertThat(captor.getValue().getTypes()).isEqualTo(FLAG_FILTER_TYPE_CONVERSATIONS
+                | FLAG_FILTER_TYPE_ONGOING);
     }
 }
diff --git a/tests/unit/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceControllerTest.java b/tests/unit/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceControllerTest.java
new file mode 100644
index 0000000..0903c72
--- /dev/null
+++ b/tests/unit/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceControllerTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development.transcode;
+
+import static com.android.settings.development.transcode.TranscodeNotificationPreferenceController.TRANSCODE_NOTIFICATION_SYS_PROP_KEY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class TranscodeNotificationPreferenceControllerTest {
+    private TranscodeNotificationPreferenceController mUnderTest;
+
+    @Before
+    public void setUp() {
+        Context context = ApplicationProvider.getApplicationContext();
+        mUnderTest = new TranscodeNotificationPreferenceController(context, "notification_key");
+    }
+
+    @Test
+    public void isChecked_whenSysPropSet_shouldReturnTrue() {
+        SystemProperties.set(TRANSCODE_NOTIFICATION_SYS_PROP_KEY, "true");
+        assertThat(mUnderTest.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_whenSysPropUnset_shouldReturnFalse() {
+        SystemProperties.set(TRANSCODE_NOTIFICATION_SYS_PROP_KEY, "false");
+        assertThat(mUnderTest.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setChecked_withTrue_shouldSetSysProp() {
+        mUnderTest.setChecked(true);
+        assertThat(
+                SystemProperties.getBoolean(TRANSCODE_NOTIFICATION_SYS_PROP_KEY, false)).isTrue();
+    }
+
+    @Test
+    public void setChecked_withFalse_shouldUnsetSysProp() {
+        mUnderTest.setChecked(false);
+        assertThat(
+                SystemProperties.getBoolean(TRANSCODE_NOTIFICATION_SYS_PROP_KEY, true)).isFalse();
+    }
+
+    @Test
+    public void getAvailabilityStatus_shouldReturn_isAvailable() {
+        assertThat(mUnderTest.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
index ae534d0..dfe2bc0 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -48,7 +48,6 @@
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 import android.telephony.CellSignalStrength;
-import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
 import android.telephony.SignalStrength;
 import android.telephony.SubscriptionInfo;
@@ -89,8 +88,6 @@
     @Mock
     private ServiceState mServiceState;
     @Mock
-    private PhoneStateListener mPhoneStateListener;
-    @Mock
     private SignalStrength mSignalStrength;
     @Mock
     private CellSignalStrength mCellSignalStrengthCdma;
@@ -150,7 +147,6 @@
         doReturn(0).when(mCellSignalStrengthWcdma).getAsuLevel();
 
         doReturn(null).when(mSignalStrength).getCellSignalStrengths();
-        doReturn(mPhoneStateListener).when(mController).getPhoneStateListener();
         doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(anyInt());
 
         when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
diff --git a/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java b/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java
deleted file mode 100644
index a90b89d..0000000
--- a/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.wifi.WifiManager;
-
-import androidx.slice.Slice;
-import androidx.slice.SliceItem;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.widget.SliceLiveData;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.settings.testutils.ResourcesUtils;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-
-@RunWith(AndroidJUnit4.class)
-public class AirplaneSafeNetworksSliceTest {
-
-    @Rule
-    public MockitoRule mMocks = MockitoJUnit.rule();
-    @Mock
-    private WifiManager mWifiManager;
-
-    private Context mContext;
-    private AirplaneSafeNetworksSlice mAirplaneSafeNetworksSlice;
-
-    @Before
-    public void setUp() {
-        mContext = spy(ApplicationProvider.getApplicationContext());
-        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-
-        // Set-up specs for SliceMetadata.
-        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
-
-        mAirplaneSafeNetworksSlice = new AirplaneSafeNetworksSlice(mContext);
-        mAirplaneSafeNetworksSlice.onAirplaneModeChanged(true);
-    }
-
-    @Test
-    public void getSlice_airplaneModeOff_shouldBeNotNull() {
-        mAirplaneSafeNetworksSlice.onAirplaneModeChanged(false);
-
-        assertThat(mAirplaneSafeNetworksSlice.getSlice()).isNotNull();
-    }
-
-    @Test
-    public void getSlice_wifiDisabled_shouldShowTurnOnNetworks() {
-        when(mWifiManager.isWifiEnabled()).thenReturn(false);
-
-        final Slice slice = mAirplaneSafeNetworksSlice.getSlice();
-
-        assertThat(slice).isNotNull();
-        final SliceItem sliceTitle =
-                SliceMetadata.from(mContext, slice).getListContent().getHeader().getTitleItem();
-        assertThat(sliceTitle.getText()).isEqualTo(
-                ResourcesUtils.getResourcesString(mContext, "turn_on_networks"));
-    }
-
-    @Test
-    public void getSlice_wifiEnabled_shouldShowTurnOffNetworks() {
-        when(mWifiManager.isWifiEnabled()).thenReturn(true);
-
-        final Slice slice = mAirplaneSafeNetworksSlice.getSlice();
-
-        assertThat(slice).isNotNull();
-        final SliceItem sliceTitle =
-                SliceMetadata.from(mContext, slice).getListContent().getHeader().getTitleItem();
-        assertThat(sliceTitle.getText()).isEqualTo(
-                ResourcesUtils.getResourcesString(mContext, "turn_off_networks"));
-    }
-
-    @Test
-    public void onNotifyChange_turnOnNetworks_shouldSetWifiEnabled() {
-        when(mWifiManager.isWifiEnabled()).thenReturn(false);
-        Intent intent = mAirplaneSafeNetworksSlice.getIntent();
-
-        mAirplaneSafeNetworksSlice.onNotifyChange(intent);
-
-        verify(mWifiManager).setWifiEnabled(true);
-    }
-
-    @Test
-    public void onNotifyChange_turnOffNetworks_shouldSetWifiDisabled() {
-        when(mWifiManager.isWifiEnabled()).thenReturn(true);
-        Intent intent = mAirplaneSafeNetworksSlice.getIntent();
-
-        mAirplaneSafeNetworksSlice.onNotifyChange(intent);
-
-        verify(mWifiManager).setWifiEnabled(false);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/network/AllowedNetworkTypesListenerTest.java b/tests/unit/src/com/android/settings/network/AllowedNetworkTypesListenerTest.java
index 3387368..e89a257 100644
--- a/tests/unit/src/com/android/settings/network/AllowedNetworkTypesListenerTest.java
+++ b/tests/unit/src/com/android/settings/network/AllowedNetworkTypesListenerTest.java
@@ -25,8 +25,8 @@
 
 import android.content.Context;
 import android.os.HandlerExecutor;
-import android.telephony.PhoneStateListener;
 import android.telephony.RadioAccessFamily;
+import android.telephony.TelephonyCallback;
 import android.telephony.TelephonyManager;
 import android.test.mock.MockContentResolver;
 
@@ -40,9 +40,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @RunWith(AndroidJUnit4.class)
 public class AllowedNetworkTypesListenerTest {
 
@@ -53,7 +50,7 @@
     private AllowedNetworkTypesListener mAllowedNetworkTypesListener;
 
     @Mock
-    private AllowedNetworkTypesListener.OnAllowedNetworkTypesChangedListener mListener;
+    private AllowedNetworkTypesListener.OnAllowedNetworkTypesListener mListener;
     @Mock
     private TelephonyManager mTelephonyManager;
 
@@ -73,12 +70,11 @@
     @Test
     public void onChange_shouldCallListener() {
         mAllowedNetworkTypesListener.mListener = mListener;
-        Map<Integer, Long> allowedNetworkTypesList = new HashMap<>();
         long networkType = (long) RadioAccessFamily.getRafFromNetworkType(
                 TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO);
-        allowedNetworkTypesList.put(TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER,
-                networkType);
-        mAllowedNetworkTypesListener.onAllowedNetworkTypesChanged(allowedNetworkTypesList);
+
+        mAllowedNetworkTypesListener.onAllowedNetworkTypesChanged(
+                TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER, networkType);
 
         verify(mListener).onAllowedNetworkTypesChanged();
     }
@@ -87,15 +83,15 @@
     public void register_shouldRegisterContentObserver() {
         mAllowedNetworkTypesListener.register(mContext, SUB_ID);
 
-        verify(mTelephonyManager, times(1)).registerPhoneStateListener(any(HandlerExecutor.class),
-                any(PhoneStateListener.class));
+        verify(mTelephonyManager, times(1)).registerTelephonyCallback(any(HandlerExecutor.class),
+                any(TelephonyCallback.class));
     }
 
     @Test
     public void unregister_shouldUnregisterContentObserver() {
         mAllowedNetworkTypesListener.unregister(mContext, SUB_ID);
 
-        verify(mTelephonyManager).unregisterPhoneStateListener(
+        verify(mTelephonyManager).unregisterTelephonyCallback(
                 mAllowedNetworkTypesListener);
     }
 }
diff --git a/tests/unit/src/com/android/settings/network/ConnectedEthernetNetworkControllerTest.java b/tests/unit/src/com/android/settings/network/ConnectedEthernetNetworkControllerTest.java
index b5acdc5..5c56a45 100644
--- a/tests/unit/src/com/android/settings/network/ConnectedEthernetNetworkControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/ConnectedEthernetNetworkControllerTest.java
@@ -16,10 +16,10 @@
 
 package com.android.settings.network;
 
-import static com.android.settings.network.InternetUpdater.INTERNET_APM;
-import static com.android.settings.network.InternetUpdater.INTERNET_APM_NETWORKS;
 import static com.android.settings.network.InternetUpdater.INTERNET_CELLULAR;
 import static com.android.settings.network.InternetUpdater.INTERNET_ETHERNET;
+import static com.android.settings.network.InternetUpdater.INTERNET_NETWORKS_AVAILABLE;
+import static com.android.settings.network.InternetUpdater.INTERNET_OFF;
 import static com.android.settings.network.InternetUpdater.INTERNET_WIFI;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -77,15 +77,15 @@
     }
 
     @Test
-    public void isAvailable_internetApm_shouldBeFalse() {
-        mController.onInternetTypeChanged(INTERNET_APM);
+    public void isAvailable_internetOff_shouldBeFalse() {
+        mController.onInternetTypeChanged(INTERNET_OFF);
 
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
-    public void isAvailable_internetApmNetworks_shouldBeFalse() {
-        mController.onInternetTypeChanged(INTERNET_APM_NETWORKS);
+    public void isAvailable_internetNetworksAvailable_shouldBeFalse() {
+        mController.onInternetTypeChanged(INTERNET_NETWORKS_AVAILABLE);
 
         assertThat(mController.isAvailable()).isFalse();
     }
diff --git a/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java b/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
index 05b92a8..6ddef5d 100644
--- a/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
@@ -45,7 +45,7 @@
     }
 
     @Test
-    public void getAvailabilityStatus_byDefault_true() {
+    public void getAvailabilityStatus_returnAVAILABLE_UNSEARCHABLE() {
         assertThat(mController.getAvailabilityStatus())
                 .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
     }
diff --git a/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java
index ad07953..6005713 100644
--- a/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.network;
 
-import static com.android.settings.network.InternetUpdater.INTERNET_APM_NETWORKS;
+import static com.android.settings.network.InternetUpdater.INTERNET_NETWORKS_AVAILABLE;
 import static com.android.settings.network.InternetUpdater.INTERNET_WIFI;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -119,37 +119,24 @@
     }
 
     @Test
-    public void mustUseWiFiHelperSummary_internetWifi_updateSummary() {
+    public void onSummaryChanged_internetWifi_updateSummary() {
         mController.onInternetTypeChanged(INTERNET_WIFI);
         mController.displayPreference(mScreen);
 
-        mController.mustUseWiFiHelperSummary(true /* isWifiConnected */, TEST_SUMMARY);
-
-        assertThat(mPreference.getSummary()).isEqualTo(TEST_SUMMARY);
-
-        mController.mustUseWiFiHelperSummary(false /* isWifiConnected */, NOT_CONNECTED);
-
-        assertThat(mPreference.getSummary()).isEqualTo(NOT_CONNECTED);
-    }
-
-    @Test
-    public void mustUseWiFiHelperSummary_internetApmNetworksWifiConnected_updateSummary() {
-        mController.onInternetTypeChanged(INTERNET_APM_NETWORKS);
-        mController.displayPreference(mScreen);
-
-        mController.mustUseWiFiHelperSummary(true /* isWifiConnected */, TEST_SUMMARY);
+        mController.onSummaryChanged(TEST_SUMMARY);
 
         assertThat(mPreference.getSummary()).isEqualTo(TEST_SUMMARY);
     }
 
     @Test
-    public void mustUseWiFiHelperSummary_internetApmNetworksWifiDisconnected_notUpdateSummary() {
-        mController.onInternetTypeChanged(INTERNET_APM_NETWORKS);
+    public void onSummaryChanged_internetNetworksAvailable_notUpdateSummary() {
+        mController.onInternetTypeChanged(INTERNET_NETWORKS_AVAILABLE);
         mController.displayPreference(mScreen);
+        mPreference.setSummary(NOT_CONNECTED);
 
-        mController.mustUseWiFiHelperSummary(false /* isWifiConnected */, NOT_CONNECTED);
+        mController.onSummaryChanged(TEST_SUMMARY);
 
-        assertThat(mPreference.getSummary()).isNotEqualTo(NOT_CONNECTED);
+        assertThat(mPreference.getSummary()).isNotEqualTo(TEST_SUMMARY);
     }
 
     @Test
diff --git a/tests/unit/src/com/android/settings/network/InternetUpdaterTest.java b/tests/unit/src/com/android/settings/network/InternetUpdaterTest.java
index 18998b7..94456fe 100644
--- a/tests/unit/src/com/android/settings/network/InternetUpdaterTest.java
+++ b/tests/unit/src/com/android/settings/network/InternetUpdaterTest.java
@@ -20,10 +20,10 @@
 import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET;
 import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
 
-import static com.android.settings.network.InternetUpdater.INTERNET_APM;
-import static com.android.settings.network.InternetUpdater.INTERNET_APM_NETWORKS;
 import static com.android.settings.network.InternetUpdater.INTERNET_CELLULAR;
 import static com.android.settings.network.InternetUpdater.INTERNET_ETHERNET;
+import static com.android.settings.network.InternetUpdater.INTERNET_NETWORKS_AVAILABLE;
+import static com.android.settings.network.InternetUpdater.INTERNET_OFF;
 import static com.android.settings.network.InternetUpdater.INTERNET_WIFI;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -109,26 +109,30 @@
     @Test
     public void update_apmOnWifiOff_getInternetApm() {
         doReturn(true).when(mAirplaneModeEnabler).isAirplaneModeOn();
-        doReturn(false).when(mWifiManager).isWifiEnabled();
+        doReturn(WifiManager.WIFI_STATE_DISABLED).when(mWifiManager).getWifiState();
+        mInternetUpdater.mInternetAvailable = false;
 
         mInternetUpdater.update();
 
-        assertThat(mInternetUpdater.getInternetType()).isEqualTo(INTERNET_APM);
+        assertThat(mInternetUpdater.getInternetType()).isEqualTo(INTERNET_OFF);
     }
 
     @Test
-    public void update_apmOnWifiOn_getInternetApmNetworks() {
+    public void update_apmOnWifiOnNotConnected_getInternetNetworksAvailable() {
+        doReturn(true).when(mAirplaneModeEnabler).isAirplaneModeOn();
+        doReturn(WifiManager.WIFI_STATE_ENABLED).when(mWifiManager).getWifiState();
+        mInternetUpdater.mInternetAvailable = false;
+
+        mInternetUpdater.update();
+
+        assertThat(mInternetUpdater.getInternetType()).isEqualTo(INTERNET_NETWORKS_AVAILABLE);
+    }
+
+    @Test
+    public void update_apmOnWifiConnected_getInternetWifi() {
         doReturn(true).when(mAirplaneModeEnabler).isAirplaneModeOn();
         doReturn(true).when(mWifiManager).isWifiEnabled();
-
-        mInternetUpdater.update();
-
-        assertThat(mInternetUpdater.getInternetType()).isEqualTo(INTERNET_APM_NETWORKS);
-    }
-
-    @Test
-    public void update_apmOffWifiConnected_getInternetWifi() {
-        doReturn(false).when(mAirplaneModeEnabler).isAirplaneModeOn();
+        mInternetUpdater.mInternetAvailable = true;
         mInternetUpdater.mTransport = TRANSPORT_WIFI;
 
         mInternetUpdater.update();
@@ -137,8 +141,9 @@
     }
 
     @Test
-    public void update_apmOffCellularConnected_getInternetCellular() {
-        doReturn(false).when(mAirplaneModeEnabler).isAirplaneModeOn();
+    public void update_apmOnCellularConnected_getInternetCellular() {
+        doReturn(true).when(mAirplaneModeEnabler).isAirplaneModeOn();
+        mInternetUpdater.mInternetAvailable = true;
         mInternetUpdater.mTransport = TRANSPORT_CELLULAR;
 
         mInternetUpdater.update();
@@ -147,8 +152,9 @@
     }
 
     @Test
-    public void update_apmOffEthernetConnected_getInternetEthernet() {
-        doReturn(false).when(mAirplaneModeEnabler).isAirplaneModeOn();
+    public void update_apmOnEthernetConnected_getInternetEthernet() {
+        doReturn(true).when(mAirplaneModeEnabler).isAirplaneModeOn();
+        mInternetUpdater.mInternetAvailable = true;
         mInternetUpdater.mTransport = TRANSPORT_ETHERNET;
 
         mInternetUpdater.update();
diff --git a/tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
index c540512..be3815d 100644
--- a/tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
@@ -25,7 +25,6 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
 import android.os.Looper;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -63,8 +62,6 @@
 
     @Mock
     private UserManager mUserManager;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
 
     private PreferenceManager mPreferenceManager;
     private PreferenceScreen mScreen;
@@ -82,7 +79,6 @@
         when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
         when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
         when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
-        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
         if (Looper.myLooper() == null) {
             Looper.prepare();
         }
@@ -98,8 +94,7 @@
     @Test
     public void secondaryUser_prefIsNotAvailable() {
         when(mUserManager.isAdminUser()).thenReturn(false);
-        when(mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE))
-            .thenReturn(true);
+        when(mTelephonyManager.isDataCapable()).thenReturn(true);
 
         mController = new MobileNetworkPreferenceController(mContext);
         assertThat(mController.isAvailable()).isFalse();
@@ -108,8 +103,7 @@
     @Test
     public void wifiOnly_prefIsNotAvailable() {
         when(mUserManager.isAdminUser()).thenReturn(true);
-        when(mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE))
-            .thenReturn(false);
+        when(mTelephonyManager.isDataCapable()).thenReturn(false);
 
         mController = new MobileNetworkPreferenceController(mContext);
         assertThat(mController.isAvailable()).isFalse();
@@ -124,13 +118,12 @@
 
         mLifecycleRegistry.handleLifecycleEvent(Event.ON_START);
         verify(mController).onStart();
-        verify(mTelephonyManager).listen(mController.mPhoneStateListener,
-                PhoneStateListener.LISTEN_SERVICE_STATE);
+        verify(mTelephonyManager).registerTelephonyCallback(
+                mContext.getMainExecutor(), mController.mTelephonyCallback);
 
         mLifecycleRegistry.handleLifecycleEvent(Event.ON_STOP);
         verify(mController).onStop();
-        verify(mTelephonyManager).listen(mController.mPhoneStateListener,
-                PhoneStateListener.LISTEN_NONE);
+        verify(mTelephonyManager).unregisterTelephonyCallback(mController.mTelephonyCallback);
     }
 
     @Test
@@ -148,12 +141,12 @@
         mController.displayPreference(mScreen);
         mLifecycleRegistry.handleLifecycleEvent(Event.ON_START);
         verify(mController).onStart();
-        verify(mTelephonyManager).listen(mController.mPhoneStateListener,
-                PhoneStateListener.LISTEN_SERVICE_STATE);
+        verify(mTelephonyManager).registerTelephonyCallback(
+                mContext.getMainExecutor(), mController.mTelephonyCallback);
 
         doReturn(testCarrierName).when(mController).getSummary();
 
-        mController.mPhoneStateListener.onServiceStateChanged(null);
+        mController.mTelephonyCallback.onServiceStateChanged(null);
 
         // Carrier name should be set.
         Assert.assertEquals(mPreference.getSummary(), testCarrierName);
diff --git a/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java b/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java
index cdb82a6..c51bb18 100644
--- a/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java
@@ -41,7 +41,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-
 @RunWith(AndroidJUnit4.class)
 public class MultiNetworkHeaderControllerTest {
     private static final String KEY_HEADER = "multi_network_header";
diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
index d205607..ac2e24d 100644
--- a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
+++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
@@ -34,7 +34,6 @@
 import android.net.NetworkCapabilities;
 import android.net.Uri;
 import android.os.PersistableBundle;
-import android.provider.Settings;
 import android.telephony.CarrierConfigManager;
 import android.telephony.ServiceState;
 import android.telephony.SubscriptionInfo;
@@ -43,8 +42,6 @@
 import android.text.Html;
 
 import androidx.slice.Slice;
-import androidx.slice.builders.GridRowBuilder;
-import androidx.slice.builders.GridRowBuilder.CellBuilder;
 import androidx.slice.builders.ListBuilder;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -115,20 +112,6 @@
     }
 
     @Test
-    public void createMessageGridRow_inputTheResourceId_verifyTitle() {
-        int messageResId = ResourcesUtils.getResourcesId(mContext, "string",
-                "non_carrier_network_unavailable");
-        CharSequence title = ResourcesUtils.getResourcesString(mContext,
-                "non_carrier_network_unavailable");
-
-        GridRowBuilder testGridRow = mProviderModelSliceHelper.createMessageGridRow(messageResId,
-                Settings.ACTION_AIRPLANE_MODE_SETTINGS);
-        List<CellBuilder> cellItem = testGridRow.getCells();
-
-        assertThat(cellItem.get(0).getTitle()).isEqualTo(title);
-    }
-
-    @Test
     public void getConnectedWifiItem_inputListInvolveOneConnectedWifiItem_verifyReturnItem() {
         when(mWifiSliceItem1.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTED);
         when(mWifiSliceItem2.getConnectedState()).thenReturn(
diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
index 476d854..4760daa 100644
--- a/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
+++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
@@ -22,7 +22,6 @@
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
@@ -42,7 +41,6 @@
 
 import androidx.slice.Slice;
 import androidx.slice.SliceProvider;
-import androidx.slice.builders.GridRowBuilder;
 import androidx.slice.builders.ListBuilder;
 import androidx.slice.builders.SliceAction;
 import androidx.slice.widget.SliceLiveData;
@@ -97,12 +95,6 @@
     private WifiSliceItem mMockWifiSliceItem3;
     @Mock
     ListBuilder.RowBuilder mMockCarrierRowBuild;
-    @Mock
-    ListBuilder.HeaderBuilder mMockHeader;
-    @Mock
-    GridRowBuilder mMockGridRowBuilderNonCarrierNetworkUnavailable;
-    @Mock
-    GridRowBuilder mMockGridRowBuilderAllNetworkUnavailable;
 
     private FakeFeatureFactory mFeatureFactory;
     @Mock
@@ -147,35 +139,7 @@
 
     @Test
     @UiThreadTest
-    public void getSlice_noWorkerAndNoCarrier_getOneHeaderOneGridRowWithAllNetworkUnavailable() {
-        mWifiList.clear();
-        mMockProviderModelSlice = new MockProviderModelSlice(mContext, null);
-        mockHelperCondition(false, false, false, null);
-
-        final Slice slice = mMockProviderModelSlice.getSlice();
-
-        assertThat(slice).isNotNull();
-        verify(mListBuilder, times(1)).setHeader(mMockHeader);
-        verify(mListBuilder, times(1)).addGridRow(mMockGridRowBuilderAllNetworkUnavailable);
-    }
-
-    @Test
-    @UiThreadTest
-    public void getSlice_noWifiAndNoCarrier_getOneHeaderOneGridRowWithAllNetworkUnavailable() {
-        mWifiList.clear();
-        mMockNetworkProviderWorker.updateSelfResults(null);
-        mockHelperCondition(false, false, false, null);
-
-        final Slice slice = mMockProviderModelSlice.getSlice();
-
-        assertThat(slice).isNotNull();
-        verify(mListBuilder, times(1)).setHeader(mMockHeader);
-        verify(mListBuilder, times(1)).addGridRow(mMockGridRowBuilderAllNetworkUnavailable);
-    }
-
-    @Test
-    @UiThreadTest
-    public void getSlice_noWifiAndHasCarrierNoData_oneCarrierOneGridRowWithAllNetworkUnavailable() {
+    public void getSlice_noWifiAndHasCarrierNoData_oneCarrier() {
         mWifiList.clear();
         mMockNetworkProviderWorker.updateSelfResults(null);
         mockHelperCondition(false, true, false, null);
@@ -184,12 +148,11 @@
 
         assertThat(slice).isNotNull();
         verify(mListBuilder, times(1)).addRow(mMockCarrierRowBuild);
-        verify(mListBuilder, times(1)).addGridRow(mMockGridRowBuilderAllNetworkUnavailable);
     }
 
     @Test
     @UiThreadTest
-    public void getSlice_noWifiAndNoCarrier_oneCarrierOneGridRowWithNonCarrierNetworkUnavailable() {
+    public void getSlice_noWifiAndNoCarrier_oneCarrier() {
         mWifiList.clear();
         mMockProviderModelSlice = new MockProviderModelSlice(mContext, null);
         mockHelperCondition(false, true, true, null);
@@ -198,7 +161,6 @@
 
         assertThat(slice).isNotNull();
         verify(mListBuilder, times(1)).addRow(mMockCarrierRowBuild);
-        verify(mListBuilder, times(1)).addGridRow(mMockGridRowBuilderNonCarrierNetworkUnavailable);
     }
 
     @Test
@@ -264,7 +226,7 @@
 
     @Test
     @UiThreadTest
-    public void getSlice_connectedEthernet_getOneEthernetAndOneCarrierAndTwoWiFi() {
+    public void getSlice_haveEthernetAndCarrierAndTwoDisconnectedWifi_getFourRow() {
         mWifiList.clear();
         mockWifiItemCondition(mMockWifiSliceItem1, "wifi1", "wifi1",
                 WifiEntry.CONNECTED_STATE_DISCONNECTED, "wifi1_key", true);
@@ -273,9 +235,29 @@
                 WifiEntry.CONNECTED_STATE_DISCONNECTED, "wifi2_key", true);
         mWifiList.add(mMockWifiSliceItem2);
         mMockNetworkProviderWorker.updateSelfResults(mWifiList);
-        when(mProviderModelSliceHelper.isAirplaneModeEnabled()).thenReturn(false);
-        when(mProviderModelSliceHelper.hasCarrier()).thenReturn(true);
-        when(mProviderModelSliceHelper.isDataSimActive()).thenReturn(true);
+        mockHelperCondition(false, true, true, null);
+        when(mMockNetworkProviderWorker.isEthernetConnected()).thenReturn(true);
+
+        final Slice slice = mMockProviderModelSlice.getSlice();
+
+        assertThat(slice).isNotNull();
+        assertThat(mMockProviderModelSlice.hasCreateEthernetRow()).isTrue();
+        verify(mListBuilder, times(1)).addRow(mMockCarrierRowBuild);
+        verify(mListBuilder, times(4)).addRow(any(ListBuilder.RowBuilder.class));
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSlice_haveEthernetAndCarrierAndConnectedWifiAndDisconnectedWifi_getFourRow() {
+        mWifiList.clear();
+        mockWifiItemCondition(mMockWifiSliceItem1, "wifi1", "wifi1",
+                WifiEntry.CONNECTED_STATE_CONNECTED, "wifi1_key", true);
+        mWifiList.add(mMockWifiSliceItem1);
+        mockWifiItemCondition(mMockWifiSliceItem2, "wifi2", "wifi2",
+                WifiEntry.CONNECTED_STATE_DISCONNECTED, "wifi2_key", true);
+        mWifiList.add(mMockWifiSliceItem2);
+        mMockNetworkProviderWorker.updateSelfResults(mWifiList);
+        mockHelperCondition(false, true, true, mWifiList.get(0));
         when(mMockNetworkProviderWorker.isEthernetConnected()).thenReturn(true);
 
         final Slice slice = mMockProviderModelSlice.getSlice();
@@ -311,19 +293,6 @@
 
     private void mockBuilder() {
         SliceAction mockSliceAction = getPrimarySliceAction();
-        when(mMockHeader.getTitle()).thenReturn("mockHeader");
-        when(mMockHeader.getPrimaryAction()).thenReturn(mockSliceAction);
-        when(mProviderModelSliceHelper.createHeader(anyString())).thenReturn(mMockHeader);
-
-        int resId = ResourcesUtils.getResourcesId(mContext, "string",
-                "non_carrier_network_unavailable");
-        when(mProviderModelSliceHelper.createMessageGridRow(eq(resId), anyString())).thenReturn(
-                mMockGridRowBuilderNonCarrierNetworkUnavailable);
-        resId = ResourcesUtils.getResourcesId(mContext, "string",
-                "all_network_unavailable");
-        when(mProviderModelSliceHelper.createMessageGridRow(eq(resId), anyString())).thenReturn(
-                mMockGridRowBuilderAllNetworkUnavailable);
-
         when(mMockCarrierRowBuild.getTitle()).thenReturn("mockRow");
         when(mMockCarrierRowBuild.getPrimaryAction()).thenReturn(mockSliceAction);
         when(mProviderModelSliceHelper.createCarrierRow(anyString())).thenReturn(
diff --git a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
index ef3f130..6997607 100644
--- a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.network;
 
-import static android.telephony.SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
 import static android.telephony.SignalStrength.SIGNAL_STRENGTH_GOOD;
 import static android.telephony.SignalStrength.SIGNAL_STRENGTH_GREAT;
 import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@@ -24,6 +23,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;;
 import static org.mockito.Mockito.doReturn;
@@ -47,6 +47,7 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyDisplayInfo;
 import android.telephony.TelephonyManager;
+import android.text.Html;
 
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LifecycleRegistry;
@@ -96,6 +97,7 @@
     private LifecycleOwner mLifecycleOwner;
     @Mock
     private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
+
     private LifecycleRegistry mLifecycleRegistry;
     private int mOnChildUpdatedCount;
     private Context mContext;
@@ -371,14 +373,14 @@
         final Preference pref = new Preference(mContext);
         final Drawable greatDrawWithoutCutOff = mock(Drawable.class);
         doReturn(greatDrawWithoutCutOff).when(sInjector)
-                .getIcon(mContext, 4, NUM_SIGNAL_STRENGTH_BINS, true);
+                .getIcon(any(), anyInt(), anyInt(), anyBoolean());
 
         mController.setIcon(pref, 1, true /* isDefaultForData */);
         assertThat(pref.getIcon()).isEqualTo(greatDrawWithoutCutOff);
 
         final Drawable greatDrawWithCutOff = mock(Drawable.class);
         doReturn(greatDrawWithCutOff).when(sInjector)
-                .getIcon(mContext, 4, NUM_SIGNAL_STRENGTH_BINS, true);
+                .getIcon(any(), anyInt(), anyInt(), anyBoolean());
         mController.setIcon(pref, 2, false /* isDefaultForData */);
         assertThat(pref.getIcon()).isEqualTo(greatDrawWithCutOff);
     }
@@ -416,7 +418,8 @@
     @Test
     @UiThreadTest
     public void displayPreference_providerAndHasMultiSimAndActive_connectedAndRat() {
-        final String expectedSummary = "Connected / 5G";
+        final CharSequence expectedSummary =
+                Html.fromHtml("Connected / 5G", Html.FROM_HTML_MODE_LEGACY);
         final String networkType = "5G";
         final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
         doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
@@ -435,8 +438,31 @@
 
     @Test
     @UiThreadTest
+    public void displayPreference_providerAndHasMultiSimButMobileDataOff_notAutoConnect() {
+        final String dataOffSummary =
+                ResourcesUtils.getResourcesString(mContext, "mobile_data_off_summary");
+        final CharSequence expectedSummary =
+                Html.fromHtml(dataOffSummary, Html.FROM_HTML_MODE_LEGACY);
+        final String networkType = "5G";
+        final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+        setupGetIconConditions(sub.get(0).getSubscriptionId(), false, false,
+                TelephonyManager.DATA_CONNECTED, ServiceState.STATE_IN_SERVICE);
+        doReturn(networkType)
+                .when(sInjector).getNetworkType(any(), any(), any(), anyInt());
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mPreferenceCategory.getPreference(0).getSummary())
+            .isEqualTo(expectedSummary.toString());
+    }
+
+    @Test
+    @UiThreadTest
     public void displayPreference_providerAndHasMultiSimAndNotActive_showRatOnly() {
-        final String expectedSummary = "5G";
+        final CharSequence expectedSummary = Html.fromHtml("5G", Html.FROM_HTML_MODE_LEGACY);
         final String networkType = "5G";
         final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
         doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
@@ -445,6 +471,7 @@
                 TelephonyManager.DATA_CONNECTED, ServiceState.STATE_IN_SERVICE);
         doReturn(networkType)
                 .when(sInjector).getNetworkType(any(), any(), any(), anyInt());
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
 
         mController.onResume();
         mController.displayPreference(mPreferenceScreen);
@@ -467,7 +494,8 @@
     @Test
     @UiThreadTest
     public void onTelephonyDisplayInfoChanged_providerAndHasMultiSimAndActive_connectedAndRat() {
-        final String expectedSummary = "Connected / LTE";
+        final CharSequence expectedSummary =
+                Html.fromHtml("Connected / LTE", Html.FROM_HTML_MODE_LEGACY);
         final String networkType = "LTE";
         final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
         final TelephonyDisplayInfo telephonyDisplayInfo =
@@ -480,6 +508,7 @@
         doReturn(mock(MobileMappings.Config.class)).when(sInjector).getConfig(mContext);
         doReturn(networkType)
                 .when(sInjector).getNetworkType(any(), any(), any(), anyInt());
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
 
         mController.onResume();
         mController.displayPreference(mPreferenceScreen);
@@ -491,7 +520,8 @@
     @Test
     @UiThreadTest
     public void onTelephonyDisplayInfoChanged_providerAndHasMultiSimAndNotActive_showRat() {
-        final String expectedSummary = "LTE";
+        final CharSequence expectedSummary =
+                Html.fromHtml("LTE", Html.FROM_HTML_MODE_LEGACY);
         final String networkType = "LTE";
         final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
         final TelephonyDisplayInfo telephonyDisplayInfo =
diff --git a/tests/unit/src/com/android/settings/network/TurnOnWifiSliceTest.java b/tests/unit/src/com/android/settings/network/TurnOnWifiSliceTest.java
new file mode 100644
index 0000000..befa655
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/TurnOnWifiSliceTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+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.net.wifi.WifiManager;
+
+import androidx.slice.SliceProvider;
+import androidx.slice.widget.SliceLiveData;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+@RunWith(AndroidJUnit4.class)
+public class TurnOnWifiSliceTest {
+
+    @Rule
+    public MockitoRule mMocks = MockitoJUnit.rule();
+    @Mock
+    private WifiManager mWifiManager;
+
+    private Context mContext;
+    private TurnOnWifiSlice mSlice;
+
+    @Before
+    public void setUp() {
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+
+        // Set-up specs for SliceMetadata.
+        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+        mSlice = new TurnOnWifiSlice(mContext);
+    }
+
+    @Test
+    public void getSlice_wifiEnabled_shouldBeNull() {
+        when(mWifiManager.isWifiEnabled()).thenReturn(true);
+
+        assertThat(mSlice.getSlice()).isNull();
+    }
+
+    @Test
+    public void getSlice_wifiDisabled_shouldBeNotNull() {
+        when(mWifiManager.isWifiEnabled()).thenReturn(false);
+
+        assertThat(mSlice.getSlice()).isNotNull();
+    }
+
+    @Test
+    public void onNotifyChange_shouldSetWifiEnabled() {
+        Intent intent = mSlice.getIntent();
+
+        mSlice.onNotifyChange(intent);
+
+        verify(mWifiManager).setWifiEnabled(true);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/ViewAirplaneModeNetworksLayoutPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/ViewAirplaneModeNetworksLayoutPreferenceControllerTest.java
deleted file mode 100644
index 972e3fb..0000000
--- a/tests/unit/src/com/android/settings/network/ViewAirplaneModeNetworksLayoutPreferenceControllerTest.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.net.wifi.WifiManager;
-import android.os.Looper;
-import android.view.View;
-
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.settings.testutils.AirplaneModeRule;
-import com.android.settings.testutils.ResourcesUtils;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.widget.LayoutPreference;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-
-@RunWith(AndroidJUnit4.class)
-public class ViewAirplaneModeNetworksLayoutPreferenceControllerTest {
-
-    private static final String KEY = ViewAirplaneModeNetworksLayoutPreferenceController.KEY;
-    private static final String RES_ID_AIRPLANE_MODE_IS_ON = "condition_airplane_title";
-    private static final String RES_ID_VIEWING_AIRPLANE_MODE_NETWORKS =
-            "viewing_airplane_mode_networks";
-
-    @Rule
-    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
-    @Rule
-    public AirplaneModeRule mAirplaneModeRule = new AirplaneModeRule();
-    @Mock
-    private WifiManager mWifiManager;
-
-    private Context mContext;
-    private PreferenceScreen mScreen;
-    private LayoutPreference mPreference;
-    private ViewAirplaneModeNetworksLayoutPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = spy(ApplicationProvider.getApplicationContext());
-        doReturn(mWifiManager).when(mContext).getSystemService(Context.WIFI_SERVICE);
-
-        mController = new ViewAirplaneModeNetworksLayoutPreferenceController(mContext,
-                mock(Lifecycle.class));
-        if (Looper.myLooper() == null) {
-            Looper.prepare();
-        }
-        final PreferenceManager preferenceManager = new PreferenceManager(mContext);
-        mScreen = preferenceManager.createPreferenceScreen(mContext);
-        mPreference = new LayoutPreference(mContext,
-                ResourcesUtils.getResourcesId(
-                        mContext, "layout", "view_airplane_mode_networks_button"));
-        mPreference.setKey(KEY);
-        mScreen.addPreference(mPreference);
-    }
-
-    @Test
-    public void isAvailable_airplaneModeOff_returnFalse() {
-        mAirplaneModeRule.setAirplaneMode(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_airplaneModeOn_returnTrue() {
-        mAirplaneModeRule.setAirplaneMode(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_wifiDisabled_showAirplaneModeIsOnButtonVisible() {
-        mAirplaneModeRule.setAirplaneMode(true);
-        doReturn(false).when(mWifiManager).isWifiEnabled();
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mController.mTextView.getText())
-                .isEqualTo(ResourcesUtils.getResourcesString(mContext, RES_ID_AIRPLANE_MODE_IS_ON));
-        assertThat(mController.mButton.getVisibility()).isEqualTo(View.VISIBLE);
-    }
-
-    @Test
-    public void displayPreference_wifiEnabled_showViewingAirplaneModeNetworksButtonGone() {
-        mAirplaneModeRule.setAirplaneMode(true);
-        doReturn(true).when(mWifiManager).isWifiEnabled();
-
-        mController.displayPreference(mScreen);
-
-        assertThat(mController.mTextView.getText()).isEqualTo(
-                ResourcesUtils.getResourcesString(mContext, RES_ID_VIEWING_AIRPLANE_MODE_NETWORKS));
-        assertThat(mController.mButton.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void refreshLayout_wifiEnabledThenDisabled_showAirplaneModeIsOnButtonVisible() {
-        mAirplaneModeRule.setAirplaneMode(true);
-        // Wi-Fi enabled
-        doReturn(true).when(mWifiManager).isWifiEnabled();
-        // Display preference
-        mController.displayPreference(mScreen);
-        // Then Wi-Fi disabled
-        doReturn(false).when(mWifiManager).isWifiEnabled();
-
-        // Refresh layout
-        mController.refreshLayout();
-
-        assertThat(mController.mTextView.getText())
-                .isEqualTo(ResourcesUtils.getResourcesString(mContext, RES_ID_AIRPLANE_MODE_IS_ON));
-        assertThat(mController.mButton.getVisibility()).isEqualTo(View.VISIBLE);
-    }
-
-    @Test
-    public void refreshLayout_wifiDisabledThenEnabled_showViewingAirplaneModeNetworksButtonGone() {
-        mAirplaneModeRule.setAirplaneMode(true);
-        // Wi-Fi disabled
-        doReturn(false).when(mWifiManager).isWifiEnabled();
-        // Display preference
-        mController.displayPreference(mScreen);
-        // Then Wi-Fi enabled
-        doReturn(true).when(mWifiManager).isWifiEnabled();
-
-        // Refresh layout
-        mController.refreshLayout();
-
-        assertThat(mController.mTextView.getText()).isEqualTo(
-                ResourcesUtils.getResourcesString(mContext, RES_ID_VIEWING_AIRPLANE_MODE_NETWORKS));
-        assertThat(mController.mButton.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void onClick_shouldSetWifiEnabled() {
-        mAirplaneModeRule.setAirplaneMode(true);
-        doReturn(false).when(mWifiManager).isWifiEnabled();
-
-        mController.onClick(mock(View.class));
-
-        verify(mWifiManager).setWifiEnabled(true);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/WifiSwitchPreferenceControllerTest.java
similarity index 71%
rename from tests/unit/src/com/android/settings/network/AirplaneSafeNetworksPreferenceControllerTest.java
rename to tests/unit/src/com/android/settings/network/WifiSwitchPreferenceControllerTest.java
index 4c4c5bd..1244db8 100644
--- a/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/WifiSwitchPreferenceControllerTest.java
@@ -22,11 +22,9 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 
-import android.content.ContentResolver;
 import android.content.Context;
 import android.net.wifi.WifiManager;
 import android.os.Looper;
-import android.provider.Settings;
 
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
@@ -43,17 +41,11 @@
 import org.mockito.MockitoAnnotations;
 
 @RunWith(AndroidJUnit4.class)
-public class AirplaneSafeNetworksPreferenceControllerTest {
+public class WifiSwitchPreferenceControllerTest {
 
-    private static final String KEY_AIRPLANE_SAFE_NETWORKS = "airplane_safe_networks";
-
-    private static final int ON = 1;
-    private static final int OFF = 0;
-
-    private ContentResolver mResolver;
     private PreferenceScreen mScreen;
     private RestrictedSwitchPreference mPreference;
-    private AirplaneSafeNetworksPreferenceController mController;
+    private WifiSwitchPreferenceController mController;
 
     @Mock
     private WifiManager mWifiManager;
@@ -62,37 +54,21 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         final Context context = spy(ApplicationProvider.getApplicationContext());
-        mResolver = context.getContentResolver();
         doReturn(mWifiManager).when(context).getSystemService(Context.WIFI_SERVICE);
 
-        mController = new AirplaneSafeNetworksPreferenceController(context, mock(Lifecycle.class));
+        mController = new WifiSwitchPreferenceController(context, mock(Lifecycle.class));
         if (Looper.myLooper() == null) {
             Looper.prepare();
         }
         final PreferenceManager preferenceManager = new PreferenceManager(context);
         mScreen = preferenceManager.createPreferenceScreen(context);
         mPreference = new RestrictedSwitchPreference(context);
-        mPreference.setKey(KEY_AIRPLANE_SAFE_NETWORKS);
+        mPreference.setKey(WifiSwitchPreferenceController.KEY);
         mScreen.addPreference(mPreference);
     }
 
     @Test
-    public void isAvailable_airplaneModeOff_returnFalse() {
-        Settings.Global.putInt(mResolver, Settings.Global.AIRPLANE_MODE_ON, OFF);
-
-        mController.displayPreference(mScreen);
-        mController.onStart();
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_airplaneModeOn_returnTrue() {
-        Settings.Global.putInt(mResolver, Settings.Global.AIRPLANE_MODE_ON, ON);
-
-        mController.displayPreference(mScreen);
-        mController.onStart();
-
+    public void isAvailable_returnTrue() {
         assertThat(mController.isAvailable()).isTrue();
     }
 
diff --git a/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java
index 9b9bb11..293a19d 100644
--- a/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java
@@ -22,6 +22,8 @@
 
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -117,4 +119,27 @@
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
+
+    @Test
+    public void onPreferenceChange_update() {
+        // Set "Enable 2G" flag to "on"
+        when(mTelephonyManager.getAllowedNetworkTypesForReason(
+                TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G)).thenReturn(
+                (long) (TelephonyManager.NETWORK_TYPE_BITMASK_GSM
+                        | TelephonyManager.NETWORK_TYPE_BITMASK_LTE));
+
+        // Setup state to allow disabling
+        doReturn(true).when(mTelephonyManager).isRadioInterfaceCapabilitySupported(
+                mTelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPES_USED);
+        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_ENABLE_2G,
+                false);
+
+        // Disable 2G
+        boolean changed = mController.setChecked(false);
+        assertThat(changed).isEqualTo(true);
+
+        verify(mTelephonyManager, times(1)).setAllowedNetworkTypesForReason(
+                TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G,
+                TelephonyManager.NETWORK_TYPE_BITMASK_LTE);
+    }
 }
diff --git a/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
index f1ad2ff..ccc12e3 100644
--- a/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
@@ -38,7 +38,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-
 @RunWith(AndroidJUnit4.class)
 public class EuiccPreferenceControllerTest {
     private static final int SUB_ID = 2;
diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
index cf4eb91..45f3693 100644
--- a/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
@@ -47,7 +47,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-
 @RunWith(AndroidJUnit4.class)
 public class MobileDataPreferenceControllerTest {
     private static final int SUB_ID = 2;
diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java
index 2ce9a51..97f8e11 100644
--- a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java
+++ b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java
@@ -207,22 +207,22 @@
 
     @Test
     @UiThreadTest
-    public void onServiceStateChanged_notifyPhoneStateListener_callUpdateSlice() {
+    public void onServiceStateChanged_notifyTelephonyCallback_callUpdateSlice() {
         mMockNetworkProviderWorker.onSlicePinned();
         mMockNetworkProviderWorker.receiveNotification(false);
 
-        mMockNetworkProviderWorker.mPhoneStateListener.onServiceStateChanged(new ServiceState());
+        mMockNetworkProviderWorker.mTelephonyCallback.onServiceStateChanged(new ServiceState());
 
         assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();
     }
 
     @Test
     @UiThreadTest
-    public void onDisplayInfoChanged_notifyPhoneStateListener_callUpdateSlice() {
+    public void onDisplayInfoChanged_notifyTelephonyCallback_callUpdateSlice() {
         mMockNetworkProviderWorker.onSlicePinned();
         mMockNetworkProviderWorker.receiveNotification(false);
 
-        mMockNetworkProviderWorker.mPhoneStateListener.onDisplayInfoChanged(
+        mMockNetworkProviderWorker.mTelephonyCallback.onDisplayInfoChanged(
                 new TelephonyDisplayInfo(14, 0));
 
         assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();
@@ -230,11 +230,11 @@
 
     @Test
     @UiThreadTest
-    public void onDataConnectionStateChanged_notifyPhoneStateListener_callUpdateSlice() {
+    public void onDataConnectionStateChanged_notifyTelephonyCallback_callUpdateSlice() {
         mMockNetworkProviderWorker.onSlicePinned();
         mMockNetworkProviderWorker.receiveNotification(false);
 
-        mMockNetworkProviderWorker.mPhoneStateListener.onDataConnectionStateChanged(
+        mMockNetworkProviderWorker.mTelephonyCallback.onDataConnectionStateChanged(
                 TelephonyManager.DATA_DISCONNECTED, TelephonyManager.NETWORK_TYPE_LTE);
 
         assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();
diff --git a/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java b/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java
index a4d4ad1..8f0cfb3 100644
--- a/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java
+++ b/tests/unit/src/com/android/settings/panel/InternetConnectivityPanelTest.java
@@ -16,25 +16,25 @@
 
 package com.android.settings.panel;
 
-import static com.android.settings.network.InternetUpdater.INTERNET_APM;
-import static com.android.settings.network.InternetUpdater.INTERNET_APM_NETWORKS;
-import static com.android.settings.network.InternetUpdater.INTERNET_CELLULAR;
-import static com.android.settings.network.InternetUpdater.INTERNET_ETHERNET;
-import static com.android.settings.network.InternetUpdater.INTERNET_WIFI;
-
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.clearInvocations;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.net.Uri;
+import android.net.wifi.ScanResult;
+import android.net.wifi.WifiManager;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.android.settings.network.AirplaneModePreferenceController;
+import com.android.settings.network.InternetUpdater;
+import com.android.settings.network.ProviderModelSliceHelper;
 import com.android.settings.slices.CustomSliceRegistry;
 import com.android.settings.testutils.ResourcesUtils;
 
@@ -46,6 +46,7 @@
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(AndroidJUnit4.class)
@@ -53,17 +54,29 @@
 
     public static final String TITLE_INTERNET = ResourcesUtils.getResourcesString(
             ApplicationProvider.getApplicationContext(), "provider_internet_settings");
-    public static final String TITLE_APM_NETWORKS = ResourcesUtils.getResourcesString(
-            ApplicationProvider.getApplicationContext(), "airplane_mode_network_panel_title");
-    public static final String SUBTITLE_APM_IS_ON = ResourcesUtils.getResourcesString(
-            ApplicationProvider.getApplicationContext(), "condition_airplane_title");
+    public static final String TITLE_APM = ResourcesUtils.getResourcesString(
+            ApplicationProvider.getApplicationContext(), "airplane_mode");
+    public static final String SUBTITLE_WIFI_IS_TURNED_ON = ResourcesUtils.getResourcesString(
+            ApplicationProvider.getApplicationContext(), "wifi_is_turned_on_subtitle");
     public static final String BUTTON_SETTINGS = ResourcesUtils.getResourcesString(
             ApplicationProvider.getApplicationContext(), "settings_button");
+    public static final String SUBTITLE_NON_CARRIER_NETWORK_UNAVAILABLE =
+            ResourcesUtils.getResourcesString(ApplicationProvider.getApplicationContext(),
+                    "non_carrier_network_unavailable");
+    public static final String SUBTITLE_ALL_NETWORK_UNAVAILABLE =
+            ResourcesUtils.getResourcesString(ApplicationProvider.getApplicationContext(),
+                    "all_network_unavailable");
 
     @Rule
     public final MockitoRule mMocks = MockitoJUnit.rule();
     @Mock
     PanelContentCallback mPanelContentCallback;
+    @Mock
+    InternetUpdater mInternetUpdater;
+    @Mock
+    private WifiManager mWifiManager;
+    @Mock
+    private ProviderModelSliceHelper mProviderModelSliceHelper;
 
     private Context mContext;
     private InternetConnectivityPanel mPanel;
@@ -71,86 +84,99 @@
     @Before
     public void setUp() {
         mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getApplicationContext()).thenReturn(mContext);
+        when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
 
         mPanel = InternetConnectivityPanel.create(mContext);
         mPanel.registerCallback(mPanelContentCallback);
         mPanel.mIsProviderModelEnabled = true;
+        mPanel.mInternetUpdater = mInternetUpdater;
+        mPanel.mProviderModelSliceHelper = mProviderModelSliceHelper;
     }
 
     @Test
-    public void getTitle_internetApmNetworks_shouldBeApmNetworks() {
-        mPanel.onInternetTypeChanged(INTERNET_APM_NETWORKS);
-
-        assertThat(mPanel.getTitle()).isEqualTo(TITLE_APM_NETWORKS);
-    }
-
-    @Test
-    public void getTitle_notInternetApmNetworks_shouldBeInternet() {
-        mPanel.onInternetTypeChanged(INTERNET_APM);
-
-        assertThat(mPanel.getTitle()).isEqualTo(TITLE_INTERNET);
-
-        mPanel.onInternetTypeChanged(INTERNET_WIFI);
-
-        assertThat(mPanel.getTitle()).isEqualTo(TITLE_INTERNET);
-
-        mPanel.onInternetTypeChanged(INTERNET_CELLULAR);
-
-        assertThat(mPanel.getTitle()).isEqualTo(TITLE_INTERNET);
-
-        mPanel.onInternetTypeChanged(INTERNET_ETHERNET);
+    public void getTitle_apmOff_shouldBeInternet() {
+        doReturn(false).when(mInternetUpdater).isAirplaneModeOn();
 
         assertThat(mPanel.getTitle()).isEqualTo(TITLE_INTERNET);
     }
 
     @Test
-    public void getSubTitle_internetApm_shouldBeApmIsOn() {
-        mPanel.onInternetTypeChanged(INTERNET_APM);
+    public void getTitle_apmOn_shouldBeApm() {
+        doReturn(true).when(mInternetUpdater).isAirplaneModeOn();
 
-        assertThat(mPanel.getSubTitle()).isEqualTo(SUBTITLE_APM_IS_ON);
+        assertThat(mPanel.getTitle()).isEqualTo(TITLE_APM);
     }
 
     @Test
-    public void getSubTitle_notinternetApm_shouldBeNull() {
-        mPanel.onInternetTypeChanged(INTERNET_APM_NETWORKS);
-
-        assertThat(mPanel.getSubTitle()).isNull();
-
-        mPanel.onInternetTypeChanged(INTERNET_WIFI);
-
-        assertThat(mPanel.getSubTitle()).isNull();
-
-        mPanel.onInternetTypeChanged(INTERNET_CELLULAR);
-
-        assertThat(mPanel.getSubTitle()).isNull();
-
-        mPanel.onInternetTypeChanged(INTERNET_ETHERNET);
+    public void getSubTitle_apmOnWifiOff_shouldBeNull() {
+        doReturn(true).when(mInternetUpdater).isAirplaneModeOn();
+        doReturn(false).when(mInternetUpdater).isWifiEnabled();
 
         assertThat(mPanel.getSubTitle()).isNull();
     }
 
     @Test
-    public void getCustomizedButtonTitle_internetApm_shouldBeNull() {
-        mPanel.onInternetTypeChanged(INTERNET_APM);
+    public void getSubTitle_apmOnWifiOn_shouldWifiIsTurnedOn() {
+        doReturn(true).when(mInternetUpdater).isAirplaneModeOn();
+        doReturn(true).when(mInternetUpdater).isWifiEnabled();
+
+        mPanel.updatePanelTitle();
+
+        assertThat(mPanel.getSubTitle()).isEqualTo(SUBTITLE_WIFI_IS_TURNED_ON);
+    }
+
+    @Test
+    public void getSubTitle_apmOffWifiOnNoWifiListHasCarrierData_NonCarrierNetworkUnavailable() {
+        List wifiList = new ArrayList<ScanResult>();
+        mockCondition(false, true, true, true, wifiList);
+
+        mPanel.updatePanelTitle();
+
+        assertThat(mPanel.getSubTitle()).isEqualTo(SUBTITLE_NON_CARRIER_NETWORK_UNAVAILABLE);
+    }
+
+    @Test
+    public void getSubTitle_apmOffWifiOnNoWifiListNoCarrierData_AllNetworkUnavailable() {
+        List wifiList = new ArrayList<ScanResult>();
+        mockCondition(false, true, false, true, wifiList);
+
+        mPanel.updatePanelTitle();
+
+        assertThat(mPanel.getSubTitle()).isEqualTo(SUBTITLE_ALL_NETWORK_UNAVAILABLE);
+    }
+
+    @Test
+    public void getSubTitle_apmOffWifiOnTwoWifiItemsNoCarrierData_shouldBeNull() {
+        List wifiList = new ArrayList<ScanResult>();
+        wifiList.add(new ScanResult());
+        wifiList.add(new ScanResult());
+        mockCondition(false, true, false, true, wifiList);
+
+        mPanel.updatePanelTitle();
+
+        assertThat(mPanel.getSubTitle()).isNull();
+    }
+
+    @Test
+    public void getCustomizedButtonTitle_apmOff_shouldBeSettings() {
+        doReturn(false).when(mInternetUpdater).isAirplaneModeOn();
+
+        assertThat(mPanel.getCustomizedButtonTitle()).isEqualTo(BUTTON_SETTINGS);
+    }
+
+    @Test
+    public void getCustomizedButtonTitle_apmOnWifiOff_shouldBeNull() {
+        doReturn(true).when(mInternetUpdater).isAirplaneModeOn();
+        doReturn(false).when(mInternetUpdater).isWifiEnabled();
 
         assertThat(mPanel.getCustomizedButtonTitle()).isNull();
     }
 
     @Test
-    public void getCustomizedButtonTitle_notInternetApm_shouldBeSettings() {
-        mPanel.onInternetTypeChanged(INTERNET_APM_NETWORKS);
-
-        assertThat(mPanel.getCustomizedButtonTitle()).isEqualTo(BUTTON_SETTINGS);
-
-        mPanel.onInternetTypeChanged(INTERNET_WIFI);
-
-        assertThat(mPanel.getCustomizedButtonTitle()).isEqualTo(BUTTON_SETTINGS);
-
-        mPanel.onInternetTypeChanged(INTERNET_CELLULAR);
-
-        assertThat(mPanel.getCustomizedButtonTitle()).isEqualTo(BUTTON_SETTINGS);
-
-        mPanel.onInternetTypeChanged(INTERNET_ETHERNET);
+    public void getCustomizedButtonTitle_apmOnWifiOn_shouldBeSettings() {
+        doReturn(true).when(mInternetUpdater).isAirplaneModeOn();
+        doReturn(true).when(mInternetUpdater).isWifiEnabled();
 
         assertThat(mPanel.getCustomizedButtonTitle()).isEqualTo(BUTTON_SETTINGS);
     }
@@ -172,7 +198,7 @@
 
         assertThat(uris).containsExactly(
                 CustomSliceRegistry.PROVIDER_MODEL_SLICE_URI,
-                CustomSliceRegistry.AIRPLANE_SAFE_NETWORKS_SLICE_URI);
+                CustomSliceRegistry.TURN_ON_WIFI_SLICE_URI);
     }
 
     @Test
@@ -181,44 +207,95 @@
     }
 
     @Test
-    public void onInternetTypeChanged_internetTypeChangedToApm_changeHeaderAndHideSettings() {
-        mPanel.onInternetTypeChanged(INTERNET_APM_NETWORKS);
+    public void onAirplaneModeOn_apmOff_onTitleChanged() {
+        doReturn(false).when(mInternetUpdater).isAirplaneModeOn();
         clearInvocations(mPanelContentCallback);
 
-        mPanel.onInternetTypeChanged(INTERNET_APM);
+        mPanel.onAirplaneModeChanged(false);
+
+        verify(mPanelContentCallback).onTitleChanged();
+    }
+
+    @Test
+    public void onAirplaneModeOn_apmOnWifiOff_onTitleChanged() {
+        doReturn(true).when(mInternetUpdater).isAirplaneModeOn();
+        doReturn(false).when(mInternetUpdater).isWifiEnabled();
+        clearInvocations(mPanelContentCallback);
+
+        mPanel.onAirplaneModeChanged(true);
+
+        verify(mPanelContentCallback).onTitleChanged();
+    }
+
+    @Test
+    public void onAirplaneModeOn_apmOnWifiOn_onHeaderChanged() {
+        doReturn(true).when(mInternetUpdater).isAirplaneModeOn();
+        doReturn(true).when(mInternetUpdater).isWifiEnabled();
+        clearInvocations(mPanelContentCallback);
+
+        mPanel.onAirplaneModeChanged(true);
 
         verify(mPanelContentCallback).onHeaderChanged();
+    }
+
+    @Test
+    public void onAirplaneModeOn_onCustomizedButtonStateChanged() {
+        doReturn(true).when(mInternetUpdater).isAirplaneModeOn();
+        clearInvocations(mPanelContentCallback);
+
+        mPanel.onAirplaneModeChanged(true);
+
         verify(mPanelContentCallback).onCustomizedButtonStateChanged();
     }
 
     @Test
-    public void onInternetTypeChanged_internetTypeChangedFomApm_changeTitleAndShowSettings() {
-        mPanel.onInternetTypeChanged(INTERNET_APM);
+    public void onWifiEnabledChanged_apmOff_onTitleChanged() {
+        doReturn(false).when(mInternetUpdater).isAirplaneModeOn();
         clearInvocations(mPanelContentCallback);
 
-        mPanel.onInternetTypeChanged(INTERNET_APM_NETWORKS);
+        mPanel.onWifiEnabledChanged(false);
 
         verify(mPanelContentCallback).onTitleChanged();
+    }
+
+    @Test
+    public void onWifiEnabledChanged_apmOnWifiOff_onTitleChanged() {
+        doReturn(true).when(mInternetUpdater).isAirplaneModeOn();
+        doReturn(false).when(mInternetUpdater).isWifiEnabled();
+        clearInvocations(mPanelContentCallback);
+
+        mPanel.onWifiEnabledChanged(true);
+
+        verify(mPanelContentCallback).onTitleChanged();
+    }
+
+    @Test
+    public void onWifiEnabledChanged_apmOnWifiOn_onHeaderChanged() {
+        doReturn(true).when(mInternetUpdater).isAirplaneModeOn();
+        doReturn(true).when(mInternetUpdater).isWifiEnabled();
+        clearInvocations(mPanelContentCallback);
+
+        mPanel.onWifiEnabledChanged(true);
+
+        verify(mPanelContentCallback).onHeaderChanged();
+    }
+
+    @Test
+    public void onWifiEnabledChanged_onCustomizedButtonStateChanged() {
+        doReturn(true).when(mInternetUpdater).isWifiEnabled();
+        clearInvocations(mPanelContentCallback);
+
+        mPanel.onWifiEnabledChanged(true);
+
         verify(mPanelContentCallback).onCustomizedButtonStateChanged();
     }
 
-    @Test
-    public void onInternetTypeChanged_internetTypeChangedToApmNetworks_changeTitle() {
-        mPanel.onInternetTypeChanged(INTERNET_WIFI);
-        clearInvocations(mPanelContentCallback);
-
-        mPanel.onInternetTypeChanged(INTERNET_APM_NETWORKS);
-
-        verify(mPanelContentCallback).onTitleChanged();
-    }
-
-    @Test
-    public void onInternetTypeChanged_internetTypeChangedFromApmNetworks_changeTitle() {
-        mPanel.onInternetTypeChanged(INTERNET_APM_NETWORKS);
-        clearInvocations(mPanelContentCallback);
-
-        mPanel.onInternetTypeChanged(INTERNET_WIFI);
-
-        verify(mPanelContentCallback).onTitleChanged();
+    private void mockCondition(boolean airplaneMode, boolean hasCarrier,
+            boolean isDataSimActive, boolean isWifiEnabled, List<ScanResult> wifiItems) {
+        doReturn(airplaneMode).when(mInternetUpdater).isAirplaneModeOn();
+        when(mProviderModelSliceHelper.hasCarrier()).thenReturn(hasCarrier);
+        when(mProviderModelSliceHelper.isDataSimActive()).thenReturn(isDataSimActive);
+        doReturn(isWifiEnabled).when(mInternetUpdater).isWifiEnabled();
+        doReturn(wifiItems).when(mWifiManager).getScanResults();
     }
 }
diff --git a/tests/unit/src/com/android/settings/search/CustomSiteMapRegistryTest.java b/tests/unit/src/com/android/settings/search/CustomSiteMapRegistryTest.java
index 1a4737b..b8c3d57 100644
--- a/tests/unit/src/com/android/settings/search/CustomSiteMapRegistryTest.java
+++ b/tests/unit/src/com/android/settings/search/CustomSiteMapRegistryTest.java
@@ -29,7 +29,7 @@
 import com.android.settings.gestures.GestureNavigationSettingsFragment;
 import com.android.settings.gestures.SystemNavigationGestureSettings;
 import com.android.settings.location.LocationSettings;
-import com.android.settings.location.RecentLocationRequestSeeAllFragment;
+import com.android.settings.location.RecentLocationAccessSeeAllFragment;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.notification.zen.ZenModeBlockedEffectsSettings;
 import com.android.settings.notification.zen.ZenModeRestrictNotificationsSettings;
@@ -73,7 +73,7 @@
     @Test
     public void shouldContainRecentLocationRequestSeeAllFragmentPairs() {
         assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
-                RecentLocationRequestSeeAllFragment.class.getName())).isEqualTo(
+                RecentLocationAccessSeeAllFragment.class.getName())).isEqualTo(
                 LocationSettings.class.getName());
     }
 
diff --git a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
index d20fc12..6955dc4 100644
--- a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -21,6 +21,7 @@
 
 import com.android.settings.accounts.AccountFeatureProvider;
 import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.applications.appinfo.ExtraAppInfoFeatureProvider;
 import com.android.settings.aware.AwareFeatureProvider;
 import com.android.settings.biometrics.face.FaceFeatureProvider;
 import com.android.settings.bluetooth.BluetoothFeatureProvider;
@@ -74,6 +75,7 @@
     public ContextualCardFeatureProvider mContextualCardFeatureProvider;
 
     public WifiTrackerLibProvider wifiTrackerLibProvider;
+    public ExtraAppInfoFeatureProvider extraAppInfoFeatureProvider;
 
     /**
      * Call this in {@code @Before} method of the test class to use fake factory.
@@ -110,6 +112,7 @@
         mAwareFeatureProvider = mock(AwareFeatureProvider.class);
         mFaceFeatureProvider = mock(FaceFeatureProvider.class);
         wifiTrackerLibProvider = mock(WifiTrackerLibProvider.class);
+        extraAppInfoFeatureProvider = mock(ExtraAppInfoFeatureProvider.class);
     }
 
     @Override
@@ -226,4 +229,9 @@
     public WifiTrackerLibProvider getWifiTrackerLibProvider() {
         return wifiTrackerLibProvider;
     }
+
+    @Override
+    public ExtraAppInfoFeatureProvider getExtraAppInfoFeatureProvider() {
+        return extraAppInfoFeatureProvider;
+    }
 }
diff --git a/tests/unit/src/com/android/settings/wifi/OWNERS b/tests/unit/src/com/android/settings/wifi/OWNERS
new file mode 100644
index 0000000..358c910
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/wifi/OWNERS
diff --git a/tests/unit/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceControllerTest.java b/tests/unit/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceControllerTest.java
new file mode 100644
index 0000000..a2b99bf
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceControllerTest.java
@@ -0,0 +1,217 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.tether;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.net.wifi.SoftApConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Looper;
+
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+@RunWith(AndroidJUnit4.class)
+public class WifiTetherMaximizeCompatibilityPreferenceControllerTest {
+
+    @Rule
+    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Mock
+    private WifiManager mWifiManager;
+    @Mock
+    private WifiTetherBasePreferenceController.OnTetherConfigUpdateListener mListener;
+
+    private WifiTetherMaximizeCompatibilityPreferenceController mController;
+    private SwitchPreference mPreference;
+    private SoftApConfiguration mConfig;
+
+    @Before
+    public void setUp() {
+        final Context context = spy(ApplicationProvider.getApplicationContext());
+        mConfig = new SoftApConfiguration.Builder()
+                .setSsid("test_Ssid")
+                .setPassphrase(null, SoftApConfiguration.SECURITY_TYPE_OPEN)
+                .setBridgedModeOpportunisticShutdownEnabled(true)
+                .build();
+        doReturn(mWifiManager).when(context).getSystemService(Context.WIFI_SERVICE);
+        doReturn(true).when(mWifiManager).isBridgedApConcurrencySupported();
+        doReturn(mConfig).when(mWifiManager).getSoftApConfiguration();
+
+        mController = new WifiTetherMaximizeCompatibilityPreferenceController(context, mListener);
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        final PreferenceManager preferenceManager = new PreferenceManager(context);
+        final PreferenceScreen screen = preferenceManager.createPreferenceScreen(context);
+        mPreference = new SwitchPreference(context);
+        mPreference.setKey(WifiTetherMaximizeCompatibilityPreferenceController.PREF_KEY);
+        screen.addPreference(mPreference);
+        mController.displayPreference(screen);
+    }
+
+    @Test
+    public void getPreferenceKey_shouldBeCorrect() {
+        assertThat(mController.getPreferenceKey())
+                .isEqualTo(WifiTetherMaximizeCompatibilityPreferenceController.PREF_KEY);
+    }
+
+    @Test
+    public void updateDisplay_notSupport5GHzBand_setPreferenceDisabled() {
+        doReturn(false).when(mWifiManager).is5GHzBandSupported();
+
+        mController.updateDisplay();
+
+        assertThat(mPreference.isEnabled()).isEqualTo(false);
+    }
+
+    @Test
+    public void updateDisplay_getNullCountryCode_setPreferenceDisabled() {
+        doReturn(null).when(mWifiManager).getCountryCode();
+
+        mController.updateDisplay();
+
+        assertThat(mPreference.isEnabled()).isEqualTo(false);
+    }
+
+    @Test
+    public void updateDisplay_supported5GHzBandAndCountryCodeIsNotNull_setPreferenceEnabled() {
+        doReturn(true).when(mWifiManager).is5GHzBandSupported();
+        doReturn("US").when(mWifiManager).getCountryCode();
+
+        mController.updateDisplay();
+
+        assertThat(mPreference.isEnabled()).isEqualTo(true);
+    }
+
+    @Test
+    public void onPreferenceChange_callbackOnTetherConfigUpdated() {
+        mController.onPreferenceChange(mPreference, true);
+        verify(mListener).onTetherConfigUpdated(any());
+    }
+
+    @Test
+    public void isMaximizeCompatibilityEnabled_concurrencySupportedAndEnabled_returnTure() {
+        // The preconditions are ready in setup().
+
+        assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(true);
+    }
+
+    @Test
+    public void isMaximizeCompatibilityEnabled_concurrencySupportedAndDisabled_returnFalse() {
+        SoftApConfiguration config = new SoftApConfiguration.Builder()
+                .setBridgedModeOpportunisticShutdownEnabled(false)
+                .build();
+        doReturn(config).when(mWifiManager).getSoftApConfiguration();
+
+        assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(false);
+    }
+
+    @Test
+    public void isMaximizeCompatibilityEnabled_noConcurrencyAndGetBand2gOnly_returnFalse() {
+        doReturn(false).when(mWifiManager).isBridgedApConcurrencySupported();
+        SoftApConfiguration config = new SoftApConfiguration.Builder()
+                .setBand(SoftApConfiguration.BAND_2GHZ)
+                .build();
+        doReturn(config).when(mWifiManager).getSoftApConfiguration();
+
+        assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(false);
+    }
+
+    @Test
+    public void isMaximizeCompatibilityEnabled_noConcurrencyAndGetBand5gOnly_returnTrue() {
+        doReturn(false).when(mWifiManager).isBridgedApConcurrencySupported();
+        SoftApConfiguration config = new SoftApConfiguration.Builder()
+                .setBand(SoftApConfiguration.BAND_5GHZ)
+                .build();
+        doReturn(config).when(mWifiManager).getSoftApConfiguration();
+
+        assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(true);
+    }
+
+    @Test
+    public void isMaximizeCompatibilityEnabled_noConcurrencyAndGetBand2gAnd5g_returnTrue() {
+        doReturn(false).when(mWifiManager).isBridgedApConcurrencySupported();
+        SoftApConfiguration config = new SoftApConfiguration.Builder()
+                .setBand(SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ)
+                .build();
+        doReturn(config).when(mWifiManager).getSoftApConfiguration();
+
+        assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(true);
+    }
+
+    @Test
+    public void setupMaximizeCompatibility_concurrencySupportedAndDisabled_setDisabled() {
+        // The precondition of the concurrency supported is ready in setup().
+        mController.onPreferenceChange(mPreference, false);
+
+        SoftApConfiguration.Builder builder = new SoftApConfiguration.Builder();
+        mController.setupMaximizeCompatibility(builder);
+
+        assertThat(builder.build().isBridgedModeOpportunisticShutdownEnabled()).isEqualTo(false);
+    }
+
+    @Test
+    public void setupMaximizeCompatibility_concurrencySupportedAndEnabled_setEnabled() {
+        // The precondition of the concurrency supported is ready in setup().
+        mController.onPreferenceChange(mPreference, true);
+
+        SoftApConfiguration.Builder builder = new SoftApConfiguration.Builder();
+        mController.setupMaximizeCompatibility(builder);
+
+        assertThat(builder.build().isBridgedModeOpportunisticShutdownEnabled()).isEqualTo(true);
+    }
+
+    @Test
+    public void setupMaximizeCompatibility_noConcurrencyAndSetDisabled_setBand2gOnly() {
+        doReturn(false).when(mWifiManager).isBridgedApConcurrencySupported();
+        mController.onPreferenceChange(mPreference, false);
+
+        SoftApConfiguration.Builder builder = new SoftApConfiguration.Builder();
+        mController.setupMaximizeCompatibility(builder);
+
+        assertThat(builder.build().getBand()).isEqualTo(SoftApConfiguration.BAND_2GHZ);
+    }
+
+    @Test
+    public void setupMaximizeCompatibility_noConcurrencyAndSetEnabled_setBand2gAnd5g() {
+        doReturn(false).when(mWifiManager).isBridgedApConcurrencySupported();
+        mController.onPreferenceChange(mPreference, true);
+
+        SoftApConfiguration.Builder builder = new SoftApConfiguration.Builder();
+        mController.setupMaximizeCompatibility(builder);
+
+        assertThat(builder.build().getBand())
+                .isEqualTo(SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ);
+    }
+}